From 468cb5980b56d348979488a74a9b5de638400160 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 7 May 2021 23:18:14 +0200 Subject: gnome: rename from gnome3 Since GNOME version is now 40, it no longer makes sense to use the old attribute name. --- .../accessibility/mousetweaks/default.nix | 4 +- .../accessibility/squeekboard/default.nix | 4 +- .../applications/audio/cozy-audiobooks/default.nix | 4 +- pkgs/applications/audio/easytag/default.nix | 6 +- pkgs/applications/audio/gpodder/default.nix | 4 +- pkgs/applications/audio/gtkpod/default.nix | 4 +- pkgs/applications/audio/guitarix/default.nix | 4 +- .../audio/helio-workstation/default.nix | 6 +- .../audio/kapitonov-plugins-pack/default.nix | 2 +- pkgs/applications/audio/pavucontrol/default.nix | 4 +- pkgs/applications/audio/pithos/default.nix | 4 +- pkgs/applications/audio/quodlibet/default.nix | 4 +- pkgs/applications/audio/rhythmbox/default.nix | 6 +- pkgs/applications/audio/sfizz/default.nix | 6 +- pkgs/applications/audio/sonata/default.nix | 4 +- pkgs/applications/audio/sound-juicer/default.nix | 6 +- pkgs/applications/audio/spotify/default.nix | 4 +- .../display-managers/lightdm/default.nix | 4 +- pkgs/applications/editors/apostrophe/default.nix | 4 +- pkgs/applications/editors/bluefish/default.nix | 4 +- .../applications/editors/gnome-builder/default.nix | 6 +- pkgs/applications/editors/gnome-latex/default.nix | 6 +- pkgs/applications/editors/gobby/default.nix | 2 +- pkgs/applications/graphics/avocode/default.nix | 4 +- pkgs/applications/graphics/darktable/default.nix | 4 +- pkgs/applications/graphics/gimp/wrapper.nix | 4 +- pkgs/applications/graphics/glabels/default.nix | 6 +- pkgs/applications/graphics/glimpse/wrapper.nix | 4 +- .../applications/graphics/gnome-photos/default.nix | 6 +- pkgs/applications/graphics/gthumb/default.nix | 6 +- pkgs/applications/graphics/megapixels/default.nix | 4 +- pkgs/applications/graphics/ocrfeeder/default.nix | 2 +- pkgs/applications/graphics/shotwell/default.nix | 6 +- .../applications/graphics/synfigstudio/default.nix | 4 +- pkgs/applications/graphics/tev/default.nix | 4 +- pkgs/applications/graphics/vimiv/default.nix | 4 +- pkgs/applications/misc/almanah/default.nix | 4 +- pkgs/applications/misc/font-manager/default.nix | 4 +- pkgs/applications/misc/gksu/default.nix | 4 +- .../misc/gnome-multi-writer/default.nix | 4 +- pkgs/applications/misc/gnome-recipes/default.nix | 4 +- pkgs/applications/misc/gnome-usage/default.nix | 6 +- pkgs/applications/misc/gpx-viewer/default.nix | 4 +- pkgs/applications/misc/gummi/default.nix | 2 +- pkgs/applications/misc/lutris/fhsenv.nix | 4 +- .../misc/notify-osd-customizable/default.nix | 4 +- pkgs/applications/misc/olifant/default.nix | 4 +- pkgs/applications/misc/orca/default.nix | 6 +- pkgs/applications/misc/pcmanfm/default.nix | 4 +- pkgs/applications/misc/phoc/default.nix | 6 +- pkgs/applications/misc/plank/default.nix | 4 +- pkgs/applications/misc/pytrainer/default.nix | 4 +- pkgs/applications/misc/safeeyes/default.nix | 6 +- pkgs/applications/misc/snapper-gui/default.nix | 4 +- pkgs/applications/misc/tootle/default.nix | 4 +- pkgs/applications/misc/ulauncher/default.nix | 4 +- .../networking/browsers/brave/default.nix | 4 +- .../networking/browsers/chromium/common.nix | 4 +- .../networking/browsers/chromium/default.nix | 8 +- .../networking/browsers/eolie/default.nix | 4 +- .../networking/browsers/firefox-bin/default.nix | 4 +- .../networking/browsers/firefox/wrapper.nix | 4 +- .../networking/browsers/google-chrome/default.nix | 4 +- .../browsers/tor-browser-bundle-bin/default.nix | 4 +- pkgs/applications/networking/dropbox/cli.nix | 4 +- .../networking/feedreaders/feedreader/default.nix | 4 +- .../instant-messengers/coyim/default.nix | 4 +- .../networking/instant-messengers/dino/default.nix | 4 +- .../instant-messengers/gajim/default.nix | 4 +- .../instant-messengers/skypeforlinux/default.nix | 4 +- .../whatsapp-for-linux/default.nix | 6 +- .../networking/mailreaders/astroid/default.nix | 4 +- .../evolution/evolution-ews/default.nix | 4 +- .../mailreaders/evolution/evolution/default.nix | 8 +- .../mailreaders/evolution/evolution/wrapper.nix | 4 +- .../networking/mailreaders/thunderbird-bin/68.nix | 4 +- .../mailreaders/thunderbird-bin/default.nix | 4 +- .../networking/p2p/retroshare/default.nix | 4 +- pkgs/applications/networking/pcloud/default.nix | 4 +- .../networking/remote/citrix-workspace/generic.nix | 4 +- .../networking/remote/remmina/default.nix | 4 +- .../networking/syncthing-gtk/default.nix | 4 +- pkgs/applications/office/abiword/default.nix | 4 +- pkgs/applications/office/gnumeric/default.nix | 6 +- pkgs/applications/office/grisbi/default.nix | 4 +- pkgs/applications/office/homebank/default.nix | 4 +- pkgs/applications/office/libreoffice/default.nix | 4 +- .../office/paperwork/paperwork-gtk.nix | 4 +- pkgs/applications/office/tryton/default.nix | 4 +- pkgs/applications/office/zim/default.nix | 4 +- pkgs/applications/office/zotero/default.nix | 4 +- .../science/electronics/kicad/default.nix | 4 +- pkgs/applications/science/logic/coq/default.nix | 4 +- .../applications/science/math/wxmaxima/default.nix | 4 +- .../terminal-emulators/kgx/default.nix | 4 +- .../terminal-emulators/mlterm/default.nix | 2 +- .../version-management/gitkraken/default.nix | 4 +- .../version-management/meld/default.nix | 6 +- .../version-management/smartgithg/default.nix | 4 +- pkgs/applications/video/byzanz/default.nix | 4 +- pkgs/applications/video/pitivi/default.nix | 8 +- .../virtualization/virt-manager/default.nix | 4 +- .../applications/window-managers/phosh/default.nix | 12 +- .../window-managers/xmonad/log-applet/default.nix | 4 +- pkgs/build-support/appimage/default.nix | 2 +- .../data/documentation/gnome-user-docs/default.nix | 4 +- pkgs/data/fonts/cantarell-fonts/default.nix | 4 +- pkgs/data/icons/arc-icon-theme/default.nix | 4 +- .../icons/elementary-xfce-icon-theme/default.nix | 4 +- pkgs/data/icons/humanity-icon-theme/default.nix | 4 +- pkgs/data/icons/paper-icon-theme/default.nix | 4 +- pkgs/data/icons/pop-icon-theme/default.nix | 4 +- .../mobile-broadband-provider-info/default.nix | 4 +- pkgs/data/themes/adapta/default.nix | 4 +- pkgs/data/themes/arc/default.nix | 6 +- pkgs/data/themes/canta/default.nix | 4 +- pkgs/data/themes/equilux-theme/default.nix | 6 +- pkgs/data/themes/lounge/default.nix | 4 +- pkgs/data/themes/materia-theme/default.nix | 6 +- pkgs/data/themes/ubuntu-themes/default.nix | 4 +- pkgs/data/themes/yaru/default.nix | 4 +- pkgs/desktops/cinnamon/cinnamon-common/default.nix | 4 +- .../cinnamon/cinnamon-control-center/default.nix | 2 +- .../cinnamon/cinnamon-screensaver/default.nix | 4 +- pkgs/desktops/cinnamon/cjs/default.nix | 4 +- pkgs/desktops/cinnamon/mint-x-icons/default.nix | 4 +- pkgs/desktops/cinnamon/mint-y-icons/default.nix | 4 +- pkgs/desktops/cinnamon/muffin/default.nix | 4 +- pkgs/desktops/gnome-3/apps/accerciser/default.nix | 74 --- pkgs/desktops/gnome-3/apps/cheese/default.nix | 121 ----- pkgs/desktops/gnome-3/apps/file-roller/default.nix | 48 -- pkgs/desktops/gnome-3/apps/gedit/default.nix | 81 ---- pkgs/desktops/gnome-3/apps/ghex/default.nix | 84 ---- pkgs/desktops/gnome-3/apps/gnome-books/default.nix | 86 ---- pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix | 145 ------ .../gnome-3/apps/gnome-calendar/default.nix | 84 ---- .../gnome-calendar/gtk_image_reset_crash.patch | 17 - .../gnome-3/apps/gnome-characters/default.nix | 88 ---- .../desktops/gnome-3/apps/gnome-clocks/default.nix | 87 ---- .../gnome-3/apps/gnome-connections/default.nix | 75 --- .../gnome-3/apps/gnome-documents/default.nix | 127 ----- pkgs/desktops/gnome-3/apps/gnome-logs/default.nix | 86 ---- pkgs/desktops/gnome-3/apps/gnome-maps/default.nix | 104 ---- pkgs/desktops/gnome-3/apps/gnome-music/default.nix | 113 ----- .../gnome-3/apps/gnome-nettool/default.nix | 36 -- pkgs/desktops/gnome-3/apps/gnome-notes/default.nix | 87 ---- .../gnome-3/apps/gnome-power-manager/default.nix | 60 --- .../gnome-3/apps/gnome-sound-recorder/default.nix | 72 --- pkgs/desktops/gnome-3/apps/gnome-todo/default.nix | 89 ---- .../gnome-3/apps/gnome-weather/default.nix | 76 --- pkgs/desktops/gnome-3/apps/polari/default.nix | 54 --- .../apps/polari/make-thumbnailer-wrappable.patch | 24 - pkgs/desktops/gnome-3/apps/seahorse/default.nix | 84 ---- pkgs/desktops/gnome-3/apps/vinagre/default.nix | 34 -- .../gnome-3/core/adwaita-icon-theme/default.nix | 36 -- pkgs/desktops/gnome-3/core/baobab/default.nix | 64 --- pkgs/desktops/gnome-3/core/caribou/default.nix | 54 --- .../desktops/gnome-3/core/dconf-editor/default.nix | 69 --- pkgs/desktops/gnome-3/core/empathy/default.nix | 147 ------ pkgs/desktops/gnome-3/core/eog/default.nix | 95 ---- pkgs/desktops/gnome-3/core/epiphany/default.nix | 115 ----- pkgs/desktops/gnome-3/core/evince/default.nix | 135 ------ .../gnome-3/core/evolution-data-server/default.nix | 66 --- .../core/evolution-data-server/fix-paths.patch | 11 - .../evolution-data-server/hardcode-gsettings.patch | 526 --------------------- pkgs/desktops/gnome-3/core/gdm/default.nix | 180 ------- pkgs/desktops/gnome-3/core/gdm/fix-paths.patch | 82 ---- .../core/gdm/gdm-session-worker_forward-vars.patch | 31 -- .../core/gdm/gdm-x-session_extra_args.patch | 38 -- .../core/gdm/gdm-x-session_session-wrapper.patch | 40 -- .../gdm/org.gnome.login-screen.gschema.override | 2 - .../gnome-3/core/gdm/reset-environment.patch | 20 - .../gnome-3/core/gnome-backgrounds/default.nix | 22 - .../gnome-3/core/gnome-bluetooth/default.nix | 86 ---- .../gnome-3/core/gnome-calculator/default.nix | 89 ---- .../gnome-3/core/gnome-color-manager/default.nix | 66 --- .../desktops/gnome-3/core/gnome-common/default.nix | 27 -- .../gnome-3/core/gnome-contacts/default.nix | 95 ---- .../gnome-3/core/gnome-control-center/default.nix | 190 -------- .../gnome-3/core/gnome-control-center/paths.patch | 194 -------- .../core/gnome-desktop/bubblewrap-paths.patch | 15 - .../gnome-3/core/gnome-desktop/default.nix | 96 ---- .../gnome-3/core/gnome-dictionary/default.nix | 36 -- .../gnome-3/core/gnome-disk-utility/default.nix | 85 ---- .../gnome-3/core/gnome-font-viewer/default.nix | 35 -- .../core/gnome-initial-setup/0001-fix-paths.patch | 62 --- .../gnome-3/core/gnome-initial-setup/default.nix | 106 ----- .../gnome-3/core/gnome-initial-setup/vendor.conf | 5 - .../gnome-3/core/gnome-keyring/default.nix | 102 ---- .../gnome-3/core/gnome-online-miners/default.nix | 116 ----- .../gnome-3/core/gnome-remote-desktop/default.nix | 64 --- .../gnome-3/core/gnome-screenshot/default.nix | 43 -- pkgs/desktops/gnome-3/core/gnome-session/ctl.nix | 42 -- .../gnome-3/core/gnome-session/default.nix | 90 ---- .../gnome-3/core/gnome-session/fix-paths.patch | 42 -- .../gnome-3/core/gnome-settings-daemon/default.nix | 133 ------ .../core/gnome-settings-daemon/fix-paths.patch | 15 - .../global-backlight-helper.patch | 26 - .../core/gnome-shell-extensions/default.nix | 73 --- .../core/gnome-shell-extensions/fix_gmenu.patch | 11 - pkgs/desktops/gnome-3/core/gnome-shell/default.nix | 225 --------- .../gnome-3/core/gnome-shell/fix-paths.patch | 30 -- .../gnome-3/core/gnome-shell/shew-gir-path.patch | 11 - .../gnome-3/core/gnome-shell/wrap-services.patch | 57 --- .../gnome-3/core/gnome-software/default.nix | 120 ----- .../gnome-3/core/gnome-software/fix-paths.patch | 11 - .../gnome-3/core/gnome-system-monitor/default.nix | 81 ---- .../gnome-3/core/gnome-terminal/default.nix | 51 -- .../gnome-3/core/gnome-themes-extra/default.nix | 35 -- pkgs/desktops/gnome-3/core/gnome-tour/default.nix | 75 --- .../gnome-3/core/gnome-user-share/default.nix | 96 ---- pkgs/desktops/gnome-3/core/gucharmap/default.nix | 108 ----- .../gnome-3/core/libgnome-keyring/default.nix | 32 -- .../3.34/0001-EGL-Include-EGL-eglmesaext.h.patch | 74 --- .../core/mutter/3.34/0002-drop-inheritable.patch | 135 ------ .../mutter/3.34/0003-Fix-glitches-in-gala.patch | 33 -- ...rofiler-track-changes-in-GLib-and-Sysprof.patch | 58 --- ...ing-display.h-to-meta-workspace-manager.h.patch | 32 -- .../0006-build-bump-ABI-to-sysprof-capture-4.patch | 102 ---- .../gnome-3/core/mutter/3.34/0007-fix-paths.patch | 27 -- pkgs/desktops/gnome-3/core/mutter/3.34/default.nix | 134 ------ pkgs/desktops/gnome-3/core/mutter/default.nix | 170 ------- .../gnome-3/core/mutter/drop-inheritable.patch | 132 ------ pkgs/desktops/gnome-3/core/mutter/fix-paths.patch | 13 - pkgs/desktops/gnome-3/core/nautilus/default.nix | 118 ----- .../gnome-3/core/nautilus/extension_dir.patch | 24 - .../desktops/gnome-3/core/nautilus/fix-paths.patch | 13 - .../add-option-for-installation-sysconfdir.patch | 38 -- pkgs/desktops/gnome-3/core/rygel/default.nix | 110 ----- pkgs/desktops/gnome-3/core/simple-scan/default.nix | 89 ---- pkgs/desktops/gnome-3/core/sushi/default.nix | 83 ---- pkgs/desktops/gnome-3/core/totem/default.nix | 123 ----- pkgs/desktops/gnome-3/core/yelp-xsl/default.nix | 52 -- pkgs/desktops/gnome-3/core/yelp/default.nix | 36 -- pkgs/desktops/gnome-3/core/zenity/default.nix | 50 -- pkgs/desktops/gnome-3/default.nix | 364 -------------- pkgs/desktops/gnome-3/devtools/anjuta/default.nix | 44 -- pkgs/desktops/gnome-3/devtools/devhelp/default.nix | 80 ---- .../gnome-3/devtools/gnome-devel-docs/default.nix | 25 - .../gnome-3/extensions/EasyScreenCast/default.nix | 38 -- .../extensions/EasyScreenCast/fix-gi-path.patch | 16 - .../gnome-3/extensions/appindicator/default.nix | 36 -- .../gnome-3/extensions/arcmenu/default.nix | 35 -- .../gnome-3/extensions/arcmenu/fix_gmenu.patch | 11 - .../gnome-3/extensions/caffeine/default.nix | 40 -- .../extensions/chrome-gnome-shell/default.nix | 71 --- .../extensions/clipboard-indicator/default.nix | 30 -- .../gnome-3/extensions/clock-override/default.nix | 37 -- .../gnome-3/extensions/dash-to-dock/default.nix | 35 -- .../gnome-3/extensions/dash-to-panel/default.nix | 28 -- .../extensions/disable-unredirect/default.nix | 31 -- .../extensions/draw-on-your-screen/default.nix | 29 -- .../extensions/drop-down-terminal/default.nix | 36 -- .../drop-down-terminal/fix_vte_and_gjs.patch | 32 -- .../dynamic-panel-transparency/default.nix | 38 -- .../gnome-3/extensions/emoji-selector/default.nix | 38 -- pkgs/desktops/gnome-3/extensions/freon/default.nix | 37 -- .../extensions/fuzzy-app-search/default.nix | 29 -- .../fuzzy-app-search/fix-desktop-file-paths.patch | 50 -- .../gnome-3/extensions/gsconnect/default.nix | 116 ----- .../gnome-3/extensions/gsconnect/fix-paths.patch | 37 -- .../gsconnect/installed-tests-path.patch | 30 -- .../gnome-3/extensions/hot-edge/default.nix | 33 -- .../gnome-3/extensions/icon-hider/default.nix | 31 -- .../gnome-3/extensions/impatience/default.nix | 39 -- .../gnome-3/extensions/material-shell/default.nix | 35 -- .../extensions/mpris-indicator-button/default.nix | 42 -- .../extensions/night-theme-switcher/default.nix | 32 -- .../gnome-3/extensions/no-title-bar/default.nix | 35 -- .../extensions/no-title-bar/fix-paths.patch | 56 --- .../gnome-3/extensions/noannoyance/default.nix | 31 -- .../gnome-3/extensions/paperwm/default.nix | 31 -- .../extensions/pidgin-im-integration/default.nix | 36 -- .../extensions/remove-dropdown-arrows/default.nix | 34 -- .../sound-output-device-chooser/default.nix | 44 -- .../sound-output-device-chooser/fix-paths.patch | 26 - .../gnome-3/extensions/system-monitor/default.nix | 50 -- .../paths_and_nonexisting_dirs.patch | 33 -- .../gnome-3/extensions/taskwhisperer/default.nix | 42 -- .../extensions/taskwhisperer/fix-paths.patch | 99 ---- .../gnome-3/extensions/tilingnome/default.nix | 38 -- .../desktops/gnome-3/extensions/timepp/default.nix | 28 -- .../gnome-3/extensions/topicons-plus/default.nix | 28 -- pkgs/desktops/gnome-3/extensions/unite/default.nix | 40 -- .../extensions/window-corner-preview/default.nix | 31 -- .../extensions/window-is-ready-remover/default.nix | 28 -- .../extensions/workspace-matrix/default.nix | 36 -- pkgs/desktops/gnome-3/find-latest-version.py | 89 ---- pkgs/desktops/gnome-3/games/aisleriot/default.nix | 77 --- pkgs/desktops/gnome-3/games/atomix/default.nix | 37 -- .../gnome-3/games/five-or-more/default.nix | 40 -- .../gnome-3/games/four-in-a-row/default.nix | 39 -- .../desktops/gnome-3/games/gnome-chess/default.nix | 68 --- .../gnome-3/games/gnome-klotski/default.nix | 43 -- .../gnome-3/games/gnome-mahjongg/default.nix | 41 -- .../desktops/gnome-3/games/gnome-mines/default.nix | 39 -- .../gnome-3/games/gnome-nibbles/default.nix | 84 ---- .../gnome-3/games/gnome-robots/default.nix | 73 --- .../gnome-3/games/gnome-sudoku/default.nix | 35 -- .../gnome-3/games/gnome-taquin/default.nix | 75 --- .../gnome-3/games/gnome-tetravex/default.nix | 39 -- pkgs/desktops/gnome-3/games/hitori/default.nix | 66 --- pkgs/desktops/gnome-3/games/iagno/default.nix | 77 --- pkgs/desktops/gnome-3/games/lightsoff/default.nix | 39 -- .../gnome-3/games/quadrapassel/default.nix | 40 -- pkgs/desktops/gnome-3/games/swell-foop/default.nix | 72 --- pkgs/desktops/gnome-3/games/tali/default.nix | 38 -- pkgs/desktops/gnome-3/installer.nix | 15 - pkgs/desktops/gnome-3/misc/geary/default.nix | 160 ------- pkgs/desktops/gnome-3/misc/gitg/default.nix | 95 ---- .../gnome-3/misc/gnome-applets/default.nix | 80 ---- .../desktops/gnome-3/misc/gnome-autoar/default.nix | 48 -- .../gnome-3/misc/gnome-flashback/default.nix | 203 -------- .../gnome-3/misc/gnome-packagekit/default.nix | 37 -- pkgs/desktops/gnome-3/misc/gnome-panel/default.nix | 99 ---- .../gnome-screensaver/fix-dbus-service-dir.patch | 11 - .../desktops/gnome-3/misc/gnome-tweaks/default.nix | 81 ---- pkgs/desktops/gnome-3/misc/gpaste/default.nix | 81 ---- pkgs/desktops/gnome-3/misc/gpaste/fix-paths.patch | 37 -- pkgs/desktops/gnome-3/misc/gtkhtml/default.nix | 27 -- .../misc/libgnome-games-support/default.nix | 58 --- pkgs/desktops/gnome-3/misc/metacity/default.nix | 74 --- .../desktops/gnome-3/misc/metacity/fix-paths.patch | 11 - .../gnome-3/misc/nautilus-python/default.nix | 63 --- pkgs/desktops/gnome-3/misc/pomodoro/default.nix | 73 --- pkgs/desktops/gnome-3/update.nix | 26 - pkgs/desktops/gnome/apps/accerciser/default.nix | 74 +++ pkgs/desktops/gnome/apps/cheese/default.nix | 121 +++++ pkgs/desktops/gnome/apps/file-roller/default.nix | 48 ++ pkgs/desktops/gnome/apps/gedit/default.nix | 81 ++++ pkgs/desktops/gnome/apps/ghex/default.nix | 84 ++++ pkgs/desktops/gnome/apps/gnome-books/default.nix | 86 ++++ pkgs/desktops/gnome/apps/gnome-boxes/default.nix | 145 ++++++ .../desktops/gnome/apps/gnome-calendar/default.nix | 84 ++++ .../gnome-calendar/gtk_image_reset_crash.patch | 17 + .../gnome/apps/gnome-characters/default.nix | 88 ++++ pkgs/desktops/gnome/apps/gnome-clocks/default.nix | 87 ++++ .../gnome/apps/gnome-connections/default.nix | 75 +++ .../gnome/apps/gnome-documents/default.nix | 127 +++++ pkgs/desktops/gnome/apps/gnome-logs/default.nix | 86 ++++ pkgs/desktops/gnome/apps/gnome-maps/default.nix | 104 ++++ pkgs/desktops/gnome/apps/gnome-music/default.nix | 113 +++++ pkgs/desktops/gnome/apps/gnome-nettool/default.nix | 36 ++ pkgs/desktops/gnome/apps/gnome-notes/default.nix | 87 ++++ .../gnome/apps/gnome-power-manager/default.nix | 60 +++ .../gnome/apps/gnome-sound-recorder/default.nix | 72 +++ pkgs/desktops/gnome/apps/gnome-todo/default.nix | 89 ++++ pkgs/desktops/gnome/apps/gnome-weather/default.nix | 76 +++ pkgs/desktops/gnome/apps/polari/default.nix | 54 +++ .../apps/polari/make-thumbnailer-wrappable.patch | 24 + pkgs/desktops/gnome/apps/seahorse/default.nix | 84 ++++ pkgs/desktops/gnome/apps/vinagre/default.nix | 34 ++ .../gnome/core/adwaita-icon-theme/default.nix | 36 ++ pkgs/desktops/gnome/core/baobab/default.nix | 64 +++ pkgs/desktops/gnome/core/caribou/default.nix | 54 +++ pkgs/desktops/gnome/core/dconf-editor/default.nix | 69 +++ pkgs/desktops/gnome/core/empathy/default.nix | 147 ++++++ pkgs/desktops/gnome/core/eog/default.nix | 95 ++++ pkgs/desktops/gnome/core/epiphany/default.nix | 115 +++++ pkgs/desktops/gnome/core/evince/default.nix | 135 ++++++ .../gnome/core/evolution-data-server/default.nix | 66 +++ .../core/evolution-data-server/fix-paths.patch | 11 + .../evolution-data-server/hardcode-gsettings.patch | 526 +++++++++++++++++++++ pkgs/desktops/gnome/core/gdm/default.nix | 180 +++++++ pkgs/desktops/gnome/core/gdm/fix-paths.patch | 82 ++++ .../core/gdm/gdm-session-worker_forward-vars.patch | 31 ++ .../gnome/core/gdm/gdm-x-session_extra_args.patch | 38 ++ .../core/gdm/gdm-x-session_session-wrapper.patch | 40 ++ .../gdm/org.gnome.login-screen.gschema.override | 2 + .../gnome/core/gdm/reset-environment.patch | 20 + .../gnome/core/gnome-backgrounds/default.nix | 22 + .../gnome/core/gnome-bluetooth/default.nix | 86 ++++ .../gnome/core/gnome-calculator/default.nix | 89 ++++ .../gnome/core/gnome-color-manager/default.nix | 66 +++ pkgs/desktops/gnome/core/gnome-common/default.nix | 27 ++ .../desktops/gnome/core/gnome-contacts/default.nix | 95 ++++ .../gnome/core/gnome-control-center/default.nix | 190 ++++++++ .../gnome/core/gnome-control-center/paths.patch | 194 ++++++++ .../core/gnome-desktop/bubblewrap-paths.patch | 15 + pkgs/desktops/gnome/core/gnome-desktop/default.nix | 96 ++++ .../gnome/core/gnome-dictionary/default.nix | 36 ++ .../gnome/core/gnome-disk-utility/default.nix | 85 ++++ .../gnome/core/gnome-font-viewer/default.nix | 35 ++ .../core/gnome-initial-setup/0001-fix-paths.patch | 62 +++ .../gnome/core/gnome-initial-setup/default.nix | 106 +++++ .../gnome/core/gnome-initial-setup/vendor.conf | 5 + pkgs/desktops/gnome/core/gnome-keyring/default.nix | 102 ++++ .../gnome/core/gnome-online-miners/default.nix | 116 +++++ .../gnome/core/gnome-remote-desktop/default.nix | 64 +++ .../gnome/core/gnome-screenshot/default.nix | 43 ++ pkgs/desktops/gnome/core/gnome-session/ctl.nix | 42 ++ pkgs/desktops/gnome/core/gnome-session/default.nix | 90 ++++ .../gnome/core/gnome-session/fix-paths.patch | 42 ++ .../gnome/core/gnome-settings-daemon/default.nix | 133 ++++++ .../core/gnome-settings-daemon/fix-paths.patch | 15 + .../global-backlight-helper.patch | 26 + .../gnome/core/gnome-shell-extensions/default.nix | 73 +++ .../core/gnome-shell-extensions/fix_gmenu.patch | 11 + pkgs/desktops/gnome/core/gnome-shell/default.nix | 225 +++++++++ .../gnome/core/gnome-shell/fix-paths.patch | 30 ++ .../gnome/core/gnome-shell/shew-gir-path.patch | 11 + .../gnome/core/gnome-shell/wrap-services.patch | 57 +++ .../desktops/gnome/core/gnome-software/default.nix | 120 +++++ .../gnome/core/gnome-software/fix-paths.patch | 11 + .../gnome/core/gnome-system-monitor/default.nix | 81 ++++ .../desktops/gnome/core/gnome-terminal/default.nix | 51 ++ .../gnome/core/gnome-themes-extra/default.nix | 35 ++ pkgs/desktops/gnome/core/gnome-tour/default.nix | 75 +++ .../gnome/core/gnome-user-share/default.nix | 96 ++++ pkgs/desktops/gnome/core/gucharmap/default.nix | 108 +++++ .../gnome/core/libgnome-keyring/default.nix | 32 ++ .../3.34/0001-EGL-Include-EGL-eglmesaext.h.patch | 74 +++ .../core/mutter/3.34/0002-drop-inheritable.patch | 135 ++++++ .../mutter/3.34/0003-Fix-glitches-in-gala.patch | 33 ++ ...rofiler-track-changes-in-GLib-and-Sysprof.patch | 58 +++ ...ing-display.h-to-meta-workspace-manager.h.patch | 32 ++ .../0006-build-bump-ABI-to-sysprof-capture-4.patch | 102 ++++ .../gnome/core/mutter/3.34/0007-fix-paths.patch | 27 ++ pkgs/desktops/gnome/core/mutter/3.34/default.nix | 134 ++++++ pkgs/desktops/gnome/core/mutter/default.nix | 170 +++++++ .../gnome/core/mutter/drop-inheritable.patch | 132 ++++++ pkgs/desktops/gnome/core/mutter/fix-paths.patch | 13 + pkgs/desktops/gnome/core/nautilus/default.nix | 118 +++++ .../gnome/core/nautilus/extension_dir.patch | 24 + pkgs/desktops/gnome/core/nautilus/fix-paths.patch | 13 + .../add-option-for-installation-sysconfdir.patch | 38 ++ pkgs/desktops/gnome/core/rygel/default.nix | 110 +++++ pkgs/desktops/gnome/core/simple-scan/default.nix | 89 ++++ pkgs/desktops/gnome/core/sushi/default.nix | 83 ++++ pkgs/desktops/gnome/core/totem/default.nix | 123 +++++ pkgs/desktops/gnome/core/yelp-xsl/default.nix | 52 ++ pkgs/desktops/gnome/core/yelp/default.nix | 36 ++ pkgs/desktops/gnome/core/zenity/default.nix | 50 ++ pkgs/desktops/gnome/default.nix | 366 ++++++++++++++ pkgs/desktops/gnome/devtools/anjuta/default.nix | 44 ++ pkgs/desktops/gnome/devtools/devhelp/default.nix | 80 ++++ .../gnome/devtools/gnome-devel-docs/default.nix | 25 + .../gnome/extensions/EasyScreenCast/default.nix | 38 ++ .../extensions/EasyScreenCast/fix-gi-path.patch | 16 + .../gnome/extensions/appindicator/default.nix | 36 ++ pkgs/desktops/gnome/extensions/arcmenu/default.nix | 35 ++ .../gnome/extensions/arcmenu/fix_gmenu.patch | 11 + .../desktops/gnome/extensions/caffeine/default.nix | 40 ++ .../extensions/chrome-gnome-shell/default.nix | 71 +++ .../extensions/clipboard-indicator/default.nix | 30 ++ .../gnome/extensions/clock-override/default.nix | 37 ++ .../gnome/extensions/dash-to-dock/default.nix | 35 ++ .../gnome/extensions/dash-to-panel/default.nix | 28 ++ .../extensions/disable-unredirect/default.nix | 31 ++ .../extensions/draw-on-your-screen/default.nix | 29 ++ .../extensions/drop-down-terminal/default.nix | 36 ++ .../drop-down-terminal/fix_vte_and_gjs.patch | 32 ++ .../dynamic-panel-transparency/default.nix | 38 ++ .../gnome/extensions/emoji-selector/default.nix | 38 ++ pkgs/desktops/gnome/extensions/freon/default.nix | 37 ++ .../gnome/extensions/fuzzy-app-search/default.nix | 29 ++ .../fuzzy-app-search/fix-desktop-file-paths.patch | 50 ++ .../gnome/extensions/gsconnect/default.nix | 116 +++++ .../gnome/extensions/gsconnect/fix-paths.patch | 37 ++ .../gsconnect/installed-tests-path.patch | 30 ++ .../desktops/gnome/extensions/hot-edge/default.nix | 33 ++ .../gnome/extensions/icon-hider/default.nix | 31 ++ .../gnome/extensions/impatience/default.nix | 39 ++ .../gnome/extensions/material-shell/default.nix | 35 ++ .../extensions/mpris-indicator-button/default.nix | 42 ++ .../extensions/night-theme-switcher/default.nix | 32 ++ .../gnome/extensions/no-title-bar/default.nix | 35 ++ .../gnome/extensions/no-title-bar/fix-paths.patch | 56 +++ .../gnome/extensions/noannoyance/default.nix | 31 ++ pkgs/desktops/gnome/extensions/paperwm/default.nix | 31 ++ .../extensions/pidgin-im-integration/default.nix | 36 ++ .../extensions/remove-dropdown-arrows/default.nix | 34 ++ .../sound-output-device-chooser/default.nix | 44 ++ .../sound-output-device-chooser/fix-paths.patch | 26 + .../gnome/extensions/system-monitor/default.nix | 50 ++ .../paths_and_nonexisting_dirs.patch | 33 ++ .../gnome/extensions/taskwhisperer/default.nix | 42 ++ .../gnome/extensions/taskwhisperer/fix-paths.patch | 99 ++++ .../gnome/extensions/tilingnome/default.nix | 38 ++ pkgs/desktops/gnome/extensions/timepp/default.nix | 28 ++ .../gnome/extensions/topicons-plus/default.nix | 28 ++ pkgs/desktops/gnome/extensions/unite/default.nix | 40 ++ .../extensions/window-corner-preview/default.nix | 31 ++ .../extensions/window-is-ready-remover/default.nix | 28 ++ .../gnome/extensions/workspace-matrix/default.nix | 36 ++ pkgs/desktops/gnome/find-latest-version.py | 89 ++++ pkgs/desktops/gnome/games/aisleriot/default.nix | 77 +++ pkgs/desktops/gnome/games/atomix/default.nix | 37 ++ pkgs/desktops/gnome/games/five-or-more/default.nix | 40 ++ .../desktops/gnome/games/four-in-a-row/default.nix | 39 ++ pkgs/desktops/gnome/games/gnome-chess/default.nix | 68 +++ .../desktops/gnome/games/gnome-klotski/default.nix | 43 ++ .../gnome/games/gnome-mahjongg/default.nix | 41 ++ pkgs/desktops/gnome/games/gnome-mines/default.nix | 39 ++ .../desktops/gnome/games/gnome-nibbles/default.nix | 84 ++++ pkgs/desktops/gnome/games/gnome-robots/default.nix | 73 +++ pkgs/desktops/gnome/games/gnome-sudoku/default.nix | 35 ++ pkgs/desktops/gnome/games/gnome-taquin/default.nix | 75 +++ .../gnome/games/gnome-tetravex/default.nix | 39 ++ pkgs/desktops/gnome/games/hitori/default.nix | 66 +++ pkgs/desktops/gnome/games/iagno/default.nix | 77 +++ pkgs/desktops/gnome/games/lightsoff/default.nix | 39 ++ pkgs/desktops/gnome/games/quadrapassel/default.nix | 40 ++ pkgs/desktops/gnome/games/swell-foop/default.nix | 72 +++ pkgs/desktops/gnome/games/tali/default.nix | 38 ++ pkgs/desktops/gnome/installer.nix | 15 + pkgs/desktops/gnome/misc/geary/default.nix | 160 +++++++ pkgs/desktops/gnome/misc/gitg/default.nix | 95 ++++ pkgs/desktops/gnome/misc/gnome-applets/default.nix | 80 ++++ pkgs/desktops/gnome/misc/gnome-autoar/default.nix | 48 ++ .../gnome/misc/gnome-flashback/default.nix | 203 ++++++++ .../gnome/misc/gnome-packagekit/default.nix | 37 ++ pkgs/desktops/gnome/misc/gnome-panel/default.nix | 99 ++++ .../gnome-screensaver/fix-dbus-service-dir.patch | 11 + pkgs/desktops/gnome/misc/gnome-tweaks/default.nix | 81 ++++ pkgs/desktops/gnome/misc/gpaste/default.nix | 81 ++++ pkgs/desktops/gnome/misc/gpaste/fix-paths.patch | 37 ++ pkgs/desktops/gnome/misc/gtkhtml/default.nix | 27 ++ .../gnome/misc/libgnome-games-support/default.nix | 58 +++ pkgs/desktops/gnome/misc/metacity/default.nix | 74 +++ pkgs/desktops/gnome/misc/metacity/fix-paths.patch | 11 + .../gnome/misc/nautilus-python/default.nix | 63 +++ pkgs/desktops/gnome/misc/pomodoro/default.nix | 73 +++ pkgs/desktops/gnome/update.nix | 26 + pkgs/desktops/mate/marco/default.nix | 4 +- pkgs/desktops/mate/mate-applets/default.nix | 4 +- pkgs/desktops/mate/mate-desktop/default.nix | 2 +- pkgs/desktops/mate/mate-power-manager/default.nix | 4 +- pkgs/desktops/mate/pluma/default.nix | 4 +- pkgs/desktops/pantheon/default.nix | 14 +- .../elementary-settings-daemon/default.nix | 4 +- pkgs/desktops/xfce/default.nix | 4 +- pkgs/development/compilers/vala/default.nix | 2 +- .../haskell-modules/configuration-nix.nix | 2 +- .../haskell-modules/hackage-packages.nix | 2 +- pkgs/development/libraries/amtk/default.nix | 4 +- pkgs/development/libraries/aravis/default.nix | 6 +- pkgs/development/libraries/at-spi2-atk/default.nix | 4 +- .../development/libraries/at-spi2-core/default.nix | 4 +- pkgs/development/libraries/atk/default.nix | 4 +- pkgs/development/libraries/atkmm/default.nix | 4 +- pkgs/development/libraries/bamf/default.nix | 4 +- pkgs/development/libraries/clutter-gst/default.nix | 4 +- pkgs/development/libraries/clutter-gtk/default.nix | 4 +- pkgs/development/libraries/clutter/default.nix | 4 +- pkgs/development/libraries/cogl/default.nix | 4 +- pkgs/development/libraries/dconf/default.nix | 4 +- pkgs/development/libraries/folks/default.nix | 4 +- pkgs/development/libraries/gcab/default.nix | 4 +- pkgs/development/libraries/gcr/default.nix | 4 +- pkgs/development/libraries/gdk-pixbuf/default.nix | 4 +- pkgs/development/libraries/gdl/default.nix | 4 +- .../development/libraries/geocode-glib/default.nix | 4 +- pkgs/development/libraries/gexiv2/default.nix | 4 +- pkgs/development/libraries/gfbgraph/default.nix | 4 +- pkgs/development/libraries/gjs/default.nix | 4 +- .../libraries/glib-networking/default.nix | 4 +- pkgs/development/libraries/glib/default.nix | 4 +- pkgs/development/libraries/glibmm/2.68.nix | 4 +- pkgs/development/libraries/glibmm/default.nix | 4 +- pkgs/development/libraries/gnome-menus/default.nix | 4 +- .../libraries/gnome-online-accounts/default.nix | 4 +- .../libraries/gnome-video-effects/default.nix | 4 +- .../libraries/gobject-introspection/default.nix | 4 +- pkgs/development/libraries/goffice/default.nix | 4 +- pkgs/development/libraries/gom/default.nix | 4 +- pkgs/development/libraries/goocanvas/default.nix | 4 +- pkgs/development/libraries/goocanvasmm/default.nix | 4 +- .../libraries/grilo-plugins/default.nix | 4 +- pkgs/development/libraries/grilo/default.nix | 4 +- .../gsettings-desktop-schemas/default.nix | 4 +- pkgs/development/libraries/gsound/default.nix | 4 +- pkgs/development/libraries/gspell/default.nix | 4 +- pkgs/development/libraries/gssdp/default.nix | 4 +- .../libraries/gstreamer/gstreamermm/default.nix | 4 +- pkgs/development/libraries/gtk/3.x.nix | 4 +- pkgs/development/libraries/gtk/4.x.nix | 4 +- pkgs/development/libraries/gtkd/default.nix | 2 +- pkgs/development/libraries/gtkmm/3.x.nix | 4 +- pkgs/development/libraries/gtkmm/4.x.nix | 4 +- pkgs/development/libraries/gtksourceview/4.x.nix | 4 +- pkgs/development/libraries/gtksourceview/5.x.nix | 4 +- pkgs/development/libraries/gtksourceviewmm/4.x.nix | 4 +- .../libraries/gtksourceviewmm/default.nix | 4 +- pkgs/development/libraries/gupnp-av/default.nix | 4 +- pkgs/development/libraries/gupnp-dlna/default.nix | 4 +- pkgs/development/libraries/gupnp-igd/default.nix | 4 +- pkgs/development/libraries/gupnp/default.nix | 4 +- pkgs/development/libraries/gvfs/default.nix | 6 +- pkgs/development/libraries/json-glib/default.nix | 4 +- .../development/libraries/jsonrpc-glib/default.nix | 4 +- pkgs/development/libraries/keybinder/default.nix | 4 +- pkgs/development/libraries/keybinder3/default.nix | 4 +- pkgs/development/libraries/lasem/default.nix | 4 +- .../development/libraries/libchamplain/default.nix | 4 +- pkgs/development/libraries/libcryptui/default.nix | 4 +- pkgs/development/libraries/libdazzle/default.nix | 4 +- pkgs/development/libraries/libepc/default.nix | 4 +- pkgs/development/libraries/libgda/6.x.nix | 4 +- pkgs/development/libraries/libgda/default.nix | 4 +- pkgs/development/libraries/libgdamm/default.nix | 4 +- pkgs/development/libraries/libgdata/default.nix | 4 +- pkgs/development/libraries/libgee/default.nix | 4 +- pkgs/development/libraries/libgepub/default.nix | 4 +- .../development/libraries/libgit2-glib/default.nix | 4 +- pkgs/development/libraries/libgksu/default.nix | 4 +- pkgs/development/libraries/libgnomekbd/default.nix | 4 +- pkgs/development/libraries/libgrss/default.nix | 4 +- pkgs/development/libraries/libgsf/default.nix | 4 +- pkgs/development/libraries/libgtop/default.nix | 4 +- pkgs/development/libraries/libgudev/default.nix | 4 +- pkgs/development/libraries/libgweather/default.nix | 4 +- pkgs/development/libraries/libgxps/default.nix | 4 +- pkgs/development/libraries/libhandy/0.x.nix | 4 +- pkgs/development/libraries/libhandy/default.nix | 4 +- .../libraries/libhttpseverywhere/default.nix | 4 +- pkgs/development/libraries/libmanette/default.nix | 4 +- pkgs/development/libraries/libmediaart/default.nix | 4 +- pkgs/development/libraries/libnotify/default.nix | 4 +- pkgs/development/libraries/libpeas/default.nix | 4 +- pkgs/development/libraries/librest/default.nix | 4 +- pkgs/development/libraries/librsvg/default.nix | 4 +- pkgs/development/libraries/libsecret/default.nix | 4 +- pkgs/development/libraries/libsigcxx/3.0.nix | 4 +- pkgs/development/libraries/libsigcxx/default.nix | 4 +- pkgs/development/libraries/libsoup/default.nix | 4 +- pkgs/development/libraries/libwnck/3.x.nix | 4 +- pkgs/development/libraries/libxmlxx/default.nix | 4 +- pkgs/development/libraries/libzapojit/default.nix | 4 +- pkgs/development/libraries/mm-common/default.nix | 4 +- pkgs/development/libraries/osm-gps-map/default.nix | 4 +- pkgs/development/libraries/pango/default.nix | 4 +- pkgs/development/libraries/pangomm/2.48.nix | 4 +- pkgs/development/libraries/pangomm/default.nix | 4 +- pkgs/development/libraries/rarian/default.nix | 2 +- .../libraries/template-glib/default.nix | 4 +- pkgs/development/libraries/tepl/default.nix | 4 +- .../libraries/totem-pl-parser/default.nix | 4 +- .../libraries/tracker-miners/default.nix | 4 +- pkgs/development/libraries/tracker/default.nix | 4 +- pkgs/development/libraries/vte/default.nix | 4 +- .../libraries/xdg-desktop-portal-gtk/default.nix | 6 +- pkgs/development/misc/yelp-tools/default.nix | 6 +- .../python-modules/gtimelog/default.nix | 6 +- .../development/python-modules/pyatspi/default.nix | 4 +- pkgs/development/python-modules/pygobject/3.36.nix | 2 +- pkgs/development/python-modules/pygobject/3.nix | 4 +- .../documentation/gnome-doc-utils/default.nix | 4 +- .../tools/documentation/gtk-doc/default.nix | 4 +- pkgs/development/tools/glade/default.nix | 6 +- pkgs/development/tools/misc/d-feet/default.nix | 6 +- pkgs/development/tools/misc/gob2/default.nix | 4 +- pkgs/development/tools/misc/msitools/default.nix | 4 +- pkgs/development/tools/nemiver/default.nix | 4 +- .../tools/profiling/sysprof/default.nix | 6 +- .../tools/react-native-debugger/default.nix | 2 +- pkgs/development/web/cog/default.nix | 4 +- pkgs/games/gscrabble/default.nix | 4 +- pkgs/games/megaglest/default.nix | 4 +- pkgs/games/openra/default.nix | 2 +- pkgs/games/openra/packages.nix | 2 +- pkgs/games/steam/fhsenv.nix | 2 +- pkgs/misc/emulators/cdemu/analyzer.nix | 4 +- pkgs/misc/emulators/cdemu/gui.nix | 4 +- pkgs/misc/emulators/nestopia/default.nix | 4 +- pkgs/misc/vim-plugins/overrides.nix | 4 +- pkgs/os-specific/linux/piper/default.nix | 4 +- pkgs/tools/X11/wpgtk/default.nix | 4 +- pkgs/tools/admin/gtk-vnc/default.nix | 4 +- pkgs/tools/audio/gvolicon/default.nix | 4 +- pkgs/tools/audio/pasystray/default.nix | 4 +- pkgs/tools/bluetooth/blueberry/default.nix | 4 +- pkgs/tools/bluetooth/blueman/default.nix | 4 +- pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix | 4 +- pkgs/tools/misc/gparted/default.nix | 4 +- pkgs/tools/misc/gsmartcontrol/default.nix | 4 +- pkgs/tools/misc/kodi-cli/default.nix | 4 +- pkgs/tools/networking/gupnp-tools/default.nix | 6 +- .../networking/networkmanager/applet/default.nix | 6 +- pkgs/tools/networking/networkmanager/default.nix | 4 +- .../networkmanager/fortisslvpn/default.nix | 4 +- .../networking/networkmanager/iodine/default.nix | 4 +- .../networking/networkmanager/libnma/default.nix | 4 +- .../networkmanager/openconnect/default.nix | 4 +- .../networking/networkmanager/openvpn/default.nix | 4 +- .../networking/networkmanager/sstp/default.nix | 4 +- .../networkmanager/strongswan/default.nix | 2 +- .../networking/networkmanager/vpnc/default.nix | 4 +- pkgs/tools/security/onioncircuits/default.nix | 4 +- pkgs/tools/text/gtranslator/default.nix | 4 +- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 126 ++--- 692 files changed, 13713 insertions(+), 13710 deletions(-) delete mode 100644 pkgs/desktops/gnome-3/apps/accerciser/default.nix delete mode 100644 pkgs/desktops/gnome-3/apps/cheese/default.nix delete mode 100644 pkgs/desktops/gnome-3/apps/file-roller/default.nix delete mode 100644 pkgs/desktops/gnome-3/apps/gedit/default.nix delete mode 100644 pkgs/desktops/gnome-3/apps/ghex/default.nix delete mode 100644 pkgs/desktops/gnome-3/apps/gnome-books/default.nix delete mode 100644 pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix delete mode 100644 pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix delete mode 100644 pkgs/desktops/gnome-3/apps/gnome-calendar/gtk_image_reset_crash.patch delete mode 100644 pkgs/desktops/gnome-3/apps/gnome-characters/default.nix delete mode 100644 pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix delete mode 100644 pkgs/desktops/gnome-3/apps/gnome-connections/default.nix delete mode 100644 pkgs/desktops/gnome-3/apps/gnome-documents/default.nix delete mode 100644 pkgs/desktops/gnome-3/apps/gnome-logs/default.nix delete mode 100644 pkgs/desktops/gnome-3/apps/gnome-maps/default.nix delete mode 100644 pkgs/desktops/gnome-3/apps/gnome-music/default.nix delete mode 100644 pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix delete mode 100644 pkgs/desktops/gnome-3/apps/gnome-notes/default.nix delete mode 100644 pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix delete mode 100644 pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix delete mode 100644 pkgs/desktops/gnome-3/apps/gnome-todo/default.nix delete mode 100644 pkgs/desktops/gnome-3/apps/gnome-weather/default.nix delete mode 100644 pkgs/desktops/gnome-3/apps/polari/default.nix delete mode 100644 pkgs/desktops/gnome-3/apps/polari/make-thumbnailer-wrappable.patch delete mode 100644 pkgs/desktops/gnome-3/apps/seahorse/default.nix delete mode 100644 pkgs/desktops/gnome-3/apps/vinagre/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/baobab/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/caribou/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/dconf-editor/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/empathy/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/eog/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/epiphany/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/evince/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/evolution-data-server/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/evolution-data-server/fix-paths.patch delete mode 100644 pkgs/desktops/gnome-3/core/evolution-data-server/hardcode-gsettings.patch delete mode 100644 pkgs/desktops/gnome-3/core/gdm/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/gdm/fix-paths.patch delete mode 100644 pkgs/desktops/gnome-3/core/gdm/gdm-session-worker_forward-vars.patch delete mode 100644 pkgs/desktops/gnome-3/core/gdm/gdm-x-session_extra_args.patch delete mode 100644 pkgs/desktops/gnome-3/core/gdm/gdm-x-session_session-wrapper.patch delete mode 100644 pkgs/desktops/gnome-3/core/gdm/org.gnome.login-screen.gschema.override delete mode 100644 pkgs/desktops/gnome-3/core/gdm/reset-environment.patch delete mode 100644 pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/gnome-calculator/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/gnome-common/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/gnome-contacts/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/gnome-control-center/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch delete mode 100644 pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch delete mode 100644 pkgs/desktops/gnome-3/core/gnome-desktop/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/gnome-initial-setup/0001-fix-paths.patch delete mode 100644 pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/gnome-initial-setup/vendor.conf delete mode 100644 pkgs/desktops/gnome-3/core/gnome-keyring/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/gnome-session/ctl.nix delete mode 100644 pkgs/desktops/gnome-3/core/gnome-session/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch delete mode 100644 pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/gnome-settings-daemon/fix-paths.patch delete mode 100644 pkgs/desktops/gnome-3/core/gnome-settings-daemon/global-backlight-helper.patch delete mode 100644 pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/gnome-shell-extensions/fix_gmenu.patch delete mode 100644 pkgs/desktops/gnome-3/core/gnome-shell/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch delete mode 100644 pkgs/desktops/gnome-3/core/gnome-shell/shew-gir-path.patch delete mode 100644 pkgs/desktops/gnome-3/core/gnome-shell/wrap-services.patch delete mode 100644 pkgs/desktops/gnome-3/core/gnome-software/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/gnome-software/fix-paths.patch delete mode 100644 pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/gnome-terminal/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/gnome-tour/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/gnome-user-share/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/gucharmap/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/mutter/3.34/0001-EGL-Include-EGL-eglmesaext.h.patch delete mode 100644 pkgs/desktops/gnome-3/core/mutter/3.34/0002-drop-inheritable.patch delete mode 100644 pkgs/desktops/gnome-3/core/mutter/3.34/0003-Fix-glitches-in-gala.patch delete mode 100644 pkgs/desktops/gnome-3/core/mutter/3.34/0004-profiler-track-changes-in-GLib-and-Sysprof.patch delete mode 100644 pkgs/desktops/gnome-3/core/mutter/3.34/0005-meta-Add-missing-display.h-to-meta-workspace-manager.h.patch delete mode 100644 pkgs/desktops/gnome-3/core/mutter/3.34/0006-build-bump-ABI-to-sysprof-capture-4.patch delete mode 100644 pkgs/desktops/gnome-3/core/mutter/3.34/0007-fix-paths.patch delete mode 100644 pkgs/desktops/gnome-3/core/mutter/3.34/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/mutter/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/mutter/drop-inheritable.patch delete mode 100644 pkgs/desktops/gnome-3/core/mutter/fix-paths.patch delete mode 100644 pkgs/desktops/gnome-3/core/nautilus/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/nautilus/extension_dir.patch delete mode 100644 pkgs/desktops/gnome-3/core/nautilus/fix-paths.patch delete mode 100644 pkgs/desktops/gnome-3/core/rygel/add-option-for-installation-sysconfdir.patch delete mode 100644 pkgs/desktops/gnome-3/core/rygel/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/simple-scan/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/sushi/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/totem/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/yelp-xsl/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/yelp/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/zenity/default.nix delete mode 100644 pkgs/desktops/gnome-3/default.nix delete mode 100644 pkgs/desktops/gnome-3/devtools/anjuta/default.nix delete mode 100644 pkgs/desktops/gnome-3/devtools/devhelp/default.nix delete mode 100644 pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix delete mode 100644 pkgs/desktops/gnome-3/extensions/EasyScreenCast/default.nix delete mode 100644 pkgs/desktops/gnome-3/extensions/EasyScreenCast/fix-gi-path.patch delete mode 100644 pkgs/desktops/gnome-3/extensions/appindicator/default.nix delete mode 100644 pkgs/desktops/gnome-3/extensions/arcmenu/default.nix delete mode 100644 pkgs/desktops/gnome-3/extensions/arcmenu/fix_gmenu.patch delete mode 100644 pkgs/desktops/gnome-3/extensions/caffeine/default.nix delete mode 100644 pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix delete mode 100644 pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix delete mode 100644 pkgs/desktops/gnome-3/extensions/clock-override/default.nix delete mode 100644 pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix delete mode 100644 pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix delete mode 100644 pkgs/desktops/gnome-3/extensions/disable-unredirect/default.nix delete mode 100644 pkgs/desktops/gnome-3/extensions/draw-on-your-screen/default.nix delete mode 100644 pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix delete mode 100644 pkgs/desktops/gnome-3/extensions/drop-down-terminal/fix_vte_and_gjs.patch delete mode 100644 pkgs/desktops/gnome-3/extensions/dynamic-panel-transparency/default.nix delete mode 100644 pkgs/desktops/gnome-3/extensions/emoji-selector/default.nix delete mode 100644 pkgs/desktops/gnome-3/extensions/freon/default.nix delete mode 100755 pkgs/desktops/gnome-3/extensions/fuzzy-app-search/default.nix delete mode 100755 pkgs/desktops/gnome-3/extensions/fuzzy-app-search/fix-desktop-file-paths.patch delete mode 100644 pkgs/desktops/gnome-3/extensions/gsconnect/default.nix delete mode 100644 pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch delete mode 100644 pkgs/desktops/gnome-3/extensions/gsconnect/installed-tests-path.patch delete mode 100644 pkgs/desktops/gnome-3/extensions/hot-edge/default.nix delete mode 100644 pkgs/desktops/gnome-3/extensions/icon-hider/default.nix delete mode 100644 pkgs/desktops/gnome-3/extensions/impatience/default.nix delete mode 100644 pkgs/desktops/gnome-3/extensions/material-shell/default.nix delete mode 100644 pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix delete mode 100644 pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix delete mode 100644 pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix delete mode 100644 pkgs/desktops/gnome-3/extensions/no-title-bar/fix-paths.patch delete mode 100644 pkgs/desktops/gnome-3/extensions/noannoyance/default.nix delete mode 100644 pkgs/desktops/gnome-3/extensions/paperwm/default.nix delete mode 100644 pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix delete mode 100644 pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix delete mode 100644 pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix delete mode 100644 pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch delete mode 100644 pkgs/desktops/gnome-3/extensions/system-monitor/default.nix delete mode 100644 pkgs/desktops/gnome-3/extensions/system-monitor/paths_and_nonexisting_dirs.patch delete mode 100644 pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix delete mode 100644 pkgs/desktops/gnome-3/extensions/taskwhisperer/fix-paths.patch delete mode 100644 pkgs/desktops/gnome-3/extensions/tilingnome/default.nix delete mode 100644 pkgs/desktops/gnome-3/extensions/timepp/default.nix delete mode 100644 pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix delete mode 100644 pkgs/desktops/gnome-3/extensions/unite/default.nix delete mode 100644 pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix delete mode 100644 pkgs/desktops/gnome-3/extensions/window-is-ready-remover/default.nix delete mode 100644 pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix delete mode 100644 pkgs/desktops/gnome-3/find-latest-version.py delete mode 100644 pkgs/desktops/gnome-3/games/aisleriot/default.nix delete mode 100644 pkgs/desktops/gnome-3/games/atomix/default.nix delete mode 100644 pkgs/desktops/gnome-3/games/five-or-more/default.nix delete mode 100644 pkgs/desktops/gnome-3/games/four-in-a-row/default.nix delete mode 100644 pkgs/desktops/gnome-3/games/gnome-chess/default.nix delete mode 100644 pkgs/desktops/gnome-3/games/gnome-klotski/default.nix delete mode 100644 pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix delete mode 100644 pkgs/desktops/gnome-3/games/gnome-mines/default.nix delete mode 100644 pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix delete mode 100644 pkgs/desktops/gnome-3/games/gnome-robots/default.nix delete mode 100644 pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix delete mode 100644 pkgs/desktops/gnome-3/games/gnome-taquin/default.nix delete mode 100644 pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix delete mode 100644 pkgs/desktops/gnome-3/games/hitori/default.nix delete mode 100644 pkgs/desktops/gnome-3/games/iagno/default.nix delete mode 100644 pkgs/desktops/gnome-3/games/lightsoff/default.nix delete mode 100644 pkgs/desktops/gnome-3/games/quadrapassel/default.nix delete mode 100644 pkgs/desktops/gnome-3/games/swell-foop/default.nix delete mode 100644 pkgs/desktops/gnome-3/games/tali/default.nix delete mode 100644 pkgs/desktops/gnome-3/installer.nix delete mode 100644 pkgs/desktops/gnome-3/misc/geary/default.nix delete mode 100644 pkgs/desktops/gnome-3/misc/gitg/default.nix delete mode 100644 pkgs/desktops/gnome-3/misc/gnome-applets/default.nix delete mode 100644 pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix delete mode 100644 pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix delete mode 100644 pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix delete mode 100644 pkgs/desktops/gnome-3/misc/gnome-panel/default.nix delete mode 100644 pkgs/desktops/gnome-3/misc/gnome-screensaver/fix-dbus-service-dir.patch delete mode 100644 pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix delete mode 100644 pkgs/desktops/gnome-3/misc/gpaste/default.nix delete mode 100644 pkgs/desktops/gnome-3/misc/gpaste/fix-paths.patch delete mode 100644 pkgs/desktops/gnome-3/misc/gtkhtml/default.nix delete mode 100644 pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix delete mode 100644 pkgs/desktops/gnome-3/misc/metacity/default.nix delete mode 100644 pkgs/desktops/gnome-3/misc/metacity/fix-paths.patch delete mode 100644 pkgs/desktops/gnome-3/misc/nautilus-python/default.nix delete mode 100644 pkgs/desktops/gnome-3/misc/pomodoro/default.nix delete mode 100644 pkgs/desktops/gnome-3/update.nix create mode 100644 pkgs/desktops/gnome/apps/accerciser/default.nix create mode 100644 pkgs/desktops/gnome/apps/cheese/default.nix create mode 100644 pkgs/desktops/gnome/apps/file-roller/default.nix create mode 100644 pkgs/desktops/gnome/apps/gedit/default.nix create mode 100644 pkgs/desktops/gnome/apps/ghex/default.nix create mode 100644 pkgs/desktops/gnome/apps/gnome-books/default.nix create mode 100644 pkgs/desktops/gnome/apps/gnome-boxes/default.nix create mode 100644 pkgs/desktops/gnome/apps/gnome-calendar/default.nix create mode 100644 pkgs/desktops/gnome/apps/gnome-calendar/gtk_image_reset_crash.patch create mode 100644 pkgs/desktops/gnome/apps/gnome-characters/default.nix create mode 100644 pkgs/desktops/gnome/apps/gnome-clocks/default.nix create mode 100644 pkgs/desktops/gnome/apps/gnome-connections/default.nix create mode 100644 pkgs/desktops/gnome/apps/gnome-documents/default.nix create mode 100644 pkgs/desktops/gnome/apps/gnome-logs/default.nix create mode 100644 pkgs/desktops/gnome/apps/gnome-maps/default.nix create mode 100644 pkgs/desktops/gnome/apps/gnome-music/default.nix create mode 100644 pkgs/desktops/gnome/apps/gnome-nettool/default.nix create mode 100644 pkgs/desktops/gnome/apps/gnome-notes/default.nix create mode 100644 pkgs/desktops/gnome/apps/gnome-power-manager/default.nix create mode 100644 pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix create mode 100644 pkgs/desktops/gnome/apps/gnome-todo/default.nix create mode 100644 pkgs/desktops/gnome/apps/gnome-weather/default.nix create mode 100644 pkgs/desktops/gnome/apps/polari/default.nix create mode 100644 pkgs/desktops/gnome/apps/polari/make-thumbnailer-wrappable.patch create mode 100644 pkgs/desktops/gnome/apps/seahorse/default.nix create mode 100644 pkgs/desktops/gnome/apps/vinagre/default.nix create mode 100644 pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix create mode 100644 pkgs/desktops/gnome/core/baobab/default.nix create mode 100644 pkgs/desktops/gnome/core/caribou/default.nix create mode 100644 pkgs/desktops/gnome/core/dconf-editor/default.nix create mode 100644 pkgs/desktops/gnome/core/empathy/default.nix create mode 100644 pkgs/desktops/gnome/core/eog/default.nix create mode 100644 pkgs/desktops/gnome/core/epiphany/default.nix create mode 100644 pkgs/desktops/gnome/core/evince/default.nix create mode 100644 pkgs/desktops/gnome/core/evolution-data-server/default.nix create mode 100644 pkgs/desktops/gnome/core/evolution-data-server/fix-paths.patch create mode 100644 pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch create mode 100644 pkgs/desktops/gnome/core/gdm/default.nix create mode 100644 pkgs/desktops/gnome/core/gdm/fix-paths.patch create mode 100644 pkgs/desktops/gnome/core/gdm/gdm-session-worker_forward-vars.patch create mode 100644 pkgs/desktops/gnome/core/gdm/gdm-x-session_extra_args.patch create mode 100644 pkgs/desktops/gnome/core/gdm/gdm-x-session_session-wrapper.patch create mode 100644 pkgs/desktops/gnome/core/gdm/org.gnome.login-screen.gschema.override create mode 100644 pkgs/desktops/gnome/core/gdm/reset-environment.patch create mode 100644 pkgs/desktops/gnome/core/gnome-backgrounds/default.nix create mode 100644 pkgs/desktops/gnome/core/gnome-bluetooth/default.nix create mode 100644 pkgs/desktops/gnome/core/gnome-calculator/default.nix create mode 100644 pkgs/desktops/gnome/core/gnome-color-manager/default.nix create mode 100644 pkgs/desktops/gnome/core/gnome-common/default.nix create mode 100644 pkgs/desktops/gnome/core/gnome-contacts/default.nix create mode 100644 pkgs/desktops/gnome/core/gnome-control-center/default.nix create mode 100644 pkgs/desktops/gnome/core/gnome-control-center/paths.patch create mode 100644 pkgs/desktops/gnome/core/gnome-desktop/bubblewrap-paths.patch create mode 100644 pkgs/desktops/gnome/core/gnome-desktop/default.nix create mode 100644 pkgs/desktops/gnome/core/gnome-dictionary/default.nix create mode 100644 pkgs/desktops/gnome/core/gnome-disk-utility/default.nix create mode 100644 pkgs/desktops/gnome/core/gnome-font-viewer/default.nix create mode 100644 pkgs/desktops/gnome/core/gnome-initial-setup/0001-fix-paths.patch create mode 100644 pkgs/desktops/gnome/core/gnome-initial-setup/default.nix create mode 100644 pkgs/desktops/gnome/core/gnome-initial-setup/vendor.conf create mode 100644 pkgs/desktops/gnome/core/gnome-keyring/default.nix create mode 100644 pkgs/desktops/gnome/core/gnome-online-miners/default.nix create mode 100644 pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix create mode 100644 pkgs/desktops/gnome/core/gnome-screenshot/default.nix create mode 100644 pkgs/desktops/gnome/core/gnome-session/ctl.nix create mode 100644 pkgs/desktops/gnome/core/gnome-session/default.nix create mode 100644 pkgs/desktops/gnome/core/gnome-session/fix-paths.patch create mode 100644 pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix create mode 100644 pkgs/desktops/gnome/core/gnome-settings-daemon/fix-paths.patch create mode 100644 pkgs/desktops/gnome/core/gnome-settings-daemon/global-backlight-helper.patch create mode 100644 pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix create mode 100644 pkgs/desktops/gnome/core/gnome-shell-extensions/fix_gmenu.patch create mode 100644 pkgs/desktops/gnome/core/gnome-shell/default.nix create mode 100644 pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch create mode 100644 pkgs/desktops/gnome/core/gnome-shell/shew-gir-path.patch create mode 100644 pkgs/desktops/gnome/core/gnome-shell/wrap-services.patch create mode 100644 pkgs/desktops/gnome/core/gnome-software/default.nix create mode 100644 pkgs/desktops/gnome/core/gnome-software/fix-paths.patch create mode 100644 pkgs/desktops/gnome/core/gnome-system-monitor/default.nix create mode 100644 pkgs/desktops/gnome/core/gnome-terminal/default.nix create mode 100644 pkgs/desktops/gnome/core/gnome-themes-extra/default.nix create mode 100644 pkgs/desktops/gnome/core/gnome-tour/default.nix create mode 100644 pkgs/desktops/gnome/core/gnome-user-share/default.nix create mode 100644 pkgs/desktops/gnome/core/gucharmap/default.nix create mode 100644 pkgs/desktops/gnome/core/libgnome-keyring/default.nix create mode 100644 pkgs/desktops/gnome/core/mutter/3.34/0001-EGL-Include-EGL-eglmesaext.h.patch create mode 100644 pkgs/desktops/gnome/core/mutter/3.34/0002-drop-inheritable.patch create mode 100644 pkgs/desktops/gnome/core/mutter/3.34/0003-Fix-glitches-in-gala.patch create mode 100644 pkgs/desktops/gnome/core/mutter/3.34/0004-profiler-track-changes-in-GLib-and-Sysprof.patch create mode 100644 pkgs/desktops/gnome/core/mutter/3.34/0005-meta-Add-missing-display.h-to-meta-workspace-manager.h.patch create mode 100644 pkgs/desktops/gnome/core/mutter/3.34/0006-build-bump-ABI-to-sysprof-capture-4.patch create mode 100644 pkgs/desktops/gnome/core/mutter/3.34/0007-fix-paths.patch create mode 100644 pkgs/desktops/gnome/core/mutter/3.34/default.nix create mode 100644 pkgs/desktops/gnome/core/mutter/default.nix create mode 100644 pkgs/desktops/gnome/core/mutter/drop-inheritable.patch create mode 100644 pkgs/desktops/gnome/core/mutter/fix-paths.patch create mode 100644 pkgs/desktops/gnome/core/nautilus/default.nix create mode 100644 pkgs/desktops/gnome/core/nautilus/extension_dir.patch create mode 100644 pkgs/desktops/gnome/core/nautilus/fix-paths.patch create mode 100644 pkgs/desktops/gnome/core/rygel/add-option-for-installation-sysconfdir.patch create mode 100644 pkgs/desktops/gnome/core/rygel/default.nix create mode 100644 pkgs/desktops/gnome/core/simple-scan/default.nix create mode 100644 pkgs/desktops/gnome/core/sushi/default.nix create mode 100644 pkgs/desktops/gnome/core/totem/default.nix create mode 100644 pkgs/desktops/gnome/core/yelp-xsl/default.nix create mode 100644 pkgs/desktops/gnome/core/yelp/default.nix create mode 100644 pkgs/desktops/gnome/core/zenity/default.nix create mode 100644 pkgs/desktops/gnome/default.nix create mode 100644 pkgs/desktops/gnome/devtools/anjuta/default.nix create mode 100644 pkgs/desktops/gnome/devtools/devhelp/default.nix create mode 100644 pkgs/desktops/gnome/devtools/gnome-devel-docs/default.nix create mode 100644 pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix create mode 100644 pkgs/desktops/gnome/extensions/EasyScreenCast/fix-gi-path.patch create mode 100644 pkgs/desktops/gnome/extensions/appindicator/default.nix create mode 100644 pkgs/desktops/gnome/extensions/arcmenu/default.nix create mode 100644 pkgs/desktops/gnome/extensions/arcmenu/fix_gmenu.patch create mode 100644 pkgs/desktops/gnome/extensions/caffeine/default.nix create mode 100644 pkgs/desktops/gnome/extensions/chrome-gnome-shell/default.nix create mode 100644 pkgs/desktops/gnome/extensions/clipboard-indicator/default.nix create mode 100644 pkgs/desktops/gnome/extensions/clock-override/default.nix create mode 100644 pkgs/desktops/gnome/extensions/dash-to-dock/default.nix create mode 100644 pkgs/desktops/gnome/extensions/dash-to-panel/default.nix create mode 100644 pkgs/desktops/gnome/extensions/disable-unredirect/default.nix create mode 100644 pkgs/desktops/gnome/extensions/draw-on-your-screen/default.nix create mode 100644 pkgs/desktops/gnome/extensions/drop-down-terminal/default.nix create mode 100644 pkgs/desktops/gnome/extensions/drop-down-terminal/fix_vte_and_gjs.patch create mode 100644 pkgs/desktops/gnome/extensions/dynamic-panel-transparency/default.nix create mode 100644 pkgs/desktops/gnome/extensions/emoji-selector/default.nix create mode 100644 pkgs/desktops/gnome/extensions/freon/default.nix create mode 100755 pkgs/desktops/gnome/extensions/fuzzy-app-search/default.nix create mode 100755 pkgs/desktops/gnome/extensions/fuzzy-app-search/fix-desktop-file-paths.patch create mode 100644 pkgs/desktops/gnome/extensions/gsconnect/default.nix create mode 100644 pkgs/desktops/gnome/extensions/gsconnect/fix-paths.patch create mode 100644 pkgs/desktops/gnome/extensions/gsconnect/installed-tests-path.patch create mode 100644 pkgs/desktops/gnome/extensions/hot-edge/default.nix create mode 100644 pkgs/desktops/gnome/extensions/icon-hider/default.nix create mode 100644 pkgs/desktops/gnome/extensions/impatience/default.nix create mode 100644 pkgs/desktops/gnome/extensions/material-shell/default.nix create mode 100644 pkgs/desktops/gnome/extensions/mpris-indicator-button/default.nix create mode 100644 pkgs/desktops/gnome/extensions/night-theme-switcher/default.nix create mode 100644 pkgs/desktops/gnome/extensions/no-title-bar/default.nix create mode 100644 pkgs/desktops/gnome/extensions/no-title-bar/fix-paths.patch create mode 100644 pkgs/desktops/gnome/extensions/noannoyance/default.nix create mode 100644 pkgs/desktops/gnome/extensions/paperwm/default.nix create mode 100644 pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix create mode 100644 pkgs/desktops/gnome/extensions/remove-dropdown-arrows/default.nix create mode 100644 pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix create mode 100644 pkgs/desktops/gnome/extensions/sound-output-device-chooser/fix-paths.patch create mode 100644 pkgs/desktops/gnome/extensions/system-monitor/default.nix create mode 100644 pkgs/desktops/gnome/extensions/system-monitor/paths_and_nonexisting_dirs.patch create mode 100644 pkgs/desktops/gnome/extensions/taskwhisperer/default.nix create mode 100644 pkgs/desktops/gnome/extensions/taskwhisperer/fix-paths.patch create mode 100644 pkgs/desktops/gnome/extensions/tilingnome/default.nix create mode 100644 pkgs/desktops/gnome/extensions/timepp/default.nix create mode 100644 pkgs/desktops/gnome/extensions/topicons-plus/default.nix create mode 100644 pkgs/desktops/gnome/extensions/unite/default.nix create mode 100644 pkgs/desktops/gnome/extensions/window-corner-preview/default.nix create mode 100644 pkgs/desktops/gnome/extensions/window-is-ready-remover/default.nix create mode 100644 pkgs/desktops/gnome/extensions/workspace-matrix/default.nix create mode 100644 pkgs/desktops/gnome/find-latest-version.py create mode 100644 pkgs/desktops/gnome/games/aisleriot/default.nix create mode 100644 pkgs/desktops/gnome/games/atomix/default.nix create mode 100644 pkgs/desktops/gnome/games/five-or-more/default.nix create mode 100644 pkgs/desktops/gnome/games/four-in-a-row/default.nix create mode 100644 pkgs/desktops/gnome/games/gnome-chess/default.nix create mode 100644 pkgs/desktops/gnome/games/gnome-klotski/default.nix create mode 100644 pkgs/desktops/gnome/games/gnome-mahjongg/default.nix create mode 100644 pkgs/desktops/gnome/games/gnome-mines/default.nix create mode 100644 pkgs/desktops/gnome/games/gnome-nibbles/default.nix create mode 100644 pkgs/desktops/gnome/games/gnome-robots/default.nix create mode 100644 pkgs/desktops/gnome/games/gnome-sudoku/default.nix create mode 100644 pkgs/desktops/gnome/games/gnome-taquin/default.nix create mode 100644 pkgs/desktops/gnome/games/gnome-tetravex/default.nix create mode 100644 pkgs/desktops/gnome/games/hitori/default.nix create mode 100644 pkgs/desktops/gnome/games/iagno/default.nix create mode 100644 pkgs/desktops/gnome/games/lightsoff/default.nix create mode 100644 pkgs/desktops/gnome/games/quadrapassel/default.nix create mode 100644 pkgs/desktops/gnome/games/swell-foop/default.nix create mode 100644 pkgs/desktops/gnome/games/tali/default.nix create mode 100644 pkgs/desktops/gnome/installer.nix create mode 100644 pkgs/desktops/gnome/misc/geary/default.nix create mode 100644 pkgs/desktops/gnome/misc/gitg/default.nix create mode 100644 pkgs/desktops/gnome/misc/gnome-applets/default.nix create mode 100644 pkgs/desktops/gnome/misc/gnome-autoar/default.nix create mode 100644 pkgs/desktops/gnome/misc/gnome-flashback/default.nix create mode 100644 pkgs/desktops/gnome/misc/gnome-packagekit/default.nix create mode 100644 pkgs/desktops/gnome/misc/gnome-panel/default.nix create mode 100644 pkgs/desktops/gnome/misc/gnome-screensaver/fix-dbus-service-dir.patch create mode 100644 pkgs/desktops/gnome/misc/gnome-tweaks/default.nix create mode 100644 pkgs/desktops/gnome/misc/gpaste/default.nix create mode 100644 pkgs/desktops/gnome/misc/gpaste/fix-paths.patch create mode 100644 pkgs/desktops/gnome/misc/gtkhtml/default.nix create mode 100644 pkgs/desktops/gnome/misc/libgnome-games-support/default.nix create mode 100644 pkgs/desktops/gnome/misc/metacity/default.nix create mode 100644 pkgs/desktops/gnome/misc/metacity/fix-paths.patch create mode 100644 pkgs/desktops/gnome/misc/nautilus-python/default.nix create mode 100644 pkgs/desktops/gnome/misc/pomodoro/default.nix create mode 100644 pkgs/desktops/gnome/update.nix (limited to 'pkgs') diff --git a/pkgs/applications/accessibility/mousetweaks/default.nix b/pkgs/applications/accessibility/mousetweaks/default.nix index 2ff36bb683339..9e18904ff6596 100644 --- a/pkgs/applications/accessibility/mousetweaks/default.nix +++ b/pkgs/applications/accessibility/mousetweaks/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config -, glib, gtk3, gnome3, gsettings-desktop-schemas, wrapGAppsHook +, glib, gtk3, gnome, gsettings-desktop-schemas, wrapGAppsHook , libX11, libXtst, libXfixes, libXcursor }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/applications/accessibility/squeekboard/default.nix b/pkgs/applications/accessibility/squeekboard/default.nix index 08042a7701b9a..ec99666b6f42d 100644 --- a/pkgs/applications/accessibility/squeekboard/default.nix +++ b/pkgs/applications/accessibility/squeekboard/default.nix @@ -4,7 +4,7 @@ , meson , ninja , pkg-config -, gnome3 +, gnome , glib , gtk3 , wayland @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 - gnome3.gnome-desktop + gnome.gnome-desktop wayland wayland-protocols libxml2 diff --git a/pkgs/applications/audio/cozy-audiobooks/default.nix b/pkgs/applications/audio/cozy-audiobooks/default.nix index bcad36e2da98b..5eb71cbe04f3a 100644 --- a/pkgs/applications/audio/cozy-audiobooks/default.nix +++ b/pkgs/applications/audio/cozy-audiobooks/default.nix @@ -12,7 +12,7 @@ , file , cairo , gettext -, gnome3 +, gnome }: python3Packages.buildPythonApplication rec { @@ -46,7 +46,7 @@ python3Packages.buildPythonApplication rec { gtk3 cairo gettext - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ] ++ (with gst_all_1; [ gstreamer gst-plugins-good diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix index 65c871640ef5a..d55fd7ff0cb6b 100644 --- a/pkgs/applications/audio/easytag/default.nix +++ b/pkgs/applications/audio/easytag/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkg-config, intltool, gtk3, glib, libid3tag, id3lib, taglib , libvorbis, libogg, opusfile, flac, itstool, libxml2, gsettings-desktop-schemas -, gnome3, wrapGAppsHook +, gnome, wrapGAppsHook }: let @@ -19,13 +19,13 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config intltool itstool libxml2 wrapGAppsHook ]; buildInputs = [ gtk3 glib libid3tag id3lib taglib libvorbis libogg opusfile flac - gsettings-desktop-schemas gnome3.adwaita-icon-theme + gsettings-desktop-schemas gnome.adwaita-icon-theme ]; doCheck = false; # fails 1 out of 9 tests passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 229050654cd54..681c6ffe28100 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, python3, python3Packages, intltool -, glibcLocales, gnome3, gtk3, wrapGAppsHook +, glibcLocales, gnome, gtk3, wrapGAppsHook , gobject-introspection }: @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ python3 gobject-introspection - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; checkInputs = with python3Packages; [ diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix index f39558c1571d8..61484bc2fbb15 100644 --- a/pkgs/applications/audio/gtkpod/default.nix +++ b/pkgs/applications/audio/gtkpod/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, wrapGAppsHook, intltool, libgpod, curl, flac, - gnome3, gtk3, gettext, perlPackages, flex, libid3tag, gdl, + gnome, gtk3, gettext, perlPackages, flex, libid3tag, gdl, libvorbis, gdk-pixbuf }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl gettext flex libgpod libid3tag flac libvorbis gtk3 gdk-pixbuf - gdl gnome3.adwaita-icon-theme gnome3.anjuta + gdl gnome.adwaita-icon-theme gnome.anjuta ] ++ (with perlPackages; [ perl XMLParser ]); patchPhase = '' diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index 7f41fa6c5f954..ec8ba7a1d1808 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -10,7 +10,7 @@ , glib , glib-networking , glibmm -, gnome3 +, gnome , gsettings-desktop-schemas , gtk3 , gtkmm3 @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { glib glib-networking.out glibmm - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gsettings-desktop-schemas gtk3 gtkmm3 diff --git a/pkgs/applications/audio/helio-workstation/default.nix b/pkgs/applications/audio/helio-workstation/default.nix index bb92682b141fc..4bcda6c4d3275 100644 --- a/pkgs/applications/audio/helio-workstation/default.nix +++ b/pkgs/applications/audio/helio-workstation/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, alsaLib, freetype, xorg, curl, libGL, libjack2, gnome3 +, alsaLib, freetype, xorg, curl, libGL, libjack2, gnome , pkg-config, makeWrapper }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib freetype xorg.libX11 xorg.libXext xorg.libXinerama xorg.libXrandr - xorg.libXcursor xorg.libXcomposite curl libGL libjack2 gnome3.zenity + xorg.libXcursor xorg.libXcomposite curl libGL libjack2 gnome.zenity ]; nativeBuildInputs = [ pkg-config makeWrapper ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin install -Dm755 build/Helio $out/bin - wrapProgram $out/bin/Helio --prefix PATH ":" ${gnome3.zenity}/bin + wrapProgram $out/bin/Helio --prefix PATH ":" ${gnome.zenity}/bin mkdir -p $out/share cp -r ../Deployment/Linux/Debian/x64/usr/share/* $out/share diff --git a/pkgs/applications/audio/kapitonov-plugins-pack/default.nix b/pkgs/applications/audio/kapitonov-plugins-pack/default.nix index 4409437ebf206..6e5cc0d519164 100644 --- a/pkgs/applications/audio/kapitonov-plugins-pack/default.nix +++ b/pkgs/applications/audio/kapitonov-plugins-pack/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, faust, meson, ninja, pkg-config -, boost, cairo, fftw, gnome3, ladspa-sdk, libxcb, lv2, xcbutilwm +, boost, cairo, fftw, gnome, ladspa-sdk, libxcb, lv2, xcbutilwm , zita-convolver, zita-resampler }: diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index 31d9292675e59..c7f12a8df6cce 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -1,5 +1,5 @@ { fetchurl, fetchpatch, lib, stdenv, pkg-config, intltool, libpulseaudio, -gtkmm3 , libcanberra-gtk3, gnome3, wrapGAppsHook }: +gtkmm3 , libcanberra-gtk3, gnome, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "pavucontrol"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { })]; buildInputs = [ libpulseaudio gtkmm3 libcanberra-gtk3 - gnome3.adwaita-icon-theme ]; + gnome.adwaita-icon-theme ]; nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ]; diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix index 939b53c44fb18..01c969c3d8e0c 100644 --- a/pkgs/applications/audio/pithos/default.nix +++ b/pkgs/applications/audio/pithos/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, meson, ninja, pkg-config, appstream-glib -, wrapGAppsHook, pythonPackages, gtk3, gnome3, gobject-introspection +, wrapGAppsHook, pythonPackages, gtk3, gnome, gobject-introspection , libnotify, libsecret, gst_all_1 }: pythonPackages.buildPythonApplication rec { @@ -23,7 +23,7 @@ pythonPackages.buildPythonApplication rec { nativeBuildInputs = [ meson ninja pkg-config appstream-glib wrapGAppsHook ]; propagatedBuildInputs = - [ gtk3 gobject-introspection libnotify libsecret gnome3.adwaita-icon-theme ] ++ + [ gtk3 gobject-introspection libnotify libsecret gnome.adwaita-icon-theme ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad ]) ++ (with pythonPackages; [ pygobject3 pylast ]); diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 738bf161cd596..2a170b3ccfd87 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3, wrapGAppsHook, gettext, libsoup, gnome3, gtk3, gdk-pixbuf, librsvg, +{ lib, stdenv, fetchurl, python3, wrapGAppsHook, gettext, libsoup, gnome, gtk3, gdk-pixbuf, librsvg, tag ? "", xvfb_run, dbus, glibcLocales, glib, glib-networking, gobject-introspection, hicolor-icon-theme, gst_all_1, withGstPlugins ? true, xineBackend ? false, xine-lib, @@ -22,7 +22,7 @@ python3.pkgs.buildPythonApplication rec { checkInputs = [ gdk-pixbuf hicolor-icon-theme ] ++ (with python3.pkgs; [ pytest pytest_xdist polib xvfb_run dbus.daemon glibcLocales ]); - buildInputs = [ gnome3.adwaita-icon-theme libsoup glib glib-networking gtk3 webkitgtk gdk-pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ] + buildInputs = [ gnome.adwaita-icon-theme libsoup glib glib-networking gtk3 webkitgtk gdk-pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ] ++ (if xineBackend then [ xine-lib ] else with gst_all_1; [ gstreamer gst-plugins-base ] ++ optionals withGstPlugins [ gst-plugins-good gst-plugins-ugly gst-plugins-bad ]); diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix index 173741484fd49..65499f58630e7 100644 --- a/pkgs/applications/audio/rhythmbox/default.nix +++ b/pkgs/applications/audio/rhythmbox/default.nix @@ -6,7 +6,7 @@ , intltool , libpeas , libsoup -, gnome3 +, gnome , totem-pl-parser , tdb , json-glib @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { gtk3 libpeas totem-pl-parser - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gst_all_1.gstreamer gst_all_1.gst-plugins-base @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/applications/audio/sfizz/default.nix b/pkgs/applications/audio/sfizz/default.nix index 153e52c82e170..702f5c3982a26 100644 --- a/pkgs/applications/audio/sfizz/default.nix +++ b/pkgs/applications/audio/sfizz/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , libjack2, libsndfile, xorg, freetype, libxkbcommon -, cairo, glib, gnome3, flac, libogg, libvorbis, libopus +, cairo, glib, gnome, flac, libogg, libvorbis, libopus , cmake, pkg-config }: @@ -35,14 +35,14 @@ stdenv.mkDerivation rec { libxkbcommon cairo glib - gnome3.zenity + gnome.zenity freetype ]; nativeBuildInputs = [ cmake pkg-config ]; postPatch = '' substituteInPlace editor/external/vstgui4/vstgui/lib/platform/linux/x11fileselector.cpp \ - --replace '"/usr/bin/zenity' '"${gnome3.zenity}/bin/zenity' + --replace '"/usr/bin/zenity' '"${gnome.zenity}/bin/zenity' ''; cmakeFlags = [ diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index 83af7985dbe2d..9eae394488e28 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, wrapGAppsHook, gettext -, python3Packages, gnome3, gtk3, glib, gdk-pixbuf, gsettings-desktop-schemas, gobject-introspection }: +, python3Packages, gnome, gtk3, glib, gdk-pixbuf, gsettings-desktop-schemas, gobject-introspection }: let inherit (python3Packages) buildPythonApplication isPy3k dbus-python pygobject3 mpd2 setuptools; @@ -24,7 +24,7 @@ in buildPythonApplication rec { buildInputs = [ glib - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gsettings-desktop-schemas gtk3 gdk-pixbuf diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix index ba51fc1af5646..c03b48c436bf6 100644 --- a/pkgs/applications/audio/sound-juicer/default.nix +++ b/pkgs/applications/audio/sound-juicer/default.nix @@ -10,7 +10,7 @@ , libxml2 , brasero , libcanberra-gtk3 -, gnome3 +, gnome , gst_all_1 , libmusicbrainz5 , libdiscid @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { gtk3 brasero libcanberra-gtk3 - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gsettings-desktop-schemas libmusicbrainz5 libdiscid @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 4014468eafe86..8656deb2f6aa2 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -1,6 +1,6 @@ { fetchurl, lib, stdenv, squashfsTools, xorg, alsaLib, makeWrapper, openssl, freetype , glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss, libpng, libnotify -, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curl, zlib, gnome3 +, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curl, zlib, gnome , at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon }: @@ -139,7 +139,7 @@ stdenv.mkDerivation { librarypath="${lib.makeLibraryPath deps}:$libdir" wrapProgram $out/share/spotify/spotify \ --prefix LD_LIBRARY_PATH : "$librarypath" \ - --prefix PATH : "${gnome3.zenity}/bin" + --prefix PATH : "${gnome.zenity}/bin" # fix Icon line in the desktop file (#48062) sed -i "s:^Icon=.*:Icon=spotify-client:" "$out/share/spotify/spotify.desktop" diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index be9ba0f75616d..5506fc79e9e3c 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -20,7 +20,7 @@ , polkit , accountsservice , gtk-doc -, gnome3 +, gnome , gobject-introspection , vala , fetchpatch @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { autoconf automake yelp-tools - gnome3.yelp-xsl + gnome.yelp-xsl gobject-introspection gtk-doc intltool diff --git a/pkgs/applications/editors/apostrophe/default.nix b/pkgs/applications/editors/apostrophe/default.nix index 9dafc055bcb0a..851c3ea1c2f01 100644 --- a/pkgs/applications/editors/apostrophe/default.nix +++ b/pkgs/applications/editors/apostrophe/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitLab, meson, ninja, cmake , wrapGAppsHook, pkg-config, desktop-file-utils , appstream-glib, pythonPackages, glib, gobject-introspection -, gtk3, webkitgtk, glib-networking, gnome3, gspell, texlive +, gtk3, webkitgtk, glib-networking, gnome, gspell, texlive , shared-mime-info, libhandy }: @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { appstream-glib wrapGAppsHook ]; buildInputs = [ glib pythonEnv gobject-introspection gtk3 - gnome3.adwaita-icon-theme webkitgtk gspell texlive + gnome.adwaita-icon-theme webkitgtk gspell texlive glib-networking libhandy ]; postPatch = '' diff --git a/pkgs/applications/editors/bluefish/default.nix b/pkgs/applications/editors/bluefish/default.nix index 59d1f11312dcd..3a5436d4f32df 100644 --- a/pkgs/applications/editors/bluefish/default.nix +++ b/pkgs/applications/editors/bluefish/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, intltool, wrapGAppsHook, pkg-config , gtk, libxml2 -, enchant, gucharmap, python3, gnome3 +, enchant, gucharmap, python3, gnome }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ intltool pkg-config wrapGAppsHook ]; - buildInputs = [ gnome3.adwaita-icon-theme gtk libxml2 + buildInputs = [ gnome.adwaita-icon-theme gtk libxml2 enchant gucharmap python3 ]; meta = with lib; { diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 50f2990104264..0279dfc5b3722 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -6,7 +6,7 @@ , docbook_xml_dtd_43 , fetchurl , flatpak -, gnome3 +, gnome , libgit2-glib , gobject-introspection , glade @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { buildInputs = [ ctags flatpak - gnome3.devhelp + gnome.devhelp glade libgit2-glib libpeas @@ -134,7 +134,7 @@ stdenv.mkDerivation rec { done ''; - passthru.updateScript = gnome3.updateScript { + passthru.updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix index 277863244a594..8fc6feecd57c9 100644 --- a/pkgs/applications/editors/gnome-latex/default.nix +++ b/pkgs/applications/editors/gnome-latex/default.nix @@ -13,7 +13,7 @@ , libgee , tepl , amtk -, gnome3 +, gnome , glib , pkg-config , intltool @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { buildInputs = [ amtk - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme glib gsettings-desktop-schemas gspell @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - passthru.updateScript = gnome3.updateScript { + passthru.updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/applications/editors/gobby/default.nix index 27047f8e95a8b..35e96c89dad57 100644 --- a/pkgs/applications/editors/gobby/default.nix +++ b/pkgs/applications/editors/gobby/default.nix @@ -1,6 +1,6 @@ { avahiSupport ? false # build support for Avahi in libinfinity , lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, wrapGAppsHook, yelp-tools -, gtkmm3, gsasl, gtksourceview3, libxmlxx, libinfinity, intltool, itstool, gnome3 }: +, gtkmm3, gsasl, gtksourceview3, libxmlxx, libinfinity, intltool, itstool, gnome }: let libinf = libinfinity.override { gtkWidgets = true; inherit avahiSupport; }; diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index 0e4f182ea50f2..02e5c7c0345a1 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, makeDesktopItem, fetchurl, unzip -, gdk-pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome3 +, gdk-pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome , xorg, mozjpeg, makeWrapper, wrapGAppsHook, libuuid, at-spi2-core, libdrm, mesa }: @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [makeWrapper wrapGAppsHook unzip]; - buildInputs = [ gtk3 gnome3.adwaita-icon-theme ]; + buildInputs = [ gtk3 gnome.adwaita-icon-theme ]; # src is producing multiple folder on unzip so we must # override unpackCmd to extract it into newly created folder diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 2ff712851b941..469437c6c952c 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -2,7 +2,7 @@ , cairo, cmake, ninja, curl, perl, llvm, desktop-file-utils, exiv2, glib , ilmbase, gtk3, intltool, lcms2, lensfun, libX11, libexif, libgphoto2, libjpeg , libpng, librsvg, libtiff, openexr, osm-gps-map, pkg-config, sqlite, libxslt -, openjpeg, lua, pugixml, colord, colord-gtk, libwebp, libsecret, gnome3 +, openjpeg, lua, pugixml, colord, colord-gtk, libwebp, libsecret, gnome , ocl-icd, pcre, gtk-mac-integration, isocodes, llvmPackages }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cairo curl exiv2 glib gtk3 ilmbase lcms2 lensfun libexif libgphoto2 libjpeg libpng librsvg libtiff openexr sqlite libxslt libsoup graphicsmagick json-glib openjpeg lua pugixml - libwebp libsecret gnome3.adwaita-icon-theme osm-gps-map pcre isocodes + libwebp libsecret gnome.adwaita-icon-theme osm-gps-map pcre isocodes ] ++ lib.optionals stdenv.isLinux [ colord colord-gtk libX11 ocl-icd ] ++ lib.optional stdenv.isDarwin gtk-mac-integration diff --git a/pkgs/applications/graphics/gimp/wrapper.nix b/pkgs/applications/graphics/gimp/wrapper.nix index bb81a374fea21..679e9136c44ad 100644 --- a/pkgs/applications/graphics/gimp/wrapper.nix +++ b/pkgs/applications/graphics/gimp/wrapper.nix @@ -1,4 +1,4 @@ -{ lib, symlinkJoin, gimp, makeWrapper, gimpPlugins, gnome3, plugins ? null}: +{ lib, symlinkJoin, gimp, makeWrapper, gimpPlugins, gnome, plugins ? null}: let allPlugins = lib.filter (pkg: lib.isDerivation pkg && !pkg.meta.broken or false) (lib.attrValues gimpPlugins); @@ -18,7 +18,7 @@ in symlinkJoin { wrapProgram $out/bin/$each \ --set GIMP2_PLUGINDIR "$out/lib/gimp/2.0" \ --set GIMP2_DATADIR "$out/share/gimp/2.0" \ - --prefix GTK_PATH : "${gnome3.gnome-themes-extra}/lib/gtk-2.0" \ + --prefix GTK_PATH : "${gnome.gnome-themes-extra}/lib/gtk-2.0" \ ${toString extraArgs} done set +x diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix index 33337739364e6..c2ce2840379c5 100644 --- a/pkgs/applications/graphics/glabels/default.nix +++ b/pkgs/applications/graphics/glabels/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, barcode, gnome3, autoreconfHook +{ lib, stdenv, fetchurl, barcode, gnome, autoreconfHook , gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book, gsettings-desktop-schemas , intltool, itstool, makeWrapper, pkg-config, yelp-tools }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper intltool ]; buildInputs = [ barcode gtk3 gtk-doc yelp-tools - gnome3.gnome-common gsettings-desktop-schemas + gnome.gnome-common gsettings-desktop-schemas itstool libxml2 librsvg libe-book libtool ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/applications/graphics/glimpse/wrapper.nix b/pkgs/applications/graphics/glimpse/wrapper.nix index daa540d31e504..361b2ba38b6e2 100644 --- a/pkgs/applications/graphics/glimpse/wrapper.nix +++ b/pkgs/applications/graphics/glimpse/wrapper.nix @@ -1,4 +1,4 @@ -{ lib, symlinkJoin, glimpse, makeWrapper, glimpsePlugins, gnome3, plugins ? null }: +{ lib, symlinkJoin, glimpse, makeWrapper, glimpsePlugins, gnome, plugins ? null }: let allPlugins = lib.filter (pkg: lib.isDerivation pkg && !pkg.meta.broken or false) (lib.attrValues glimpsePlugins); @@ -19,7 +19,7 @@ symlinkJoin { wrapProgram $out/bin/$each \ --set GIMP2_PLUGINDIR "$out/lib/glimpse/2.0" \ --set GIMP2_DATADIR "$out/share/glimpse/2.0" \ - --prefix GTK_PATH : "${gnome3.gnome-themes-extra}/lib/gtk-2.0" \ + --prefix GTK_PATH : "${gnome.gnome-themes-extra}/lib/gtk-2.0" \ ${toString extraArgs} done diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix index 358847086a128..f0911395404e3 100644 --- a/pkgs/applications/graphics/gnome-photos/default.nix +++ b/pkgs/applications/graphics/gnome-photos/default.nix @@ -13,7 +13,7 @@ , gfbgraph , glib , gnome-online-accounts -, gnome3 +, gnome , gobject-introspection , grilo , grilo-plugins @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { gfbgraph glib gnome-online-accounts - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme grilo grilo-plugins gsettings-desktop-schemas @@ -108,7 +108,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index 14993f6f533ae..cd3a6f368e9c7 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, gnome3 +, gnome , pkg-config , meson , ninja @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { clutter-gtk exiv2 glib - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gsettings-desktop-schemas gst_all_1.gst-plugins-base (gst_all_1.gst-plugins-good.override { gtkSupport = true; }) @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/applications/graphics/megapixels/default.nix b/pkgs/applications/graphics/megapixels/default.nix index 3d8a4c2bcebdd..9439a17f6ded5 100644 --- a/pkgs/applications/graphics/megapixels/default.nix +++ b/pkgs/applications/graphics/megapixels/default.nix @@ -6,7 +6,7 @@ , pkg-config , wrapGAppsHook , gtk3 -, gnome3 +, gnome , zbar , tiffSupport ? true , libraw @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook ]; - buildInputs = [ gtk3 gnome3.adwaita-icon-theme zbar ] + buildInputs = [ gtk3 gnome.adwaita-icon-theme zbar ] ++ optional tiffSupport libraw ++ optional jpgSupport graphicsmagick; diff --git a/pkgs/applications/graphics/ocrfeeder/default.nix b/pkgs/applications/graphics/ocrfeeder/default.nix index ff5d4bdf41de7..da5f1c5dcc499 100644 --- a/pkgs/applications/graphics/ocrfeeder/default.nix +++ b/pkgs/applications/graphics/ocrfeeder/default.nix @@ -8,7 +8,7 @@ , intltool , itstool , libxml2 -, gnome3 +, gnome , python3 , gobject-introspection , wrapGAppsHook diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 204d87a59c4e7..78b30ad44e036 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -12,7 +12,7 @@ , sqlite , webkitgtk , pkg-config -, gnome3 +, gnome , gst_all_1 , libgudev , libraw @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { librsvg librest gcr - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme libgdata libchamplain libsecret @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index 3f29d25fbe049..2b9fee974b377 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, boost, cairo, gettext, glibmm, gtk3, gtkmm3 , libjack2, libsigcxx, libxmlxx, makeWrapper, mlt-qt5, pango, pkg-config -, imagemagick, intltool, autoreconfHook, which, gnome3 +, imagemagick, intltool, autoreconfHook, which, gnome }: let @@ -107,7 +107,7 @@ stdenv.mkDerivation { buildInputs = [ ETL boost cairo glibmm gtk3 gtkmm3 imagemagick intltool libjack2 libsigcxx libxmlxx makeWrapper mlt-qt5 - synfig which gnome3.adwaita-icon-theme + synfig which gnome.adwaita-icon-theme ]; postInstall = '' diff --git a/pkgs/applications/graphics/tev/default.nix b/pkgs/applications/graphics/tev/default.nix index 3c48bbab0b853..6c9cee8514863 100644 --- a/pkgs/applications/graphics/tev/default.nix +++ b/pkgs/applications/graphics/tev/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , cmake, wrapGAppsHook -, libX11, libzip, glfw, libpng, xorg, gnome3 +, libX11, libzip, glfw, libpng, xorg, gnome }: stdenv.mkDerivation rec { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/tev \ "''${gappsWrapperArgs[@]}" \ - --prefix PATH ":" "${gnome3.zenity}/bin" + --prefix PATH ":" "${gnome.zenity}/bin" ''; meta = with lib; { diff --git a/pkgs/applications/graphics/vimiv/default.nix b/pkgs/applications/graphics/vimiv/default.nix index b5e9d0b8cf2dd..6f6245a1c80d1 100644 --- a/pkgs/applications/graphics/vimiv/default.nix +++ b/pkgs/applications/graphics/vimiv/default.nix @@ -1,5 +1,5 @@ { lib, python3Packages, fetchFromGitHub, imagemagick, librsvg, gtk3, jhead -, gnome3 +, gnome # Test requirements , dbus, xvfb_run, xdotool @@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec { ''; checkInputs = [ python3Packages.nose dbus.daemon xvfb_run xdotool ]; - buildInputs = [ gnome3.adwaita-icon-theme librsvg ]; + buildInputs = [ gnome.adwaita-icon-theme librsvg ]; propagatedBuildInputs = with python3Packages; [ pillow pygobject3 gtk3 ]; makeWrapperArgs = [ diff --git a/pkgs/applications/misc/almanah/default.nix b/pkgs/applications/misc/almanah/default.nix index eb5dc8950f905..a4ef9b34318ca 100644 --- a/pkgs/applications/misc/almanah/default.nix +++ b/pkgs/applications/misc/almanah/default.nix @@ -8,7 +8,7 @@ , gcr , gettext , glib -, gnome3 +, gnome , gpgme , gtk3 , gtksourceview3 @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; # it is quite odd }; diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index 0c5afe6cb4efe..29399ab2f5b57 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -15,7 +15,7 @@ , vala , gsettings-desktop-schemas , gtk3 -, gnome3 +, gnome , desktop-file-utils , wrapGAppsHook , gobject-introspection @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { sqlite gsettings-desktop-schemas # for font settings gtk3 - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme libsoup glib-networking # for SSL so that Google Fonts can load webkitgtk diff --git a/pkgs/applications/misc/gksu/default.nix b/pkgs/applications/misc/gksu/default.nix index 9d8ce3cc48045..c1a4ea2b6789d 100644 --- a/pkgs/applications/misc/gksu/default.nix +++ b/pkgs/applications/misc/gksu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk2, gnome2, gnome3, libgksu, +{ lib, stdenv, fetchurl, pkg-config, gtk2, gnome2, gnome, libgksu, intltool, libstartup_notification, gtk-doc, wrapGAppsHook }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk2 gnome2.GConf libstartup_notification gnome3.libgnome-keyring + gtk2 gnome2.GConf libstartup_notification gnome.libgnome-keyring ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/gnome-multi-writer/default.nix b/pkgs/applications/misc/gnome-multi-writer/default.nix index c97a492e1bdf3..31d81a3327905 100644 --- a/pkgs/applications/misc/gnome-multi-writer/default.nix +++ b/pkgs/applications/misc/gnome-multi-writer/default.nix @@ -4,7 +4,7 @@ , desktop-file-utils , gettext , glib -, gnome3 +, gnome , gtk3 , gusb , libcanberra-gtk3 @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/applications/misc/gnome-recipes/default.nix b/pkgs/applications/misc/gnome-recipes/default.nix index 168d5b9fb5ccb..b35319c386305 100644 --- a/pkgs/applications/misc/gnome-recipes/default.nix +++ b/pkgs/applications/misc/gnome-recipes/default.nix @@ -3,7 +3,7 @@ , meson , ninja , pkg-config -, gnome3 +, gnome , desktop-file-utils , gettext , itstool @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/applications/misc/gnome-usage/default.nix b/pkgs/applications/misc/gnome-usage/default.nix index bbd272754cdb9..a1b92572679c8 100644 --- a/pkgs/applications/misc/gnome-usage/default.nix +++ b/pkgs/applications/misc/gnome-usage/default.nix @@ -12,7 +12,7 @@ , gtk3 , libgtop , libdazzle -, gnome3 +, gnome , tracker , libhandy }: @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gtk3 libdazzle libgtop @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/applications/misc/gpx-viewer/default.nix b/pkgs/applications/misc/gpx-viewer/default.nix index 89a4198a749f7..1619f7f433422 100644 --- a/pkgs/applications/misc/gpx-viewer/default.nix +++ b/pkgs/applications/misc/gpx-viewer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, libxml2, pkg-config, gnome3, libchamplain, gdl, shared-mime-info, desktop-file-utils, wrapGAppsHook }: +{ lib, stdenv, fetchurl, intltool, libxml2, pkg-config, gnome, libchamplain, gdl, shared-mime-info, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "gpx-viewer"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { intltool pkg-config wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system ]; - buildInputs = [ gdl libchamplain gnome3.adwaita-icon-theme libxml2 ]; + buildInputs = [ gdl libchamplain gnome.adwaita-icon-theme libxml2 ]; meta = with lib; { homepage = "https://blog.sarine.nl/tag/gpxviewer/"; diff --git a/pkgs/applications/misc/gummi/default.nix b/pkgs/applications/misc/gummi/default.nix index f0416e232dcd6..c36f50b1cbdb4 100644 --- a/pkgs/applications/misc/gummi/default.nix +++ b/pkgs/applications/misc/gummi/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, pkgs -, glib, gnome3, gtk3, gtksourceview3, gtkspell3, poppler, texlive +, glib, gnome, gtk3, gtksourceview3, gtkspell3, poppler, texlive , pkg-config, intltool, autoreconfHook, wrapGAppsHook }: diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix index b580fabf58e90..c7238fb01551d 100644 --- a/pkgs/applications/misc/lutris/fhsenv.nix +++ b/pkgs/applications/misc/lutris/fhsenv.nix @@ -5,7 +5,7 @@ let qt5Deps = pkgs: with pkgs.qt5; [ qtbase qtmultimedia ]; - gnome3Deps = pkgs: with pkgs; [ gnome3.zenity gtksourceview gnome3.gnome-desktop gnome3.libgnome-keyring webkitgtk ]; + gnomeDeps = pkgs: with pkgs; [ gnome.zenity gtksourceview gnome.gnome-desktop gnome.libgnome-keyring webkitgtk ]; xorgDeps = pkgs: with pkgs.xorg; [ libX11 libXrender libXrandr libxcb libXmu libpthreadstubs libXext libXdmcp libXxf86vm libXinerama libSM libXv libXaw libXi libXcursor libXcomposite @@ -86,7 +86,7 @@ in buildFHSUserEnv { # ZDOOM soundfont-fluid bzip2 game-music-emu ] ++ qt5Deps pkgs - ++ gnome3Deps pkgs + ++ gnomeDeps pkgs ++ lib.optional steamSupport pkgs.steam; multiPkgs = pkgs: with pkgs; [ diff --git a/pkgs/applications/misc/notify-osd-customizable/default.nix b/pkgs/applications/misc/notify-osd-customizable/default.nix index e62b3a334876b..b00ee18d5f331 100644 --- a/pkgs/applications/misc/notify-osd-customizable/default.nix +++ b/pkgs/applications/misc/notify-osd-customizable/default.nix @@ -2,7 +2,7 @@ , dbus-glib , fetchurl , glib -, gnome3 +, gnome , libnotify , libtool , libwnck3 @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libwnck3 libnotify dbus-glib makeWrapper - gsettings-desktop-schemas gnome3.gnome-common + gsettings-desktop-schemas gnome.gnome-common libtool ]; diff --git a/pkgs/applications/misc/olifant/default.nix b/pkgs/applications/misc/olifant/default.nix index fbaf140a9f78e..f49f1456d60ff 100644 --- a/pkgs/applications/misc/olifant/default.nix +++ b/pkgs/applications/misc/olifant/default.nix @@ -9,7 +9,7 @@ , python3 , libgee , gsettings-desktop-schemas -, gnome3 +, gnome , pantheon , wrapGAppsHook , gtk3 @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib glib-networking - gnome3.libsoup + gnome.libsoup gsettings-desktop-schemas gtk3 json-glib diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index 71bc4daad7718..f8facbe01fa09 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -12,7 +12,7 @@ , python , pygobject3 , gtk3 -, gnome3 +, gnome , substituteAll , at-spi2-atk , at-spi2-core @@ -92,7 +92,7 @@ buildPythonApplication rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; @@ -108,7 +108,7 @@ buildPythonApplication rec { GTK toolkit, the Java platform's Swing toolkit, LibreOffice, Gecko, and WebKitGtk. AT-SPI support for the KDE Qt toolkit is being pursued. - Needs `services.gnome3.at-spi2-core.enable = true;` in `configuration.nix`. + Needs `services.gnome.at-spi2-core.enable = true;` in `configuration.nix`. ''; maintainers = with maintainers; [ berce ] ++ teams.gnome.members; license = licenses.lgpl21; diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix index 474fddb25201a..a8b407dd7b5d4 100644 --- a/pkgs/applications/misc/pcmanfm/default.nix +++ b/pkgs/applications/misc/pcmanfm/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, glib, intltool, libfm, libX11, pango, pkg-config -, wrapGAppsHook, gnome3, withGtk3 ? true, gtk2, gtk3 }: +, wrapGAppsHook, gnome, withGtk3 ? true, gtk2, gtk3 }: let libfm' = libfm.override { inherit withGtk3; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-FMt7JHSTxMzmX7tZAmEeOtAKeocPvB5QrcUEKMUUDPc="; }; - buildInputs = [ glib gtk libfm' libX11 pango gnome3.adwaita-icon-theme ]; + buildInputs = [ glib gtk libfm' libX11 pango gnome.adwaita-icon-theme ]; nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ]; configureFlags = optional withGtk3 "--with-gtk=3"; diff --git a/pkgs/applications/misc/phoc/default.nix b/pkgs/applications/misc/phoc/default.nix index 6ef88fb07c65f..2e3f323051259 100644 --- a/pkgs/applications/misc/phoc/default.nix +++ b/pkgs/applications/misc/phoc/default.nix @@ -8,7 +8,7 @@ , python3 , wrapGAppsHook , libinput -, gnome3 +, gnome , glib , gtk3 , wayland @@ -60,9 +60,9 @@ in stdenv.mkDerivation rec { libinput glib gtk3 - gnome3.gnome-desktop + gnome.gnome-desktop # For keybindings settings schemas - gnome3.mutter + gnome.mutter wayland phocWlroots ]; diff --git a/pkgs/applications/misc/plank/default.nix b/pkgs/applications/misc/plank/default.nix index b462e5f134b16..30d9533d45306 100644 --- a/pkgs/applications/misc/plank/default.nix +++ b/pkgs/applications/misc/plank/default.nix @@ -5,7 +5,7 @@ , cairo , dconf , glib -, gnome3 +, gnome , gtk3 , libwnck3 , libX11 @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook gettext - gnome3.gnome-common + gnome.gnome-common libxml2 # xmllint pkg-config vala diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix index 44b2cd700ecf6..00be8103683ef 100644 --- a/pkgs/applications/misc/pytrainer/default.nix +++ b/pkgs/applications/misc/pytrainer/default.nix @@ -2,7 +2,7 @@ , python3 , fetchFromGitHub , gdk-pixbuf -, gnome3 +, gnome , gpsbabel , glib-networking , glibcLocales @@ -55,7 +55,7 @@ in python.pkgs.buildPythonApplication rec { gtk3 webkitgtk glib-networking - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gdk-pixbuf ]; diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix index d866b643ef254..179ebd33d8568 100644 --- a/pkgs/applications/misc/safeeyes/default.nix +++ b/pkgs/applications/misc/safeeyes/default.nix @@ -1,4 +1,4 @@ -{ lib, python3Packages, gobject-introspection, libappindicator-gtk3, libnotify, gtk3, gnome3, xprintidle-ng, wrapGAppsHook, gdk-pixbuf, shared-mime-info, librsvg +{ lib, python3Packages, gobject-introspection, libappindicator-gtk3, libnotify, gtk3, gnome, xprintidle-ng, wrapGAppsHook, gdk-pixbuf, shared-mime-info, librsvg }: let inherit (python3Packages) python buildPythonApplication fetchPypi croniter; @@ -16,8 +16,8 @@ in buildPythonApplication rec { buildInputs = [ gtk3 gobject-introspection - gnome3.adwaita-icon-theme - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme + gnome.adwaita-icon-theme ]; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/snapper-gui/default.nix b/pkgs/applications/misc/snapper-gui/default.nix index 5beacfad2f956..2c63431593368 100644 --- a/pkgs/applications/misc/snapper-gui/default.nix +++ b/pkgs/applications/misc/snapper-gui/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, python3, python3Packages -, gnome3, gtk3, wrapGAppsHook, gtksourceview3, snapper +, gnome, gtk3, wrapGAppsHook, gtksourceview3, snapper , gobject-introspection }: @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ python3 gobject-introspection - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; doCheck = false; # it doesn't have any tests diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix index 0f6747d69f836..63ac88ecac9d3 100644 --- a/pkgs/applications/misc/tootle/default.nix +++ b/pkgs/applications/misc/tootle/default.nix @@ -9,7 +9,7 @@ , python3 , libgee , gsettings-desktop-schemas -, gnome3 +, gnome , pantheon , wrapGAppsHook , gtk3 @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib glib-networking - gnome3.libsoup + gnome.libsoup gsettings-desktop-schemas gtk3 json-glib diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index 989649ec41468..893fe02250129 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -4,7 +4,7 @@ , python3Packages , gdk-pixbuf , glib -, gnome3 +, gnome , gobject-introspection , gtk3 , wrapGAppsHook @@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ gdk-pixbuf glib - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gobject-introspection gtk3 keybinder3 diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index f72e90a09fb2c..cb65c753bccc4 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -13,7 +13,7 @@ , gdk-pixbuf , glib , gnome2 -, gnome3 +, gnome , gsettings-desktop-schemas , gtk3 , libpulseaudio @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ dpkg wrapGAppsHook ]; - buildInputs = [ glib gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; + buildInputs = [ glib gsettings-desktop-schemas gnome.adwaita-icon-theme ]; unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner"; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index db0ddc47cc540..a2bc293eaaf58 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -26,7 +26,7 @@ , libgcrypt ? null # gnomeSupport || cupsSupport # package customization -, gnomeSupport ? false, gnome ? null +, gnomeSupport ? false, gnome2 ? null , gnomeKeyringSupport ? false, libgnome-keyring3 ? null , proprietaryCodecs ? true , cupsSupport ? true @@ -158,7 +158,7 @@ let libdrm wayland mesa.drivers libxkbcommon curl ] ++ optional gnomeKeyringSupport libgnome-keyring3 - ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] + ++ optionals gnomeSupport [ gnome2.GConf libgcrypt ] ++ optionals cupsSupport [ libgcrypt cups ] ++ optional pulseSupport libpulseaudio; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index e921169cf067a..14ee3290c71c6 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,6 +1,6 @@ { newScope, config, stdenv, fetchurl, makeWrapper , llvmPackages_11, llvmPackages_12, ed, gnugrep, coreutils, xdg-utils -, glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit +, glib, gtk3, gnome, gsettings-desktop-schemas, gn, fetchgit , libva ? null , pipewire , gcc, nspr, nss, runCommand @@ -9,7 +9,7 @@ # package customization # Note: enable* flags should not require full rebuilds (i.e. only affect the wrapper) , channel ? "stable" -, gnomeSupport ? false, gnome ? null +, gnomeSupport ? false, gnome2 ? null , gnomeKeyringSupport ? false , proprietaryCodecs ? true , enableWideVine ? false @@ -31,7 +31,7 @@ let upstream-info = (lib.importJSON ./upstream-info.json).${channel}; mkChromiumDerivation = callPackage ./common.nix ({ - inherit channel gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs + inherit channel gnome2 gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport ungoogled; gnChromium = gn.overrideAttrs (oldAttrs: { inherit (upstream-info.deps.gn) version; @@ -156,7 +156,7 @@ in stdenv.mkDerivation { gsettings-desktop-schemas glib gtk3 # needed for XDG_ICON_DIRS - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; outputs = ["out" "sandbox"]; diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix index 874a73dae8e84..00f1e11960eff 100644 --- a/pkgs/applications/networking/browsers/eolie/default.nix +++ b/pkgs/applications/networking/browsers/eolie/default.nix @@ -1,7 +1,7 @@ { lib, fetchgit, meson, ninja, pkg-config, nix-update-script , python3, gtk3, libsecret, gst_all_1, webkitgtk, glib , glib-networking, gtkspell3, hunspell, desktop-file-utils -, gobject-introspection, wrapGAppsHook, gnome3 }: +, gobject-introspection, wrapGAppsHook, gnome }: python3.pkgs.buildPythonApplication rec { pname = "eolie"; @@ -33,7 +33,7 @@ python3.pkgs.buildPythonApplication rec { gst-plugins-base gst-plugins-ugly gstreamer - gnome3.gnome-settings-daemon + gnome.gnome-settings-daemon gtk3 gtkspell3 hunspell diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index ffba1096d1d4b..fc7029933383f 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -28,7 +28,7 @@ , libXt , libcanberra , libnotify -, gnome3 +, gnome , libGLU, libGL , nspr , nss @@ -139,7 +139,7 @@ stdenv.mkDerivation { inherit gtk3; - buildInputs = [ wrapGAppsHook gtk3 gnome3.adwaita-icon-theme ]; + buildInputs = [ wrapGAppsHook gtk3 gnome.adwaita-icon-theme ]; # "strip" after "patchelf" may break binaries. # See: https://github.com/NixOS/patchelf/issues/10 diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 62bb722652a71..793e8688a5fa4 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -3,7 +3,7 @@ ## various stuff that can be plugged in , ffmpeg, xorg, alsaLib, libpulseaudio, libcanberra-gtk2, libglvnd, libnotify -, gnome3/*.gnome-shell*/ +, gnome/*.gnome-shell*/ , browserpass, chrome-gnome-shell, uget-integrator, plasma5Packages, bukubrow, pipewire , tridactyl-native , fx_cast_bridge @@ -269,7 +269,7 @@ let --set MOZ_ENABLE_WAYLAND "1" \ ''}${lib.optionalString (browser ? gtk3) ''--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_DATA_DIRS : '${gnome3.adwaita-icon-theme}/share' + --suffix XDG_DATA_DIRS : '${gnome.adwaita-icon-theme}/share' '' } ############################# diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 36d97b5a87c47..a7b9ddd07d0d9 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -38,7 +38,7 @@ , chromium , gsettings-desktop-schemas -, gnome3 +, gnome # For video acceleration via VA-API (--enable-features=VaapiVideoDecoder) , libvaSupport ? true, libva @@ -88,7 +88,7 @@ in stdenv.mkDerivation { gsettings-desktop-schemas glib gtk3 # needed for XDG_ICON_DIRS - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; unpackPhase = '' diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index acd10e0ea388c..72b17400df30d 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -36,7 +36,7 @@ # Wrapper runtime , coreutils , glibcLocales -, gnome3 +, gnome , runtimeShell , shared-mime-info , gsettings-desktop-schemas @@ -246,7 +246,7 @@ stdenv.mkDerivation rec { "${graphene-hardened-malloc}/lib/libhardened_malloc.so"} WRAPPER_XDG_DATA_DIRS=${concatMapStringsSep ":" (x: "${x}/share") [ - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme shared-mime-info ]} WRAPPER_XDG_DATA_DIRS+=":"${concatMapStringsSep ":" (x: "${x}/share/gsettings-schemas/${x.name}") [ diff --git a/pkgs/applications/networking/dropbox/cli.nix b/pkgs/applications/networking/dropbox/cli.nix index 57b39383e97da..f602bab27e8a8 100644 --- a/pkgs/applications/networking/dropbox/cli.nix +++ b/pkgs/applications/networking/dropbox/cli.nix @@ -5,7 +5,7 @@ , python3 , dropbox , gtk3 -, gnome3 +, gnome , gdk-pixbuf , gobject-introspection }: @@ -49,7 +49,7 @@ stdenv.mkDerivation { buildInputs = [ python3 gtk3 - gnome3.nautilus + gnome.nautilus ]; configureFlags = [ diff --git a/pkgs/applications/networking/feedreaders/feedreader/default.nix b/pkgs/applications/networking/feedreaders/feedreader/default.nix index c9339601a4b3a..4623e5fa4df28 100644 --- a/pkgs/applications/networking/feedreaders/feedreader/default.nix +++ b/pkgs/applications/networking/feedreaders/feedreader/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, nix-update-script, meson, ninja, pkg-config, vala, gettext, python3 , appstream-glib, desktop-file-utils, wrapGAppsHook, gnome-online-accounts , gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas -, curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2 +, curl, glib, gnome, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2 }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl glib json-glib libnotify libsecret sqlite gumbo gtk3 - libgee libpeas gnome3.libsoup librest webkitgtk gsettings-desktop-schemas + libgee libpeas gnome.libsoup librest webkitgtk gsettings-desktop-schemas gnome-online-accounts ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good diff --git a/pkgs/applications/networking/instant-messengers/coyim/default.nix b/pkgs/applications/networking/instant-messengers/coyim/default.nix index 31896f20184f7..abcdf617352b4 100644 --- a/pkgs/applications/networking/instant-messengers/coyim/default.nix +++ b/pkgs/applications/networking/instant-messengers/coyim/default.nix @@ -1,5 +1,5 @@ { lib, buildGoPackage, fetchFromGitHub, pkg-config, - cairo, gdk-pixbuf, glib, gnome3, wrapGAppsHook, gtk3 }: + cairo, gdk-pixbuf, glib, gnome, wrapGAppsHook, gtk3 }: buildGoPackage rec { pname = "coyim"; @@ -16,7 +16,7 @@ buildGoPackage rec { nativeBuildInputs = [ pkg-config wrapGAppsHook ]; - buildInputs = [ glib cairo gdk-pixbuf gtk3 gnome3.adwaita-icon-theme ]; + buildInputs = [ glib cairo gdk-pixbuf gtk3 gnome.adwaita-icon-theme ]; meta = with lib; { description = "a safe and secure chat client"; diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 29a69b4019202..d07b7d2912a39 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , vala, cmake, ninja, wrapGAppsHook, pkg-config, gettext -, gobject-introspection, gnome3, glib, gdk-pixbuf, gtk3, glib-networking +, gobject-introspection, gnome, glib, gdk-pixbuf, gtk3, glib-networking , xorg, libXdmcp, libxkbcommon , libnotify, libsoup, libgee , librsvg, libsignal-protocol-c @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { glib-networking glib libgee - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme sqlite gdk-pixbuf gtk3 diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index c78141f6eb224..ee9c902543ca3 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -1,7 +1,7 @@ { lib, fetchurl, gettext, wrapGAppsHook # Native dependencies -, python3, gtk3, gobject-introspection, gnome3 +, python3, gtk3, gobject-introspection, gnome , glib-networking # Test dependencies @@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec { }; buildInputs = [ - gobject-introspection gtk3 gnome3.adwaita-icon-theme + gobject-introspection gtk3 gnome.adwaita-icon-theme glib-networking ] ++ lib.optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-good libnice ] ++ lib.optional enableSecrets libsecret diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 764a5ac3db51a..8caafdd57624e 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, dpkg -, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gnome2, gnome3 +, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gnome2, gnome , gtk3, libappindicator-gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook, xorg , at-spi2-atk, libuuid, at-spi2-core, libdrm, mesa, libxkbcommon }: @@ -31,7 +31,7 @@ let gtk3 libappindicator-gtk3 - gnome3.gnome-keyring + gnome.gnome-keyring libnotify libpulseaudio diff --git a/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix index 7c0f80d223836..46215db3eb566 100644 --- a/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, stdenv, gnome3, cmake, pkg-config, +{ fetchFromGitHub, lib, stdenv, gnome, cmake, pkg-config, libappindicator-gtk3, gst_all_1, pcre }: stdenv.mkDerivation rec { @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gnome3.gtkmm - gnome3.webkitgtk + gnome.gtkmm + gnome.webkitgtk libappindicator-gtk3 gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index 570b2d13be14f..4401a0a7df80f 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gnome3, gmime3, webkitgtk, ronn +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gnome, gmime3, webkitgtk, ronn , libsass, notmuch, boost, wrapGAppsHook, glib-networking, protobuf, vim_configurable , gtkmm3, libpeas, gsettings-desktop-schemas, gobject-introspection, python3 @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtkmm3 gmime3 webkitgtk libsass libpeas python3 - notmuch boost gsettings-desktop-schemas gnome3.adwaita-icon-theme + notmuch boost gsettings-desktop-schemas gnome.adwaita-icon-theme glib-networking protobuf vim ]; diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index 3bf5b5075c66a..ad43ed97e09cc 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gnome3, cmake, gettext, intltool, pkg-config, evolution-data-server, evolution +{ lib, stdenv, fetchurl, gnome, cmake, gettext, intltool, pkg-config, evolution-data-server, evolution , sqlite, gtk3, webkitgtk, libgdata, libmspack }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "evolution-ews"; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index e703f5d7401b2..53fe3d6f9496c 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -24,7 +24,7 @@ , db , gcr , sqlite -, gnome3 +, gnome , librsvg , gdk-pixbuf , libsecret @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme bogofilter db evolution-data-server @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { gdk-pixbuf glib glib-networking - gnome3.gnome-desktop + gnome.gnome-desktop gsettings-desktop-schemas gst_all_1.gst-plugins-base gst_all_1.gstreamer @@ -115,7 +115,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "evolution"; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix index cfbaa988c7124..7837393926f63 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix @@ -1,8 +1,8 @@ -{ lib, makeWrapper, symlinkJoin, gnome3, plugins }: +{ lib, makeWrapper, symlinkJoin, gnome, plugins }: symlinkJoin { name = "evolution-with-plugins"; - paths = [ gnome3.evolution-data-server ] ++ plugins; + paths = [ gnome.evolution-data-server ] ++ plugins; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix index dda6abac8e56a..83e8984db7bd8 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix @@ -30,7 +30,7 @@ , libXt , libxcb , libcanberra -, gnome3 +, gnome , libGLU, libGL , nspr , nss @@ -116,7 +116,7 @@ stdenv.mkDerivation { stdenv.cc.cc ]; - buildInputs = [ gtk3 gnome3.adwaita-icon-theme ]; + buildInputs = [ gtk3 gnome.adwaita-icon-theme ]; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index d16cbfc1bca02..b81128545d59b 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -13,7 +13,7 @@ , gdk-pixbuf , glib , glibc -, gnome3 +, gnome , gnugrep , gnupg , gnused @@ -115,7 +115,7 @@ stdenv.mkDerivation { stdenv.cc.cc ]; - buildInputs = [ gtk3 gnome3.adwaita-icon-theme ]; + buildInputs = [ gtk3 gnome.adwaita-icon-theme ]; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix index a39b4aab8371d..f0fb5a1239a1a 100644 --- a/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/pkgs/applications/networking/p2p/retroshare/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libupnp, gpgme, gnome3, glib, libssh, pkg-config, protobuf, bzip2 +{ lib, stdenv, fetchFromGitHub, libupnp, gpgme, gnome, glib, libssh, pkg-config, protobuf, bzip2 , libXScrnSaver, speex, curl, libxml2, libxslt, sqlcipher, libmicrohttpd, opencv, qmake, ffmpeg_3 , qtmultimedia, qtx11extras, qttools }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ - speex libupnp gpgme gnome3.libgnome-keyring glib libssh qtmultimedia qtx11extras qttools + speex libupnp gpgme gnome.libgnome-keyring glib libssh qtmultimedia qtx11extras qttools protobuf bzip2 libXScrnSaver curl libxml2 libxslt sqlcipher libmicrohttpd opencv ffmpeg_3 ]; diff --git a/pkgs/applications/networking/pcloud/default.nix b/pkgs/applications/networking/pcloud/default.nix index 6cff01c1cc290..4b1eca32750e2 100644 --- a/pkgs/applications/networking/pcloud/default.nix +++ b/pkgs/applications/networking/pcloud/default.nix @@ -21,7 +21,7 @@ # Runtime dependencies; # A few additional ones (e.g. Node) are already shipped together with the # AppImage, so we don't have to duplicate them here. - alsaLib, dbus-glib, fuse, gnome3, gtk3, libdbusmenu-gtk2, libXdamage, udev, nss + alsaLib, dbus-glib, fuse, gnome, gtk3, libdbusmenu-gtk2, libXdamage, udev, nss }: let @@ -94,7 +94,7 @@ in stdenv.mkDerivation { # This is required for the file picker dialog - otherwise pcloud just # crashes - export XDG_DATA_DIRS="${gnome3.gsettings-desktop-schemas}/share/gsettings-schemas/${gnome3.gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS" + export XDG_DATA_DIRS="${gnome.gsettings-desktop-schemas}/share/gsettings-schemas/${gnome.gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS" exec "$out/app/pcloud" EOF diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index 8b1ef3c5863f6..8a96cf84755bf 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -1,5 +1,5 @@ { lib, stdenv, requireFile, makeWrapper, autoPatchelfHook, wrapGAppsHook, which, more -, file, atk, alsaLib, cairo, fontconfig, gdk-pixbuf, glib, gnome3, gtk2-x11, gtk3 +, file, atk, alsaLib, cairo, fontconfig, gdk-pixbuf, glib, gnome, gtk2-x11, gtk3 , heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2 , gnome2, mesa, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2 , libjpeg, libredirect, tzdata, cacert, systemd, libcxxabi, libcxx, e2fsprogs, symlinkJoin @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { freetype gdk-pixbuf gnome2.gtkglext - gnome3.webkitgtk + gnome.webkitgtk gtk2 gtk2-x11 gtk3 diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 5d0195b62f880..e2f1cf2c8a2ee 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -6,7 +6,7 @@ , libsecret, libsoup, spice-protocol, spice-gtk, epoxy, at-spi2-core , openssl, gsettings-desktop-schemas, json-glib, libsodium, webkitgtk, harfbuzz # The themes here are soft dependencies; only icons are missing without them. -, gnome3 +, gnome }: with lib; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { pcre2 libdbusmenu-gtk3 libappindicator-gtk3 libvncserver libpthreadstubs libXdmcp libxkbcommon libsecret libsoup spice-protocol spice-gtk epoxy at-spi2-core - openssl gnome3.adwaita-icon-theme json-glib libsodium webkitgtk + openssl gnome.adwaita-icon-theme json-glib libsodium webkitgtk harfbuzz ]; diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix index 015033d6ca569..158999f86fee4 100644 --- a/pkgs/applications/networking/syncthing-gtk/default.nix +++ b/pkgs/applications/networking/syncthing-gtk/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub, fetchpatch, libnotify, librsvg, killall , gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook -, gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3 +, gnome, buildPythonApplication, dateutil, pyinotify, pygobject3 , bcrypt, gobject-introspection, gsettings-desktop-schemas , pango, gdk-pixbuf, atk }: @@ -24,7 +24,7 @@ buildPythonApplication rec { buildInputs = [ gtk3 librsvg libappindicator-gtk3 - libnotify gnome3.adwaita-icon-theme + libnotify gnome.adwaita-icon-theme # Schemas with proxy configuration gsettings-desktop-schemas ]; diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix index 4e83f36ea5276..e32502749dc37 100644 --- a/pkgs/applications/office/abiword/default.nix +++ b/pkgs/applications/office/abiword/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkg-config, gtk3, fribidi , libpng, popt, libgsf, enchant, wv, librsvg, bzip2, libjpeg, perl -, boost, libxslt, goffice, wrapGAppsHook, gnome3 +, boost, libxslt, goffice, wrapGAppsHook, gnome }: stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 librsvg bzip2 fribidi libpng popt - libgsf enchant wv libjpeg perl boost libxslt goffice gnome3.adwaita-icon-theme + libgsf enchant wv libjpeg perl boost libxslt goffice gnome.adwaita-icon-theme ]; meta = with lib; { diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index f65781352b3f3..aacc2a2a579c7 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, intltool, perlPackages -, goffice, gnome3, wrapGAppsHook, gtk3, bison, python3Packages +, goffice, gnome, wrapGAppsHook, gtk3, bison, python3Packages , itstool }: @@ -20,14 +20,14 @@ in stdenv.mkDerivation rec { # ToDo: optional libgda, introspection? buildInputs = [ - goffice gtk3 gnome3.adwaita-icon-theme + goffice gtk3 gnome.adwaita-icon-theme python pygobject3 ] ++ (with perlPackages; [ perl XMLParser ]); enableParallelBuilding = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix index 9d085b6c88300..1d2d6f0d851d9 100644 --- a/pkgs/applications/office/grisbi/default.nix +++ b/pkgs/applications/office/grisbi/default.nix @@ -7,7 +7,7 @@ , intltool , wrapGAppsHook , libsoup -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { libofx intltool libsoup - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; meta = with lib; { diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index a586cea47ab39..b7da8c777a95c 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -1,5 +1,5 @@ { fetchurl, lib, stdenv, gtk, pkg-config, libofx, intltool, wrapGAppsHook -, libsoup, gnome3 }: +, libsoup, gnome }: stdenv.mkDerivation rec { name = "homebank-5.5.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ gtk libofx intltool libsoup - gnome3.adwaita-icon-theme ]; + gnome.adwaita-icon-theme ]; meta = with lib; { description = "Free, easy, personal accounting for everyone"; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index c9b1099f8b96b..1c5327ebc6ceb 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -12,7 +12,7 @@ , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf , librevenge, libe-book, libmwaw, glm, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook -, gnome3, glib, ncurses, epoxy, gpgme +, gnome, glib, ncurses, epoxy, gpgme , langs ? [ "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "zh-CN" ] , withHelp ? true , kdeIntegration ? false, mkDerivation ? null, qtbase ? null, qtx11extras ? null @@ -399,7 +399,7 @@ in (mkDrv rec { mdds bluez5 libcmis libwps libabw libzmf libxshmfence libatomic_ops graphite2 harfbuzz gpgme util-linux librevenge libe-book libmwaw glm ncurses epoxy - libodfgen CoinMP librdf_rasqal gnome3.adwaita-icon-theme gettext + libodfgen CoinMP librdf_rasqal gnome.adwaita-icon-theme gettext ] ++ (with gst_all_1; [ gstreamer diff --git a/pkgs/applications/office/paperwork/paperwork-gtk.nix b/pkgs/applications/office/paperwork/paperwork-gtk.nix index 847287c8c856b..d37db7cddb27f 100644 --- a/pkgs/applications/office/paperwork/paperwork-gtk.nix +++ b/pkgs/applications/office/paperwork/paperwork-gtk.nix @@ -2,7 +2,7 @@ , python3Packages , gtk3 , cairo -, gnome3 +, gnome , librsvg , xvfb_run , dbus @@ -63,7 +63,7 @@ python3Packages.buildPythonApplication rec { ]; buildInputs = [ - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme libnotify librsvg gtk3 diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index 65eb48f3b2d9c..b3a5ae44c936e 100644 --- a/pkgs/applications/office/tryton/default.nix +++ b/pkgs/applications/office/tryton/default.nix @@ -6,7 +6,7 @@ , atk , gtk3 , gtkspell3 -, gnome3 +, gnome , glib , goocanvas2 , gdk-pixbuf @@ -46,7 +46,7 @@ python3Packages.buildPythonApplication rec { atk gdk-pixbuf glib - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme goocanvas2 fontconfig freetype diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index f34a3e806af76..4cf3c3d78cecb 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3Packages, gtk3, gobject-introspection, wrapGAppsHook, gnome3 }: +{ lib, stdenv, fetchurl, python3Packages, gtk3, gobject-introspection, wrapGAppsHook, gnome }: # # TODO: Declare configuration options for the following optional dependencies: @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { sha256 = "13vhwsgv6mscgixypc0ixkgj0y7cpcm7z7wn1vmdrwp7kn8m3xgx"; }; - buildInputs = [ gtk3 gobject-introspection wrapGAppsHook gnome3.adwaita-icon-theme ]; + buildInputs = [ gtk3 gobject-introspection wrapGAppsHook gnome.adwaita-icon-theme ]; propagatedBuildInputs = with python3Packages; [ pyxdg pygobject3 ]; diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 1584972cbebd5..99fd54c5cc7f5 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -26,7 +26,7 @@ , libXrender , libXt , libnotify -, gnome3 +, gnome , libGLU, libGL , nspr , nss @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ wrapGAppsHook ]; - buildInputs= [ gsettings-desktop-schemas glib gtk3 gnome3.adwaita-icon-theme dconf ]; + buildInputs= [ gsettings-desktop-schemas glib gtk3 gnome.adwaita-icon-theme dconf ]; dontConfigure = true; dontBuild = true; diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 76048733a6a38..86bda3092bc47 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitLab -, gnome3 +, gnome , dconf , wxGTK30 , wxGTK31 @@ -187,7 +187,7 @@ stdenv.mkDerivation rec { makeWrapperArgs = with passthru.libraries; [ "--prefix XDG_DATA_DIRS : ${base}/share" "--prefix XDG_DATA_DIRS : ${hicolor-icon-theme}/share" - "--prefix XDG_DATA_DIRS : ${gnome3.adwaita-icon-theme}/share" + "--prefix XDG_DATA_DIRS : ${gnome.adwaita-icon-theme}/share" "--prefix XDG_DATA_DIRS : ${wxGTK.gtk}/share/gsettings-schemas/${wxGTK.gtk.name}" "--prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" # wrapGAppsHook did these two as well, no idea if it matters... diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 20a17b11221a0..9d6212fef1126 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -9,7 +9,7 @@ , customOCamlPackages ? null , ocamlPackages_4_05, ocamlPackages_4_09, ocamlPackages_4_10, ncurses , buildIde ? true -, glib, gnome3, wrapGAppsHook +, glib, gnome, wrapGAppsHook , csdp ? null , version, coq-version ? null, }@args: @@ -128,7 +128,7 @@ self = stdenv.mkDerivation { buildInputs = [ ncurses ] ++ ocamlBuildInputs ++ optionals buildIde (if versionAtLeast "8.10" - then [ ocamlPackages.lablgtk3-sourceview3 glib gnome3.adwaita-icon-theme wrapGAppsHook ] + then [ ocamlPackages.lablgtk3-sourceview3 glib gnome.adwaita-icon-theme wrapGAppsHook ] else [ ocamlPackages.lablgtk ]); postPatch = '' diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 25215d7abb56d..94e675d7dd444 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , wrapGAppsHook, cmake, gettext -, maxima, wxGTK, gnome3 }: +, maxima, wxGTK, gnome }: stdenv.mkDerivation rec { pname = "wxmaxima"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-5nvaaKsvSEs7QxOszjDK1Xkana2er1BCMZ83b1JZSqc="; }; - buildInputs = [ wxGTK maxima gnome3.adwaita-icon-theme ]; + buildInputs = [ wxGTK maxima gnome.adwaita-icon-theme ]; nativeBuildInputs = [ wrapGAppsHook cmake gettext ]; diff --git a/pkgs/applications/terminal-emulators/kgx/default.nix b/pkgs/applications/terminal-emulators/kgx/default.nix index 4e8cf06c1fdb6..dc5c651d50a59 100644 --- a/pkgs/applications/terminal-emulators/kgx/default.nix +++ b/pkgs/applications/terminal-emulators/kgx/default.nix @@ -3,7 +3,7 @@ , genericBranding ? false , fetchFromGitLab , gettext -, gnome3 +, gnome , libgtop , gtk3 , libhandy @@ -35,7 +35,7 @@ stdenv.mkDerivation { buildInputs = [ gettext libgtop - gnome3.nautilus + gnome.nautilus gtk3 libhandy pcre2 diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix index 94629314341de..b9f7d4ef677be 100644 --- a/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { "--enable-ind" #indic scripts "--enable-fribidi" #bidi scripts "--with-tools=mlclient,mlconfig,mlcc,mlterm-menu,mlimgloader,registobmp,mlfc" - #mlterm-menu and mlconfig depend on enabling gnome3.at-spi2-core + #mlterm-menu and mlconfig depend on enabling gnome.at-spi2-core #and configuring ~/.mlterm/key correctly. ] ++ lib.optionals (!stdenv.isDarwin) [ "--with-x=yes" diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 7e4b7a84075ea..c8b95fa238f73 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, libXcomposite, libgnome-keyring, makeWrapper, udev, curl, alsaLib -, libXfixes, atk, gtk3, libXrender, pango, gnome3, cairo, freetype, fontconfig +, libXfixes, atk, gtk3, libXrender, pango, gnome, cairo, freetype, fontconfig , libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst , nss, nspr, cups, fetchzip, expat, gdk-pixbuf, libXdamage, libXrandr, dbus , makeDesktopItem, openssl, wrapGAppsHook, at-spi2-atk, at-spi2-core, libuuid @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; - buildInputs = [ gtk3 gnome3.adwaita-icon-theme ]; + buildInputs = [ gtk3 gnome.adwaita-icon-theme ]; installPhase = '' runHook preInstall diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 95a9f2d724244..9859163031c34 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -12,7 +12,7 @@ , gobject-introspection , gtk3 , gtksourceview4 -, gnome3 +, gnome , gsettings-desktop-schemas }: @@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication rec { gtk3 gtksourceview4 gsettings-desktop-schemas - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; propagatedBuildInputs = with python3.pkgs; [ @@ -57,7 +57,7 @@ python3.pkgs.buildPythonApplication rec { strictDeps = false; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index 324c61ab194bd..14e1173d406ff 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -4,7 +4,7 @@ , jre , gtk3 , glib -, gnome3 +, gnome , wrapGAppsHook , libXtst , which @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ wrapGAppsHook ]; - buildInputs = [ jre gnome3.adwaita-icon-theme gtk3 ]; + buildInputs = [ jre gnome.adwaita-icon-theme gtk3 ]; preFixup = with lib; '' gappsWrapperArgs+=( \ diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix index 80e1c1260bd4a..a9eee05d238f8 100644 --- a/pkgs/applications/video/byzanz/default.nix +++ b/pkgs/applications/video/byzanz/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, wrapGAppsHook, which, gnome3, glib, intltool, pkg-config, libtool, cairo, gtk3, gst_all_1, xorg }: +{ lib, stdenv, fetchgit, wrapGAppsHook, which, gnome, glib, intltool, pkg-config, libtool, cairo, gtk3, gst_all_1, xorg }: stdenv.mkDerivation { version = "0.2.3.alpha"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ which gnome3.gnome-common glib intltool libtool cairo gtk3 xorg.xwininfo xorg.libXdamage ] + buildInputs = [ which gnome.gnome-common glib intltool libtool cairo gtk3 xorg.xwininfo xorg.libXdamage ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-bad gst-plugins-good gst-plugins-ugly gst-libav wrapGAppsHook ]); meta = with lib; { diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index b9707e7c24937..b1be6035f9e83 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -11,7 +11,7 @@ , gobject-introspection , libpeas , librsvg -, gnome3 +, gnome , libnotify , gsound , meson @@ -52,9 +52,9 @@ python3Packages.buildPythonApplication rec { gtk3 libpeas librsvg - gnome3.gnome-desktop + gnome.gnome-desktop gsound - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gsettings-desktop-schemas libnotify ] ++ (with gst_all_1; [ @@ -89,7 +89,7 @@ python3Packages.buildPythonApplication rec { strictDeps = false; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "pitivi"; versionPolicy = "none"; # we are using dev version, since the stable one is too old }; diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 922d6fa9ff1d4..f15a2e9149669 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -1,7 +1,7 @@ { lib, fetchurl, python3Packages, intltool, file , wrapGAppsHook, gtk-vnc, vte, avahi, dconf , gobject-introspection, libvirt-glib, system-libvirt -, gsettings-desktop-schemas, libosinfo, gnome3 +, gsettings-desktop-schemas, libosinfo, gnome , gtksourceview4, docutils , spiceSupport ? true, spice-gtk ? null , cpio, e2fsprogs, findutils, gzip @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ wrapGAppsHook - libvirt-glib vte dconf gtk-vnc gnome3.adwaita-icon-theme avahi + libvirt-glib vte dconf gtk-vnc gnome.adwaita-icon-theme avahi gsettings-desktop-schemas libosinfo gtksourceview4 gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943 ] ++ optional spiceSupport spice-gtk; diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index 95faee74dbc7e..8be84abbdfb90 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -11,7 +11,7 @@ , pulseaudio , glib , gtk3 -, gnome3 +, gnome , gcr , pam , systemd @@ -52,7 +52,7 @@ let [ -n "$WLR_BACKENDS" ] || WLR_BACKENDS=drm,libinput export WLR_BACKENDS exec "${phoc}/bin/phoc" -C "$PHOC_INI" \ - -E "bash -lc 'XDG_DATA_DIRS=$XDG_DATA_DIRS:\$XDG_DATA_DIRS ${gnome3.gnome-session}/bin/gnome-session $GNOME_SESSION_ARGS'" + -E "bash -lc 'XDG_DATA_DIRS=$XDG_DATA_DIRS:\$XDG_DATA_DIRS ${gnome.gnome-session}/bin/gnome-session $GNOME_SESSION_ARGS'" ''; in stdenv.mkDerivation rec { @@ -85,9 +85,9 @@ in stdenv.mkDerivation rec { gcr networkmanager polkit - gnome3.gnome-control-center - gnome3.gnome-desktop - gnome3.gnome-session + gnome.gnome-control-center + gnome.gnome-desktop + gnome.gnome-session gtk3 pam systemd @@ -131,7 +131,7 @@ in stdenv.mkDerivation rec { # Depends on GSettings schemas in gnome-shell preFixup = '' gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gnome3.gnome-shell}/share/gsettings-schemas/${gnome3.gnome-shell.name}" + --prefix XDG_DATA_DIRS : "${gnome.gnome-shell}/share/gsettings-schemas/${gnome.gnome-shell.name}" ) ''; diff --git a/pkgs/applications/window-managers/xmonad/log-applet/default.nix b/pkgs/applications/window-managers/xmonad/log-applet/default.nix index 830242667db6b..2e41cc2c97c63 100644 --- a/pkgs/applications/window-managers/xmonad/log-applet/default.nix +++ b/pkgs/applications/window-managers/xmonad/log-applet/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, glib, dbus-glib , desktopSupport ? "gnomeflashback", xorg , gtk2 -, gtk3, gnome3, mate +, gtk3, gnome, mate , libxfce4util, xfce4-panel }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ glib dbus-glib xorg.xcbutilwm ] - ++ lib.optionals (desktopSupport == "gnomeflashback") [ gtk3 gnome3.gnome-panel ] + ++ lib.optionals (desktopSupport == "gnomeflashback") [ gtk3 gnome.gnome-panel ] ++ lib.optionals (desktopSupport == "mate") [ gtk3 mate.mate-panel ] ++ lib.optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4-panel ] ; diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index 7659c9f42a10e..3a820853b1fb5 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -61,7 +61,7 @@ rec { targetPkgs = pkgs: with pkgs; [ gtk3 bashInteractive - gnome3.zenity + gnome.zenity python2 xorg.xrandr which diff --git a/pkgs/data/documentation/gnome-user-docs/default.nix b/pkgs/data/documentation/gnome-user-docs/default.nix index 39fe4235f1355..e76fee1a6eb87 100644 --- a/pkgs/data/documentation/gnome-user-docs/default.nix +++ b/pkgs/data/documentation/gnome-user-docs/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl , gettext -, gnome3 +, gnome , itstool , libxml2 , yelp-tools @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/data/fonts/cantarell-fonts/default.nix b/pkgs/data/fonts/cantarell-fonts/default.nix index dc0b8cc23eb65..011e88dc1d2ec 100644 --- a/pkgs/data/fonts/cantarell-fonts/default.nix +++ b/pkgs/data/fonts/cantarell-fonts/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, gettext, appstream-glib, gnome3 }: +{ lib, stdenv, fetchurl, meson, ninja, gettext, appstream-glib, gnome }: stdenv.mkDerivation rec { pname = "cantarell-fonts"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { outputHash = "1sczskw2kv3qy39i9mzw2lkl94a90bjgv5ln9acy5kh4gb2zmy7z"; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/data/icons/arc-icon-theme/default.nix b/pkgs/data/icons/arc-icon-theme/default.nix index 6b7de57a4ff12..88184b585ecf8 100644 --- a/pkgs/data/icons/arc-icon-theme/default.nix +++ b/pkgs/data/icons/arc-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, gtk3, gnome3, moka-icon-theme, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, gtk3, gnome, moka-icon-theme, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "arc-icon-theme"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ moka-icon-theme - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gnome-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix index dfcd2f596797b..384086204c1b6 100644 --- a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix +++ b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, gdk-pixbuf, optipng, librsvg, gtk3, pantheon, gnome3, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, pkg-config, gdk-pixbuf, optipng, librsvg, gtk3, pantheon, gnome, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "elementary-xfce-icon-theme"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ pantheon.elementary-icon-theme - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gnome-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/data/icons/humanity-icon-theme/default.nix b/pkgs/data/icons/humanity-icon-theme/default.nix index 13ee96d049985..12e2d0a06d629 100644 --- a/pkgs/data/icons/humanity-icon-theme/default.nix +++ b/pkgs/data/icons/humanity-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gtk3, gnome3, hicolor-icon-theme }: +{ lib, stdenv, fetchurl, gtk3, gnome, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "humanity-icon-theme"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/data/icons/paper-icon-theme/default.nix b/pkgs/data/icons/paper-icon-theme/default.nix index c84369a8a4a94..a8eb1a8736d68 100644 --- a/pkgs/data/icons/paper-icon-theme/default.nix +++ b/pkgs/data/icons/paper-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, gnome3, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, gnome, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "paper-icon-theme"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gnome-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/data/icons/pop-icon-theme/default.nix b/pkgs/data/icons/pop-icon-theme/default.nix index cb7db20d67cac..1bcfab57b4a99 100644 --- a/pkgs/data/icons/pop-icon-theme/default.nix +++ b/pkgs/data/icons/pop-icon-theme/default.nix @@ -4,7 +4,7 @@ , ninja , gtk3 , breeze-icons -, gnome3 +, gnome , pantheon , hicolor-icon-theme }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ breeze-icons - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme pantheon.elementary-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/data/misc/mobile-broadband-provider-info/default.nix b/pkgs/data/misc/mobile-broadband-provider-info/default.nix index fba9580107aea..49755dbd8ad6f 100644 --- a/pkgs/data/misc/mobile-broadband-provider-info/default.nix +++ b/pkgs/data/misc/mobile-broadband-provider-info/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gnome3, libxslt }: +{ lib, stdenv, fetchurl, gnome, libxslt }: stdenv.mkDerivation rec { pname = "mobile-broadband-provider-info"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/data/themes/adapta/default.nix b/pkgs/data/themes/adapta/default.nix index f67d689a4bfc0..fc6e5b8c35534 100644 --- a/pkgs/data/themes/adapta/default.nix +++ b/pkgs/data/themes/adapta/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, parallel, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine, gnome3 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, parallel, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine, gnome }: stdenv.mkDerivation rec { pname = "adapta-gtk-theme"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { inkscape libxml2 glib.dev - gnome3.gnome-shell + gnome.gnome-shell ]; buildInputs = [ diff --git a/pkgs/data/themes/arc/default.nix b/pkgs/data/themes/arc/default.nix index 8a283a0418522..fff5e4bf41a5a 100644 --- a/pkgs/data/themes/arc/default.nix +++ b/pkgs/data/themes/arc/default.nix @@ -4,7 +4,7 @@ , autoreconfHook , pkg-config , gtk3 -, gnome3 +, gnome , gtk-engine-murrine , optipng , inkscape @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]; propagatedUserEnvPkgs = [ - gnome3.gnome-themes-extra + gnome.gnome-themes-extra gtk-engine-murrine ]; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-cinnamon=${cinnamon.cinnamon-common.version}" - "--with-gnome-shell=${gnome3.gnome-shell.version}" + "--with-gnome-shell=${gnome.gnome-shell.version}" "--disable-unity" ]; diff --git a/pkgs/data/themes/canta/default.nix b/pkgs/data/themes/canta/default.nix index cf1223152088c..431522fa85e89 100644 --- a/pkgs/data/themes/canta/default.nix +++ b/pkgs/data/themes/canta/default.nix @@ -4,7 +4,7 @@ , librsvg , gtk-engine-murrine , gtk3 -, gnome3 +, gnome , gnome-icon-theme , numix-icon-theme-circle , hicolor-icon-theme @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gnome-icon-theme numix-icon-theme-circle hicolor-icon-theme diff --git a/pkgs/data/themes/equilux-theme/default.nix b/pkgs/data/themes/equilux-theme/default.nix index 162b878850895..067c2b88a0990 100644 --- a/pkgs/data/themes/equilux-theme/default.nix +++ b/pkgs/data/themes/equilux-theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gnome3, glib, libxml2, gtk-engine-murrine, gdk-pixbuf, librsvg, bc }: +{ lib, stdenv, fetchFromGitHub, gnome, glib, libxml2, gtk-engine-murrine, gdk-pixbuf, librsvg, bc }: stdenv.mkDerivation rec { pname = "equilux-theme"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ glib libxml2 bc ]; - buildInputs = [ gnome3.gnome-themes-extra gdk-pixbuf librsvg ]; + buildInputs = [ gnome.gnome-themes-extra gdk-pixbuf librsvg ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { patchShebangs install.sh sed -i install.sh \ -e "s|if .*which gnome-shell.*;|if true;|" \ - -e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${lib.versions.majorMinor gnome3.gnome-shell.version}|" + -e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${lib.versions.majorMinor gnome.gnome-shell.version}|" mkdir -p $out/share/themes ./install.sh --dest $out/share/themes rm $out/share/themes/*/COPYING diff --git a/pkgs/data/themes/lounge/default.nix b/pkgs/data/themes/lounge/default.nix index 0c51b78333dc1..ab945f5105383 100644 --- a/pkgs/data/themes/lounge/default.nix +++ b/pkgs/data/themes/lounge/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, sassc, gtk3, gnome3, gdk-pixbuf, librsvg, gtk-engine-murrine }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, sassc, gtk3, gnome, gdk-pixbuf, librsvg, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "lounge-gtk-theme"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gtk-engine-murrine ]; mesonFlags = [ - "-D gnome_version=${lib.versions.majorMinor gnome3.gnome-shell.version}" + "-D gnome_version=${lib.versions.majorMinor gnome.gnome-shell.version}" ]; postFixup = '' diff --git a/pkgs/data/themes/materia-theme/default.nix b/pkgs/data/themes/materia-theme/default.nix index d34ece5c94f7f..f9e3463f2fdc6 100644 --- a/pkgs/data/themes/materia-theme/default.nix +++ b/pkgs/data/themes/materia-theme/default.nix @@ -3,7 +3,7 @@ , meson , ninja , sassc -, gnome3 +, gnome , gtk-engine-murrine , gdk-pixbuf , librsvg @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gnome3.gnome-themes-extra + gnome.gnome-themes-extra gdk-pixbuf librsvg ]; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { dontBuild = true; mesonFlags = [ - "-Dgnome_shell_version=${lib.versions.majorMinor gnome3.gnome-shell.version}" + "-Dgnome_shell_version=${lib.versions.majorMinor gnome.gnome-shell.version}" ]; postInstall = '' diff --git a/pkgs/data/themes/ubuntu-themes/default.nix b/pkgs/data/themes/ubuntu-themes/default.nix index 732c9a74573b9..fb23141a64eb9 100644 --- a/pkgs/data/themes/ubuntu-themes/default.nix +++ b/pkgs/data/themes/ubuntu-themes/default.nix @@ -2,7 +2,7 @@ , fetchurl , fetchpatch , gnome-icon-theme -, gnome3 +, gnome , gtk-engine-murrine , gtk3 , hicolor-icon-theme @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ gnome-icon-theme - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme humanity-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix index f0d2493473a48..c2f449e9f2080 100644 --- a/pkgs/data/themes/yaru/default.nix +++ b/pkgs/data/themes/yaru/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, meson, sassc, pkg-config, glib, ninja, - python3, gtk3, gnome3, gtk-engine-murrine, humanity-icon-theme, hicolor-icon-theme }: + python3, gtk3, gnome, gtk-engine-murrine, humanity-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "yaru"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; - buildInputs = [ gtk3 gnome3.gnome-themes-extra ]; + buildInputs = [ gtk3 gnome.gnome-themes-extra ]; propagatedBuildInputs = [ humanity-icon-theme hicolor-icon-theme ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 65eede2583264..a5800b01a3036 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -28,7 +28,7 @@ , wrapGAppsHook , libxml2 , gtk-doc -, gnome3 +, gnome , python3 , keybinder3 , cairo @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { # bindings cairo - gnome3.caribou + gnome.caribou keybinder3 upower xapps diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix index c2e50c65557ef..4208b92ae2d55 100644 --- a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix @@ -18,7 +18,7 @@ , libxklavier , networkmanager , libwacom -, gnome3 +, gnome , wrapGAppsHook , tzdata , glibc diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix index 39dee473cc5a2..b70673253edf2 100644 --- a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix @@ -12,7 +12,7 @@ , libxslt , gtk3 , libgnomekbd -, gnome3 +, gnome , libtool , wrapGAppsHook , gobject-introspection @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { cinnamon-desktop cinnamon-common libgnomekbd - gnome3.caribou + gnome.caribou # things iso-flags-png-320x420 diff --git a/pkgs/desktops/cinnamon/cjs/default.nix b/pkgs/desktops/cinnamon/cjs/default.nix index 3c01d00393724..1a1e8132bd630 100644 --- a/pkgs/desktops/cinnamon/cjs/default.nix +++ b/pkgs/desktops/cinnamon/cjs/default.nix @@ -7,7 +7,7 @@ , wrapGAppsHook , python3 , cairo -, gnome3 +, gnome , xapps , keybinder3 , upower @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { glib # bindings - gnome3.caribou + gnome.caribou keybinder3 upower xapps diff --git a/pkgs/desktops/cinnamon/mint-x-icons/default.nix b/pkgs/desktops/cinnamon/mint-x-icons/default.nix index f52b0556d564d..f4a04cf33a84a 100644 --- a/pkgs/desktops/cinnamon/mint-x-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-x-icons/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub , lib, stdenv -, gnome3 +, gnome , gnome-icon-theme , hicolor-icon-theme , gtk3 @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gnome-icon-theme hicolor-icon-theme humanity-icon-theme diff --git a/pkgs/desktops/cinnamon/mint-y-icons/default.nix b/pkgs/desktops/cinnamon/mint-y-icons/default.nix index 8d55e81c58c21..e04a1baa6696d 100644 --- a/pkgs/desktops/cinnamon/mint-y-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-y-icons/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub , lib, stdenv -, gnome3 +, gnome , gnome-icon-theme , hicolor-icon-theme , gtk3 @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gnome-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/desktops/cinnamon/muffin/default.nix b/pkgs/desktops/cinnamon/muffin/default.nix index 2df5f875b41cb..5470933d619b8 100644 --- a/pkgs/desktops/cinnamon/muffin/default.nix +++ b/pkgs/desktops/cinnamon/muffin/default.nix @@ -2,7 +2,7 @@ , cinnamon-desktop , glib , file -, gnome3 +, gnome , gnome-doc-utils , fetchpatch , gobject-introspection @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { xorg.xkeyboardconfig libxkbcommon - gnome3.zenity + gnome.zenity libinput libstartup_notification libXtst diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix deleted file mode 100644 index e634037b87194..0000000000000 --- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ lib -, fetchurl -, pkg-config -, gnome3 -, gtk3 -, wrapGAppsHook -, gobject-introspection -, itstool -, libxml2 -, python3 -, at-spi2-core -, dbus -, gettext -, libwnck3 -, adwaita-icon-theme -}: - -python3.pkgs.buildPythonApplication rec { - pname = "accerciser"; - version = "3.38.0"; - - format = "other"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0fd9vv2abd2if2qj4nlfy7mpd7rc4sx18zhmxd5ijlnfhkpggbp5"; - }; - - nativeBuildInputs = [ - gettext - gobject-introspection # For setup hook - itstool - libxml2 - pkg-config - dbus - wrapGAppsHook - ]; - - buildInputs = [ - adwaita-icon-theme - at-spi2-core - gtk3 - libwnck3 - ]; - - propagatedBuildInputs = with python3.pkgs; [ - ipython - pyatspi - pycairo - pygobject3 - setuptools - xlib - ]; - - # Strict deps breaks accerciser - # and https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "accerciser"; - attrPath = "gnome3.accerciser"; - versionPolicy = "odd-unstable"; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Accerciser"; - description = "Interactive Python accessibility explorer"; - maintainers = teams.gnome.members; - license = licenses.bsd3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome-3/apps/cheese/default.nix deleted file mode 100644 index 75c3060f51dff..0000000000000 --- a/pkgs/desktops/gnome-3/apps/cheese/default.nix +++ /dev/null @@ -1,121 +0,0 @@ -{ lib -, stdenv -, gettext -, fetchurl -, fetchpatch -, wrapGAppsHook -, gnome-video-effects -, libcanberra-gtk3 -, pkg-config -, gtk3 -, glib -, clutter-gtk -, clutter-gst -, gst_all_1 -, itstool -, vala -, docbook_xml_dtd_43 -, docbook-xsl-nons -, appstream-glib -, libxslt -, gtk-doc -, adwaita-icon-theme -, librsvg -, totem -, gdk-pixbuf -, gnome3 -, gnome-desktop -, libxml2 -, meson -, ninja -, dbus -, python3 -}: - -stdenv.mkDerivation rec { - pname = "cheese"; - version = "3.38.0"; - - outputs = [ "out" "man" "devdoc" ]; - - src = fetchurl { - url = "mirror://gnome/sources/cheese/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0vyim2avlgq3a48rgdfz5g21kqk11mfb53b2l883340v88mp7ll8"; - }; - - patches = [ - # Fix build with latest Vala or GLib - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/cheese/commit/7cf6268e54620bbbe5e6e61800c50fb0cb4bea57.patch"; - sha256 = "WJgGNrpZLTahe7Sxr8HdTl+4Mf4VcmJb6DdiInlDcT4="; - }) - ]; - - nativeBuildInputs = [ - appstream-glib - docbook_xml_dtd_43 - docbook-xsl-nons - gettext - gtk-doc - itstool - libxml2 - libxslt # for xsltproc - meson - ninja - pkg-config - python3 - vala - wrapGAppsHook - glib # for glib-compile-schemas - ]; - - buildInputs = [ - adwaita-icon-theme - clutter-gst - clutter-gtk - dbus - gdk-pixbuf - glib - gnome-desktop - gnome-video-effects - gst_all_1.gst-plugins-bad - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - gst_all_1.gstreamer - gtk3 - libcanberra-gtk3 - librsvg - ]; - - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; - - preFixup = '' - gappsWrapperArgs+=( - # Effects - --prefix XDG_DATA_DIRS : "${gnome-video-effects}/share" - # vp8enc preset - --prefix GST_PRESET_PATH : "${gst_all_1.gst-plugins-good}/share/gstreamer-1.0/presets" - # Thumbnailers - --prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share" - --prefix XDG_DATA_DIRS : "${totem}/share" - ) - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "cheese"; - attrPath = "gnome3.cheese"; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Cheese"; - description = "Take photos and videos with your webcam, with fun graphical effects"; - maintainers = teams.gnome.members; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix deleted file mode 100644 index c6a2a3a640094..0000000000000 --- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, stdenv, fetchurl, glib, gtk3, meson, ninja, pkg-config, gnome3, gettext, itstool, libxml2, libarchive -, file, json-glib, python3, wrapGAppsHook, desktop-file-utils, libnotify, nautilus, glibcLocales -, unzip, cpio }: - -stdenv.mkDerivation rec { - pname = "file-roller"; - version = "3.40.0"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "039w1dcpa5ypmv6sm634alk9vbcdkyvy595vkh5gn032jsiqca2a"; - }; - - LANG = "en_US.UTF-8"; # postinstall.py - - nativeBuildInputs = [ meson ninja gettext itstool pkg-config libxml2 python3 wrapGAppsHook glibcLocales desktop-file-utils ]; - - buildInputs = [ glib gtk3 json-glib libarchive file gnome3.adwaita-icon-theme libnotify nautilus cpio ]; - - PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0"; - - postPatch = '' - chmod +x postinstall.py # patchShebangs requires executable file - patchShebangs postinstall.py - patchShebangs data/set-mime-type-entry.py - ''; - - postFixup = '' - # Workaround because of https://gitlab.gnome.org/GNOME/file-roller/issues/40 - wrapProgram "$out/bin/file-roller" \ - --prefix PATH : ${lib.makeBinPath [ unzip ]} - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "file-roller"; - attrPath = "gnome3.file-roller"; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/FileRoller"; - description = "Archive manager for the GNOME desktop environment"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = teams.gnome.members; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix deleted file mode 100644 index 1458d509e61d8..0000000000000 --- a/pkgs/desktops/gnome-3/apps/gedit/default.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ lib, stdenv -, meson -, fetchurl -, python3 -, pkg-config -, gtk3 -, glib -, adwaita-icon-theme -, libpeas -, gtksourceview4 -, gsettings-desktop-schemas -, wrapGAppsHook -, ninja -, libsoup -, tepl -, gnome3 -, gspell -, perl -, itstool -, desktop-file-utils -, vala -}: - -stdenv.mkDerivation rec { - pname = "gedit"; - version = "40.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gedit/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "149ngl9qw6h59546lir1pa7hvw23ppsnqlj9mfqphmmn5jl99qsm"; - }; - - nativeBuildInputs = [ - desktop-file-utils - itstool - meson - ninja - perl - pkg-config - python3 - vala - wrapGAppsHook - ]; - - buildInputs = [ - adwaita-icon-theme - glib - gsettings-desktop-schemas - gspell - gtk3 - gtksourceview4 - libpeas - libsoup - tepl - ]; - - postPatch = '' - chmod +x build-aux/meson/post_install.py - chmod +x plugins/externaltools/scripts/gedit-tool-merge.pl - patchShebangs build-aux/meson/post_install.py - patchShebangs plugins/externaltools/scripts/gedit-tool-merge.pl - ''; - - # Reliably fails to generate gedit-file-browser-enum-types.h in time - enableParallelBuilding = false; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "gedit"; - attrPath = "gnome3.gedit"; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Gedit"; - description = "Official text editor of the GNOME desktop environment"; - maintainers = teams.gnome.members; - license = licenses.gpl2; - platforms = platforms.unix; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/ghex/default.nix b/pkgs/desktops/gnome-3/apps/ghex/default.nix deleted file mode 100644 index fb8cf0a1a1c7c..0000000000000 --- a/pkgs/desktops/gnome-3/apps/ghex/default.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ lib, stdenv -, fetchurl -, fetchpatch -, pkg-config -, meson -, ninja -, python3 -, gnome3 -, desktop-file-utils -, appstream-glib -, gettext -, itstool -, libxml2 -, gtk3 -, glib -, atk -, wrapGAppsHook -}: - -stdenv.mkDerivation rec { - pname = "ghex"; - version = "3.18.4"; - - outputs = [ "out" "dev" ]; - - src = fetchurl { - url = "mirror://gnome/sources/ghex/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1h1pjrr9wynclfykizqd78dbi785wjz6b63p31k87kjvzy8w3nf2"; - }; - - nativeBuildInputs = [ - desktop-file-utils - gettext - itstool - meson - ninja - pkg-config - python3 - wrapGAppsHook - ]; - - buildInputs = [ - gtk3 - atk - glib - ]; - - checkInputs = [ - appstream-glib - desktop-file-utils - ]; - - patches = [ - # Fixes for darwin. Drop in next release. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/ghex/commit/b0af26666cd990d99076c242b2abb3efc6e98671.patch"; - sha256 = "1zwdkgr2nqrn9q3ydyvrrpn5x55cdi747fhbq6mh6blp9cbrk9b5"; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/ghex/commit/cc8ef9e67b23604c402460010dc0b5dccb85391b.patch"; - sha256 = "0j2165rfhlbrlzhmcnirqd5m89ljpz0n3nz20sxbwlc8h42zv36s"; - }) - ]; - - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "ghex"; - attrPath = "gnome3.${pname}"; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Ghex"; - description = "Hex editor for GNOME desktop environment"; - platforms = platforms.unix; - license = licenses.gpl2Plus; - maintainers = teams.gnome.members; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix b/pkgs/desktops/gnome-3/apps/gnome-books/default.nix deleted file mode 100644 index 2b0aedc9e3e7a..0000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ lib, stdenv -, meson -, ninja -, gettext -, fetchurl -, evince -, gjs -, pkg-config -, gtk3 -, glib -, tracker -, tracker-miners -, libxslt -, webkitgtk -, gnome-desktop -, libgepub -, gnome3 -, gdk-pixbuf -, gsettings-desktop-schemas -, adwaita-icon-theme -, docbook-xsl-nons -, docbook_xml_dtd_42 -, desktop-file-utils -, python3 -, gobject-introspection -, wrapGAppsHook -}: - -stdenv.mkDerivation rec { - pname = "gnome-books"; - version = "40.0"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0c41l8m2di8h39bmk2fnhpwglwp6qhljmwqqbihzp4ay9976zrc5"; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gettext - libxslt - desktop-file-utils - docbook-xsl-nons - docbook_xml_dtd_42 - wrapGAppsHook - python3 - ]; - - buildInputs = [ - gtk3 - glib - gsettings-desktop-schemas - gdk-pixbuf - adwaita-icon-theme - evince - webkitgtk - gjs - gobject-introspection - tracker - tracker-miners - gnome-desktop - libgepub - ]; - - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "gnome-books"; - attrPath = "gnome3.gnome-books"; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Books"; - description = "An e-book manager application for GNOME"; - maintainers = teams.gnome.members; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix deleted file mode 100644 index 779bfe6886d89..0000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ /dev/null @@ -1,145 +0,0 @@ -{ lib, stdenv -, fetchurl -, meson -, ninja -, wrapGAppsHook -, pkg-config -, gettext -, itstool -, libvirt-glib -, glib -, gobject-introspection -, libxml2 -, gtk3 -, gtksourceview4 -, gtk-vnc -, freerdp -, libvirt -, spice-gtk -, python3 -, appstream-glib -, spice-protocol -, libhandy -, libsoup -, libosinfo -, systemd -, tracker -, tracker-miners -, vala -, libcap -, yajl -, gmp -, gdbm -, cyrus_sasl -, gnome3 -, librsvg -, desktop-file-utils -, mtools -, cdrkit -, libcdio -, libusb1 -, libarchive -, acl -, libgudev -, libsecret -, libcap_ng -, numactl -, libapparmor -, json-glib -, webkitgtk -, vte -, glib-networking -}: - -stdenv.mkDerivation rec { - pname = "gnome-boxes"; - version = "40.1"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "seKPLH+3a/T7uGLQ1S6BG5TL6f8W8GdAiWRWhpCILvg="; - }; - - doCheck = true; - - nativeBuildInputs = [ - appstream-glib # for appstream-util - desktop-file-utils - gettext - gobject-introspection - itstool - meson - ninja - pkg-config - python3 - vala - wrapGAppsHook - ]; - - # Required for USB redirection PolicyKit rules file - propagatedUserEnvPkgs = [ - spice-gtk - ]; - - buildInputs = [ - acl - cyrus_sasl - freerdp - gdbm - glib - glib-networking - gmp - gnome3.adwaita-icon-theme - gtk-vnc - gtk3 - gtksourceview4 - json-glib - libapparmor - libarchive - libcap - libcap_ng - libgudev - libhandy - libosinfo - librsvg - libsecret - libsoup - libusb1 - libvirt - libvirt-glib - libxml2 - numactl - spice-gtk - spice-protocol - systemd - tracker - tracker-miners - vte - webkitgtk - yajl - ]; - - preFixup = '' - gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ mtools cdrkit libcdio ]}") - ''; - - postPatch = '' - chmod +x build-aux/post_install.py # patchShebangs requires executable file - patchShebangs build-aux/post_install.py - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - meta = with lib; { - description = "Simple GNOME 3 application to access remote or virtual systems"; - homepage = "https://wiki.gnome.org/Apps/Boxes"; - license = licenses.lgpl2Plus; - platforms = platforms.linux; - maintainers = teams.gnome.members; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix deleted file mode 100644 index fae4149a13107..0000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ lib, stdenv -, fetchurl -, meson -, ninja -, pkg-config -, wrapGAppsHook -, libdazzle -, libgweather -, geoclue2 -, geocode-glib -, python3 -, gettext -, libxml2 -, gnome3 -, gtk3 -, evolution-data-server -, libsoup -, glib -, gnome-online-accounts -, gsettings-desktop-schemas -, libhandy -, adwaita-icon-theme -}: - -stdenv.mkDerivation rec { - pname = "gnome-calendar"; - version = "40.0"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0d74hng9jdmwdcjgj4xfrcink2gwkbp1k1mad4wanaf7q31c6f38"; - }; - - patches = [ - # https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/84 - # A refactor has caused the PR patch to drift enough to need rebasing - ./gtk_image_reset_crash.patch - ]; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gettext - libxml2 - wrapGAppsHook - python3 - ]; - - buildInputs = [ - gtk3 - evolution-data-server - libsoup - glib - gnome-online-accounts - libdazzle - libgweather - geoclue2 - geocode-glib - gsettings-desktop-schemas - adwaita-icon-theme - libhandy - ]; - - postPatch = '' - chmod +x build-aux/meson/meson_post_install.py # patchShebangs requires executable file - patchShebangs build-aux/meson/meson_post_install.py - ''; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Calendar"; - description = "Simple and beautiful calendar application for GNOME"; - maintainers = teams.gnome.members; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/gtk_image_reset_crash.patch b/pkgs/desktops/gnome-3/apps/gnome-calendar/gtk_image_reset_crash.patch deleted file mode 100644 index 5065295b57b77..0000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-calendar/gtk_image_reset_crash.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/gui/views/gcal-year-view.c b/src/gui/views/gcal-year-view.c -index ac32a8f9..532425c1 100644 ---- a/src/gui/views/gcal-year-view.c -+++ b/src/gui/views/gcal-year-view.c -@@ -2158,7 +2158,11 @@ update_weather (GcalYearView *self) - if (!updated) - { - gtk_label_set_text (self->temp_label, ""); -- gtk_image_clear (self->weather_icon); -+ /* FIXME: This should never be NULL, but it somehow is. -+ * https://gitlab.gnome.org/GNOME/gnome-calendar/issues/299 -+ */ -+ if (self->weather_icon != NULL) -+ gtk_image_clear (self->weather_icon); - } - } - diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix deleted file mode 100644 index b5abee2838099..0000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ lib -, stdenv -, fetchurl -, meson -, ninja -, pkg-config -, gettext -, gnome3 -, glib -, gtk3 -, pango -, wrapGAppsHook -, python3 -, gobject-introspection -, gjs -, libunistring -, libhandy -, gsettings-desktop-schemas -, adwaita-icon-theme -, gnome-desktop -}: - -stdenv.mkDerivation rec { - pname = "gnome-characters"; - version = "40.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-characters/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0z2xa4w921bzpzj6gv88pvbrijcnnwni6jxynwz0ybaravyzaqha"; - }; - - nativeBuildInputs = [ - gettext - gobject-introspection - meson - ninja - pkg-config - python3 - wrapGAppsHook - ]; - - - buildInputs = [ - adwaita-icon-theme - gjs - glib - gnome-desktop # for typelib - gsettings-desktop-schemas - gtk3 - libunistring - libhandy - pango - ]; - - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - ''; - - dontWrapGApps = true; - - # Fixes https://github.com/NixOS/nixpkgs/issues/31168 - postFixup = '' - for file in $out/share/org.gnome.Characters/org.gnome.Characters \ - $out/share/org.gnome.Characters/org.gnome.Characters.BackgroundService - do - sed -e $"2iimports.package._findEffectiveEntryPointName = () => \'$(basename $file)\' " \ - -i $file - - wrapGApp "$file" - done - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Characters"; - description = "Simple utility application to find and insert unusual characters"; - maintainers = teams.gnome.members; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix deleted file mode 100644 index cd91cef668714..0000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ lib, stdenv -, fetchurl -, meson -, ninja -, gettext -, pkg-config -, wrapGAppsHook -, itstool -, desktop-file-utils -, vala -, gobject-introspection -, libxml2 -, gtk3 -, glib -, gsound -, sound-theme-freedesktop -, gsettings-desktop-schemas -, adwaita-icon-theme -, gnome-desktop -, geocode-glib -, gnome3 -, gdk-pixbuf -, geoclue2 -, libgweather -, libhandy -}: - -stdenv.mkDerivation rec { - pname = "gnome-clocks"; - version = "40.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-clocks/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "02d3jg46sn8d9gd4dsaly22gg5vkbz2gpq4pmwpvncb4rsqk7sn2"; - }; - - nativeBuildInputs = [ - vala - meson - ninja - pkg-config - gettext - itstool - wrapGAppsHook - desktop-file-utils - libxml2 - gobject-introspection # for finding vapi files - ]; - - buildInputs = [ - gtk3 - glib - gsettings-desktop-schemas - gdk-pixbuf - adwaita-icon-theme - gnome-desktop - geocode-glib - geoclue2 - libgweather - gsound - libhandy - ]; - - preFixup = '' - gappsWrapperArgs+=( - # Fallback sound theme - --prefix XDG_DATA_DIRS : "${sound-theme-freedesktop}/share" - ) - ''; - - doCheck = true; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "gnome-clocks"; - attrPath = "gnome3.gnome-clocks"; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Clocks"; - description = "Clock application designed for GNOME 3"; - maintainers = teams.gnome.members; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-connections/default.nix b/pkgs/desktops/gnome-3/apps/gnome-connections/default.nix deleted file mode 100644 index 17f11d0efdc30..0000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-connections/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ lib, stdenv -, fetchurl -, gnome3 -, meson -, ninja -, vala -, pkg-config -, glib -, gtk3 -, python3 -, libxml2 -, gtk-vnc -, gettext -, desktop-file-utils -, appstream-glib -, gobject-introspection -, freerdp -, wrapGAppsHook -}: - -stdenv.mkDerivation rec { - pname = "gnome-connections"; - version = "3.38.1"; - - src = fetchurl { - url = "mirror://gnome/sources/connections/${lib.versions.majorMinor version}/connections-${version}.tar.xz"; - hash = "sha256-5c7uBFkh9Vsw6bWWUDjNTMDrrFqI5JEgYlsWpfyuTpA="; - }; - - nativeBuildInputs = [ - desktop-file-utils - gettext - glib # glib-compile-resources - meson - appstream-glib - ninja - pkg-config - python3 - vala - wrapGAppsHook - - # for gtk-frdp subproject - gobject-introspection - ]; - - buildInputs = [ - glib - gtk-vnc - gtk3 - libxml2 - - # for gtk-frdp subproject - freerdp - ]; - - postPatch = '' - chmod +x build-aux/meson/postinstall.py - patchShebangs build-aux/meson/postinstall.py - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "connections"; - attrPath = "gnome-connections"; - }; - }; - - meta = with lib; { - homepage = "https://gitlab.gnome.org/GNOME/connections"; - description = "A remote desktop client for the GNOME desktop environment"; - maintainers = teams.gnome.members; - license = licenses.gpl3Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix deleted file mode 100644 index 3172ae271233d..0000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ /dev/null @@ -1,127 +0,0 @@ -{ lib, stdenv -, meson -, ninja -, gettext -, fetchurl -, fetchpatch -, evince -, gjs -, pkg-config -, gtk3 -, glib -, tracker -, tracker-miners -, itstool -, libxslt -, webkitgtk -, libgdata -, gnome-desktop -, libzapojit -, libgepub -, gnome3 -, gdk-pixbuf -, libsoup -, docbook_xsl -, docbook_xml_dtd_42 -, gobject-introspection -, inkscape -, poppler_utils -, desktop-file-utils -, wrapGAppsHook -, python3 -, appstream-glib -, gsettings-desktop-schemas -}: - -stdenv.mkDerivation rec { - pname = "gnome-documents"; - version = "3.34.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-documents/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1qph567mapg3s1a26k7b8y57g9bklhj2mh8xm758z9zkms20xafq"; - }; - - patches = [ - # Fix inkscape 1.0 usage - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-documents/commit/0f55a18c40a61e6ae4ec4652604775f139892350.diff"; - sha256 = "1yrisq69dl1dn7639drlbza20a5ic6xg04ksr9iq4sxdx3xj3d8s"; - }) - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gettext - itstool - libxslt - desktop-file-utils - docbook_xsl - docbook_xml_dtd_42 - wrapGAppsHook - python3 - appstream-glib - - # building getting started - inkscape - poppler_utils - ]; - - buildInputs = [ - gtk3 - glib - gsettings-desktop-schemas - gdk-pixbuf - gnome3.adwaita-icon-theme - evince - libsoup - webkitgtk - gjs - gobject-introspection - tracker - tracker-miners - libgdata - gnome-desktop - libzapojit - libgepub - ]; - - doCheck = true; - - mesonFlags = [ - "-Dgetting_started=true" - ]; - - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - ''; - - preFixup = '' - substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib.bin}/bin/gapplication" - ''; - - preConfigure = - # To silence inkscape warnings regarding profile directory - '' - export INKSCAPE_PROFILE_DIR="$(mktemp -d)" - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - meta = with lib; { - broken = true; # Tracker 3 not supported and it cannot start Tracker 2. - homepage = "https://wiki.gnome.org/Apps/Documents"; - description = "Document manager application designed to work with GNOME 3"; - maintainers = teams.gnome.members; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix deleted file mode 100644 index 20b27b2ddd055..0000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ lib, stdenv -, fetchurl -, fetchpatch -, meson -, ninja -, pkg-config -, gnome3 -, glib -, gtk3 -, wrapGAppsHook -, gettext -, itstool -, libxml2 -, libxslt -, docbook_xsl -, docbook_xml_dtd_43 -, systemd -, python3 -, gsettings-desktop-schemas -}: - -stdenv.mkDerivation rec { - pname = "gnome-logs"; - version = "3.36.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-logs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0w1nfdxbv3f0wnhmdy21ydvr4swfc108hypda561p7l9lrhnnxj4"; - }; - - patches = [ - # https://gitlab.gnome.org/GNOME/gnome-logs/-/issues/52 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-logs/-/commit/b42defceefc775220b525f665a3b662ab9593b81.patch"; - sha256 = "1s0zscmhwy7r0xff17wh8ik8x9xw1vrkipw5vl5i770bxnljps8n"; - }) - ]; - - nativeBuildInputs = [ - python3 - meson - ninja - pkg-config - wrapGAppsHook - gettext - itstool - libxml2 - libxslt - docbook_xsl - docbook_xml_dtd_43 - ]; - - buildInputs = [ - glib - gtk3 - systemd - gsettings-desktop-schemas - gnome3.adwaita-icon-theme - ]; - - mesonFlags = [ - "-Dman=true" - ]; - - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; - - doCheck = true; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "gnome-logs"; - attrPath = "gnome3.gnome-logs"; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Logs"; - description = "A log viewer for the systemd journal"; - maintainers = teams.gnome.members; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix deleted file mode 100644 index 673013c8e600b..0000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ /dev/null @@ -1,104 +0,0 @@ -{ lib, stdenv -, fetchurl -, meson -, ninja -, gettext -, python3 -, pkg-config -, gnome3 -, gtk3 -, gobject-introspection -, gdk-pixbuf -, librsvg -, libgweather -, geoclue2 -, wrapGAppsHook -, folks -, libchamplain -, gfbgraph -, libsoup -, gsettings-desktop-schemas -, webkitgtk -, gjs -, libgee -, libhandy -, geocode-glib -, evolution-data-server -, gnome-online-accounts -}: - -stdenv.mkDerivation rec { - pname = "gnome-maps"; - version = "40.1"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-mAXUwFs6NpV0bTdisoFr/+bZ19VuF7y7nZ1B3C0CYxo="; - }; - - doCheck = true; - - nativeBuildInputs = [ - gettext - meson - ninja - pkg-config - python3 - wrapGAppsHook - ]; - - buildInputs = [ - evolution-data-server - folks - gdk-pixbuf - geoclue2 - geocode-glib - gfbgraph - gjs - gnome-online-accounts - gnome3.adwaita-icon-theme - gobject-introspection - gsettings-desktop-schemas - gtk3 - libchamplain - libgee - libgweather - libhandy - librsvg - libsoup - webkitgtk - ]; - - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - - # The .service file isn't wrapped with the correct environment - # so misses GIR files when started. By re-pointing from the gjs - # entry point to the wrapped binary we get back to a wrapped - # binary. - substituteInPlace "data/org.gnome.Maps.service.in" \ - --replace "Exec=@pkgdatadir@/org.gnome.Maps" \ - "Exec=$out/bin/gnome-maps" - ''; - - preCheck = '' - # “time.js” included by “timeTest” and “translationsTest” depends on “org.gnome.desktop.interface” schema. - export XDG_DATA_DIRS="${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:$XDG_DATA_DIRS" - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Maps"; - description = "A map application for GNOME 3"; - maintainers = teams.gnome.members; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix deleted file mode 100644 index b50ce59980f51..0000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ /dev/null @@ -1,113 +0,0 @@ -{ lib -, meson -, ninja -, gettext -, fetchurl -, gdk-pixbuf -, tracker -, libxml2 -, python3 -, libnotify -, wrapGAppsHook -, libmediaart -, gobject-introspection -, gnome-online-accounts -, grilo -, grilo-plugins -, pkg-config -, gtk3 -, pango -, glib -, desktop-file-utils -, appstream-glib -, itstool -, gnome3 -, gst_all_1 -, libdazzle -, libsoup -, gsettings-desktop-schemas -}: - -python3.pkgs.buildPythonApplication rec { - pname = "gnome-music"; - version = "40.0"; - - format = "other"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "1djqhd4jccvk352hwxjhiwjgbnv1qnpv450f2c6w6581vcn9pq38"; - }; - - nativeBuildInputs = [ - meson - ninja - gettext - itstool - pkg-config - libxml2 - wrapGAppsHook - desktop-file-utils - appstream-glib - gobject-introspection - ]; - - buildInputs = [ - gtk3 - pango - glib - libmediaart - gnome-online-accounts - gobject-introspection - gdk-pixbuf - gnome3.adwaita-icon-theme - python3 - grilo - grilo-plugins - libnotify - libdazzle - libsoup - gsettings-desktop-schemas - tracker - ] ++ (with gst_all_1; [ - gstreamer - gst-plugins-base - gst-plugins-good - gst-plugins-bad - gst-plugins-ugly - ]); - - propagatedBuildInputs = with python3.pkgs; [ - pycairo - dbus-python - pygobject3 - ]; - - - postPatch = '' - for f in meson_post_conf.py meson_post_install.py; do - chmod +x $f - patchShebangs $f - done - ''; - - doCheck = false; - - # handle setup hooks better - strictDeps = false; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Music"; - description = "Music player and management application for the GNOME desktop environment"; - maintainers = teams.gnome.members; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix b/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix deleted file mode 100644 index 6fca1c0eea5ef..0000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook -, libgtop, intltool, itstool, libxml2, nmap, inetutils }: - -stdenv.mkDerivation rec { - pname = "gnome-nettool"; - version = "3.8.1"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1c9cvzvyqgfwa5zzyvp7118pkclji62fkbb33g4y9sp5kw6m397h"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - gtk3 wrapGAppsHook libgtop intltool itstool libxml2 - gnome3.adwaita-icon-theme - ]; - - propagatedUserEnvPkgs = [ nmap inetutils ]; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - versionPolicy = "none"; - }; - }; - - meta = with lib; { - homepage = "https://gitlab.gnome.org/GNOME/gnome-nettool"; - description = "A collection of networking tools"; - maintainers = teams.gnome.members; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix deleted file mode 100644 index afeddd1bb9917..0000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ lib, stdenv -, meson -, ninja -, gettext -, fetchurl -, pkg-config -, wrapGAppsHook -, itstool -, desktop-file-utils -, python3 -, glib -, gtk3 -, evolution-data-server -, gnome-online-accounts -, json-glib -, libuuid -, curl -, libhandy -, webkitgtk -, gnome3 -, libxml2 -, gsettings-desktop-schemas -, tracker -}: - -stdenv.mkDerivation rec { - pname = "gnome-notes"; - version = "40.1"; - - src = fetchurl { - url = "mirror://gnome/sources/bijiben/${lib.versions.major version}/bijiben-${version}.tar.xz"; - sha256 = "1gvvb2klkzbmyzwkjgmscdiqcl8lyz9b0rxb4igjz079csq6z805"; - }; - - doCheck = true; - - postPatch = '' - chmod +x build-aux/meson_post_install.py - patchShebangs build-aux/meson_post_install.py - ''; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gettext - itstool - libxml2 - desktop-file-utils - python3 - wrapGAppsHook - ]; - - buildInputs = [ - glib - gtk3 - json-glib - libuuid - curl - libhandy - webkitgtk - tracker - gnome-online-accounts - gsettings-desktop-schemas - evolution-data-server - gnome3.adwaita-icon-theme - ]; - - mesonFlags = [ - "-Dupdate_mimedb=false" - ]; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "bijiben"; - attrPath = "gnome3.gnome-notes"; - }; - }; - - meta = with lib; { - description = "Note editor designed to remain simple to use"; - homepage = "https://wiki.gnome.org/Apps/Notes"; - license = licenses.gpl3; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix deleted file mode 100644 index cb79a772b7953..0000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib, stdenv -, gettext -, fetchurl -, pkg-config -, gtk3 -, glib -, meson -, ninja -, upower -, python3 -, desktop-file-utils -, wrapGAppsHook -, gnome3 }: - -let - pname = "gnome-power-manager"; - version = "3.32.0"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0drfn3wcc8l4n07qwv6p0rw2dwcd00hwzda282q62l6sasks2b2g"; - }; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - wrapGAppsHook - gettext - - # needed by meson_post_install.sh - python3 - glib.dev - desktop-file-utils - ]; - - buildInputs = [ - gtk3 - glib - upower - gnome3.adwaita-icon-theme - ]; - - meta = with lib; { - homepage = "https://projects-old.gnome.org/gnome-power-manager/"; - description = "View battery and power statistics provided by UPower"; - maintainers = teams.gnome.members; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix b/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix deleted file mode 100644 index 3b34fae714cc2..0000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ lib, stdenv -, fetchurl -, pkg-config -, gettext -, gobject-introspection -, wrapGAppsHook -, gjs -, glib -, gtk3 -, gdk-pixbuf -, gst_all_1 -, gnome3 -, meson -, ninja -, python3 -, desktop-file-utils -, libhandy -}: - -stdenv.mkDerivation rec { - pname = "gnome-sound-recorder"; - version = "40.0"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "00b55vsfzx877b7mj744abzjws7zclz71wbvh0axsrbl9l84ranl"; - }; - - nativeBuildInputs = [ - pkg-config - gettext - meson - ninja - gobject-introspection - wrapGAppsHook - python3 - desktop-file-utils - ]; - - buildInputs = [ - gjs - glib - gtk3 - gdk-pixbuf - libhandy - ] ++ (with gst_all_1; [ - gstreamer - gst-plugins-base - gst-plugins-good - gst-plugins-bad # for gstreamer-player-1.0 - ]); - - postPatch = '' - chmod +x build-aux/meson_post_install.py - patchShebangs build-aux/meson_post_install.py - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - meta = with lib; { - description = "A simple and modern sound recorder"; - homepage = "https://wiki.gnome.org/Apps/SoundRecorder"; - license = licenses.gpl2Plus; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix deleted file mode 100644 index 34aed52fa8510..0000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ lib, stdenv -, fetchurl -, fetchpatch -, meson -, ninja -, pkg-config -, python3 -, wrapGAppsHook -, gettext -, gnome3 -, glib -, gtk3 -, libpeas -, gnome-online-accounts -, gsettings-desktop-schemas -, evolution-data-server -, libxml2 -, libsoup -, libical -, librest -, json-glib -}: - -stdenv.mkDerivation rec { - pname = "gnome-todo"; - version = "3.28.1"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "08ygqbib72jlf9y0a16k54zz51sncpq2wa18wp81v46q8301ymy7"; - }; - - patches = [ - # fix build with libecal 2.0 - (fetchpatch { - name = "gnome-todo-eds-libecal-2.0.patch"; - url = "https://src.fedoraproject.org/rpms/gnome-todo/raw/bed44b8530f3c79589982e03b430b3a125e9bceb/f/gnome-todo-eds-libecal-2.0.patch"; - sha256 = "1ghrz973skal36j90wm2z13m3panw983r6y0k7z9gpj5lxgz92mq"; - }) - ]; - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gettext - python3 - wrapGAppsHook - ]; - - buildInputs = [ - glib - gtk3 - libpeas - gnome-online-accounts - gsettings-desktop-schemas - gnome3.adwaita-icon-theme - # Plug-ins - evolution-data-server - libxml2 - libsoup - libical - librest - json-glib - ]; - - # Fix parallel building: missing dependency from src/gtd-application.c - # Probably remove for 3.30+ https://gitlab.gnome.org/GNOME/gnome-todo/issues/170 - preBuild = "ninja src/gtd-vcs-identifier.h"; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - meta = with lib; { - description = "Personal task manager for GNOME"; - homepage = "https://wiki.gnome.org/Apps/Todo"; - license = licenses.gpl3Plus; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix deleted file mode 100644 index 6cbfea0f5cf37..0000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ lib -, stdenv -, fetchurl -, pkg-config -, gnome3 -, gtk3 -, libhandy -, wrapGAppsHook -, gjs -, gobject-introspection -, libgweather -, meson -, ninja -, geoclue2 -, gnome-desktop -, python3 -, gsettings-desktop-schemas -}: - -stdenv.mkDerivation rec { - pname = "gnome-weather"; - version = "40.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-weather/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "1vxfcvga5waangq3rzwdrdxyy5sw40vv0l463lc651s0n8xafd9a"; - }; - - nativeBuildInputs = [ - pkg-config - meson - ninja - wrapGAppsHook - python3 - ]; - - buildInputs = [ - gtk3 - libhandy - gjs - gobject-introspection - gnome-desktop - libgweather - gnome3.adwaita-icon-theme - geoclue2 - gsettings-desktop-schemas - ]; - - postPatch = '' - # The .service file is not wrapped with the correct environment - # so misses GIR files when started. By re-pointing from the gjs - # entry point to the wrapped binary we get back to a wrapped - # binary. - substituteInPlace "data/org.gnome.Weather.service.in" \ - --replace "Exec=@DATA_DIR@/@APP_ID@" \ - "Exec=$out/bin/gnome-weather" - - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "gnome-weather"; - attrPath = "gnome3.gnome-weather"; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Weather"; - description = "Access current weather conditions and forecasts"; - maintainers = teams.gnome.members; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix deleted file mode 100644 index 727a82e5ff392..0000000000000 --- a/pkgs/desktops/gnome-3/apps/polari/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib, stdenv, itstool, fetchurl, gdk-pixbuf, adwaita-icon-theme -, telepathy-glib, gjs, meson, ninja, gettext, telepathy-idle, libxml2, desktop-file-utils -, pkg-config, gtk3, glib, libsecret, libsoup, webkitgtk, gobject-introspection, appstream-glib -, gnome3, wrapGAppsHook, telepathy-logger, gspell, gsettings-desktop-schemas }: - -let - pname = "polari"; - version = "3.38.0"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1l82nmb5qk4h69rsdhzlcmjjdhwh9jzfs4cnw8hy39sg5v9ady1s"; - }; - - patches = [ - # Upstream runs the thumbnailer by passing it to gjs. - # If we wrap it in a shell script, gjs can no longer run it. - # Let’s change the code to run the script directly by making it executable and having gjs in shebang. - ./make-thumbnailer-wrappable.patch - ]; - - propagatedUserEnvPkgs = [ telepathy-idle telepathy-logger ]; - - nativeBuildInputs = [ - meson ninja pkg-config itstool gettext wrapGAppsHook libxml2 - desktop-file-utils gobject-introspection appstream-glib - ]; - - buildInputs = [ - gtk3 glib adwaita-icon-theme gsettings-desktop-schemas - telepathy-glib telepathy-logger gjs gspell gdk-pixbuf libsecret libsoup webkitgtk - ]; - - postFixup = '' - wrapGApp "$out/share/polari/thumbnailer.js" - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Polari"; - description = "IRC chat client designed to integrate with the GNOME desktop"; - maintainers = teams.gnome.members; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/polari/make-thumbnailer-wrappable.patch b/pkgs/desktops/gnome-3/apps/polari/make-thumbnailer-wrappable.patch deleted file mode 100644 index 0fb09eb154af1..0000000000000 --- a/pkgs/desktops/gnome-3/apps/polari/make-thumbnailer-wrappable.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/thumbnailer.js b/src/thumbnailer.js -old mode 100644 -new mode 100755 -index e2ad0a5..7ebf08a ---- a/src/thumbnailer.js -+++ b/src/thumbnailer.js -@@ -1,3 +1,4 @@ -+#!/usr/bin/env gjs - imports.gi.versions.Gdk = '3.0'; - imports.gi.versions.Gtk = '3.0'; - -diff --git a/src/urlPreview.js b/src/urlPreview.js -index f17e0be..ccffc32 100644 ---- a/src/urlPreview.js -+++ b/src/urlPreview.js -@@ -44,7 +44,7 @@ class Thumbnailer { - _generateThumbnail(data) { - let { filename, uri } = data; - this._subProc = Gio.Subprocess.new( -- ['gjs', `${pkg.pkgdatadir}/thumbnailer.js`, uri, filename], -+ [`${pkg.pkgdatadir}/thumbnailer.js`, uri, filename], - Gio.SubprocessFlags.NONE); - this._subProc.wait_async(null, (o, res) => { - try { diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix deleted file mode 100644 index e44f094be1bf4..0000000000000 --- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ lib, stdenv -, fetchurl -, vala -, meson -, ninja -, libpwquality -, pkg-config -, gtk3 -, glib -, wrapGAppsHook -, itstool -, gnupg -, libsoup -, gnome3 -, gpgme -, python3 -, openldap -, gcr -, libsecret -, avahi -, p11-kit -, openssh -, gsettings-desktop-schemas -, libhandy -}: - -stdenv.mkDerivation rec { - pname = "seahorse"; - version = "40.0"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-fscFezhousbqBB/aghQKOfXsnlsYi0UJFNRTvC1V0Cw="; - }; - - doCheck = true; - - nativeBuildInputs = [ - meson - ninja - pkg-config - vala - itstool - wrapGAppsHook - python3 - ]; - - buildInputs = [ - gtk3 - glib - gcr - gsettings-desktop-schemas - gnupg - gnome3.adwaita-icon-theme - gpgme - libsecret - avahi - libsoup - p11-kit - openssh - openldap - libpwquality - libhandy - ]; - - postPatch = '' - patchShebangs build-aux/ - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Seahorse"; - description = "Application for managing encryption keys and passwords in the GnomeKeyring"; - maintainers = teams.gnome.members; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/apps/vinagre/default.nix deleted file mode 100644 index 49abb2f1a7068..0000000000000 --- a/pkgs/desktops/gnome-3/apps/vinagre/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk3, gnome3, vte, libxml2, gtk-vnc, intltool -, libsecret, itstool, wrapGAppsHook, librsvg }: - -stdenv.mkDerivation rec { - pname = "vinagre"; - version = "3.22.0"; - - src = fetchurl { - url = "mirror://gnome/sources/vinagre/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "cd1cdbacca25c8d1debf847455155ee798c3e67a20903df8b228d4ece5505e82"; - }; - - nativeBuildInputs = [ pkg-config intltool itstool wrapGAppsHook ]; - buildInputs = [ - gtk3 vte libxml2 gtk-vnc libsecret gnome3.adwaita-icon-theme librsvg - ]; - - NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral"; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "vinagre"; - attrPath = "gnome3.vinagre"; - }; - }; - - meta = with lib; { - description = "Remote desktop viewer for GNOME"; - homepage = "https://wiki.gnome.org/Apps/Vinagre"; - license = licenses.gpl2Plus; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix deleted file mode 100644 index ceffe2f012b4c..0000000000000 --- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, gnome3 -, iconnamingutils, gtk3, gdk-pixbuf, librsvg, hicolor-icon-theme }: - -stdenv.mkDerivation rec { - pname = "adwaita-icon-theme"; - version = "40.1.1"; - - src = fetchurl { - url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "C2xDbtatmIeoitofcqAZex63OwINjTRKurTH+nJQ+PY="; - }; - - # For convenience, we can specify adwaita-icon-theme only in packages - propagatedBuildInputs = [ hicolor-icon-theme ]; - - buildInputs = [ gdk-pixbuf librsvg ]; - - nativeBuildInputs = [ pkg-config intltool iconnamingutils gtk3 ]; - - dontDropIconThemeCache = true; - - # remove a tree of dirs with no files within - postInstall = '' rm -rf "$out/locale" ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "adwaita-icon-theme"; - attrPath = "gnome3.adwaita-icon-theme"; - }; - }; - - meta = with lib; { - platforms = with platforms; linux ++ darwin; - maintainers = teams.gnome.members; - }; -} diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix deleted file mode 100644 index 386502a854b88..0000000000000 --- a/pkgs/desktops/gnome-3/core/baobab/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ stdenv -, lib -, gettext -, fetchurl -, vala -, desktop-file-utils -, meson -, ninja -, pkg-config -, python3 -, gtk3 -, libhandy -, glib -, libxml2 -, wrapGAppsHook -, itstool -, gnome3 -}: - -stdenv.mkDerivation rec { - pname = "baobab"; - version = "40.0"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "19yii3bdgivxrcka1c4g6dpbmql5nyawwhzlsph7z6bs68nambm6"; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - vala - gettext - itstool - libxml2 - desktop-file-utils - wrapGAppsHook - python3 - ]; - - buildInputs = [ - gtk3 - libhandy - glib - gnome3.adwaita-icon-theme - ]; - - doCheck = true; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - }; - }; - - meta = with lib; { - description = "Graphical application to analyse disk usage in any GNOME environment"; - homepage = "https://wiki.gnome.org/Apps/DiskUsageAnalyzer"; - license = licenses.gpl2Plus; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/caribou/default.nix b/pkgs/desktops/gnome-3/core/caribou/default.nix deleted file mode 100644 index 88260f05acf11..0000000000000 --- a/pkgs/desktops/gnome-3/core/caribou/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ fetchurl, lib, stdenv, pkg-config, gnome3, glib, gtk3, clutter, dbus, python3, libxml2 -, libxklavier, libXtst, gtk2, intltool, libxslt, at-spi2-core, autoreconfHook -, wrapGAppsHook, libgee }: - -let - pname = "caribou"; - version = "0.4.21"; - pythonEnv = python3.withPackages ( ps: with ps; [ pygobject3 ] ); -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0mfychh1q3dx0b96pjz9a9y112bm9yqyim40yykzxx1hppsdjhww"; - }; - - patches = [ - # Fix crash in GNOME Flashback - # https://bugzilla.gnome.org/show_bug.cgi?id=791001 - (fetchurl { - url = "https://bugzilla.gnome.org/attachment.cgi?id=364774"; - sha256 = "15k1455grf6knlrxqbjnk7sals1730b0whj30451scp46wyvykvd"; - }) - ]; - - nativeBuildInputs = [ pkg-config intltool libxslt libxml2 autoreconfHook wrapGAppsHook ]; - - buildInputs = [ - glib gtk3 clutter at-spi2-core dbus pythonEnv python3.pkgs.pygobject3 - libXtst gtk2 - ]; - - propagatedBuildInputs = [ libgee libxklavier ]; - - postPatch = '' - patchShebangs . - substituteInPlace libcaribou/Makefile.am --replace "--shared-library=libcaribou.so.0" "--shared-library=$out/lib/libcaribou.so.0" - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - meta = with lib; { - description = "An input assistive technology intended for switch and pointer users"; - homepage = "https://wiki.gnome.org/Projects/Caribou"; - license = licenses.lgpl21; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix deleted file mode 100644 index aab9a0db42b63..0000000000000 --- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ lib -, stdenv -, fetchurl -, meson -, ninja -, vala -, libxslt -, pkg-config -, glib -, gtk3 -, gnome3 -, python3 -, dconf -, libxml2 -, gettext -, docbook-xsl-nons -, wrapGAppsHook -, gobject-introspection -}: - -stdenv.mkDerivation rec { - pname = "dconf-editor"; - version = "3.38.3"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Vxr0x9rU8Em1PmzXKLea3fCMJ92ra8V7OW0hGGbueeM="; - }; - - nativeBuildInputs = [ - meson - ninja - vala - libxslt - pkg-config - wrapGAppsHook - gettext - docbook-xsl-nons - libxml2 - gobject-introspection - python3 - ]; - - buildInputs = [ - glib - gtk3 - dconf - ]; - - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - meta = with lib; { - description = "GSettings editor for GNOME"; - homepage = "https://wiki.gnome.org/Apps/DconfEditor"; - license = licenses.gpl3Plus; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix deleted file mode 100644 index 8ebb5c3f64f11..0000000000000 --- a/pkgs/desktops/gnome-3/core/empathy/default.nix +++ /dev/null @@ -1,147 +0,0 @@ -{ lib, stdenv -, intltool -, fetchurl -, webkitgtk -, pkg-config -, gtk3 -, glib -, file -, librsvg -, gnome3 -, gdk-pixbuf -, python3 -, telepathy-glib -, telepathy-farstream -, clutter-gtk -, clutter-gst -, gst_all_1 -, cogl -, gnome-online-accounts -, gcr -, libsecret -, folks -, libpulseaudio -, telepathy-mission-control -, telepathy-logger -, libnotify -, clutter -, libsoup -, gnutls -, evolution-data-server -, yelp-xsl -, libcanberra-gtk3 -, p11-kit -, farstream -, libtool -, shared-mime-info -, wrapGAppsHook -, itstool -, libxml2 -, libxslt -, icu -, libgee -, gsettings-desktop-schemas -, isocodes -, enchant -, libchamplain -, geoclue2 -, geocode-glib -, cheese -, libgudev -}: - -stdenv.mkDerivation rec { - pname = "empathy"; - version = "3.25.90"; - - src = fetchurl { - url = "mirror://gnome/sources/empathy/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0sn10fcymc6lyrabk7vx8lpvlaxxkqnmcwj9zdkfa8qf3388k4nc"; - }; - - propagatedBuildInputs = [ - (folks.override { telepathySupport = true; }) - telepathy-logger - evolution-data-server - telepathy-mission-control - ]; - - nativeBuildInputs = [ - pkg-config - libtool - intltool - itstool - file - wrapGAppsHook - libxml2 - libxslt - yelp-xsl - python3 - ]; - - buildInputs = [ - gtk3 - glib - webkitgtk - icu - gnome-online-accounts - telepathy-glib - clutter-gtk - clutter-gst - cogl - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - gcr - libsecret - libpulseaudio - gdk-pixbuf - libnotify - clutter - libsoup - gnutls - libgee - p11-kit - libcanberra-gtk3 - telepathy-farstream - farstream - gnome3.adwaita-icon-theme - gsettings-desktop-schemas - librsvg - - # Spell-checking - enchant - isocodes - - # Display maps, location awareness, geocode support - libchamplain - geoclue2 - geocode-glib - - # Cheese webcam support, camera monitoring - cheese - libgudev - ]; - - enableParallelBuilding = true; - - preFixup = '' - gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" - ) - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "empathy"; - versionPolicy = "none"; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Empathy"; - description = "Messaging program which supports text, voice, video chat, and file transfers over many different protocols"; - maintainers = teams.gnome.members; - license = [ licenses.gpl2 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix deleted file mode 100644 index 671a664567481..0000000000000 --- a/pkgs/desktops/gnome-3/core/eog/default.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ lib, stdenv -, fetchurl -, meson -, ninja -, gettext -, itstool -, pkg-config -, libxml2 -, libjpeg -, libpeas -, libportal -, gnome3 -, gtk3 -, glib -, gsettings-desktop-schemas -, adwaita-icon-theme -, gnome-desktop -, lcms2 -, gdk-pixbuf -, exempi -, shared-mime-info -, wrapGAppsHook -, librsvg -, libexif -, gobject-introspection -, python3 -}: - -stdenv.mkDerivation rec { - pname = "eog"; - version = "40.1"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-e+CGA3/tm2v4S6yXqD48kYMBt+nJavEwsnJS0KURFok="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gettext - itstool - wrapGAppsHook - libxml2 - gobject-introspection - python3 - ]; - - buildInputs = [ - libjpeg - libportal - gtk3 - gdk-pixbuf - glib - libpeas - librsvg - lcms2 - gnome-desktop - libexif - exempi - gsettings-desktop-schemas - shared-mime-info - adwaita-icon-theme - ]; - - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; - - preFixup = '' - gappsWrapperArgs+=( - # Thumbnailers - --prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share" - --prefix XDG_DATA_DIRS : "${librsvg}/share" - --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" - ) - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - meta = with lib; { - description = "GNOME image viewer"; - homepage = "https://wiki.gnome.org/Apps/EyeOfGnome"; - license = licenses.gpl2Plus; - maintainers = teams.gnome.members; - platforms = platforms.unix; - }; -} diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix deleted file mode 100644 index 349a1c024e48f..0000000000000 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ /dev/null @@ -1,115 +0,0 @@ -{ lib, stdenv -, meson -, ninja -, gettext -, fetchurl -, pkg-config -, gtk3 -, glib -, icu -, wrapGAppsHook -, gnome3 -, libportal -, libxml2 -, libxslt -, itstool -, webkitgtk -, libsoup -, glib-networking -, libsecret -, gnome-desktop -, libnotify -, libarchive -, p11-kit -, sqlite -, gcr -, isocodes -, desktop-file-utils -, python3 -, nettle -, gdk-pixbuf -, gst_all_1 -, json-glib -, libdazzle -, libhandy -, buildPackages -}: - -stdenv.mkDerivation rec { - pname = "epiphany"; - version = "40.1"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "1l0sb1xg16g4wg3z99xb0w2kbyczbn7q4mphs3w4lxq22xml4sk9"; - }; - - nativeBuildInputs = [ - desktop-file-utils - gettext - itstool - libxslt - meson - ninja - pkg-config - python3 - wrapGAppsHook - buildPackages.glib - buildPackages.gtk3 - ]; - - buildInputs = [ - gcr - gdk-pixbuf - glib - glib-networking - gnome-desktop - gnome3.adwaita-icon-theme - gst_all_1.gst-libav - gst_all_1.gst-plugins-bad - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - gst_all_1.gst-plugins-ugly - gst_all_1.gstreamer - gtk3 - icu - isocodes - json-glib - libdazzle - libhandy - libportal - libnotify - libarchive - libsecret - libsoup - libxml2 - nettle - p11-kit - sqlite - webkitgtk - ]; - - # Tests need an X display - mesonFlags = [ - "-Dunit_tests=disabled" - ]; - - postPatch = '' - chmod +x post_install.py # patchShebangs requires executable file - patchShebangs post_install.py - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Epiphany"; - description = "WebKit based web browser for GNOME"; - maintainers = teams.gnome.members; - license = licenses.gpl3Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix deleted file mode 100644 index 59eb31e19180c..0000000000000 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ /dev/null @@ -1,135 +0,0 @@ -{ lib, stdenv -, fetchurl -, meson -, ninja -, pkg-config -, gettext -, libxml2 -, appstream -, glib -, gtk3 -, pango -, atk -, gdk-pixbuf -, shared-mime-info -, itstool -, gnome3 -, poppler -, ghostscriptX -, djvulibre -, libspectre -, libarchive -, libhandy -, libsecret -, wrapGAppsHook -, librsvg -, gobject-introspection -, yelp-tools -, gspell -, adwaita-icon-theme -, gsettings-desktop-schemas -, gnome-desktop -, dbus -, python3 -, texlive -, t1lib -, gst_all_1 -, gtk-doc -, docbook-xsl-nons -, docbook_xml_dtd_43 -, supportMultimedia ? true # PDF multimedia -, libgxps -, supportXPS ? true # Open XML Paper Specification via libgxps -}: - -stdenv.mkDerivation rec { - pname = "evince"; - version = "40.1"; - - outputs = [ "out" "dev" "devdoc" ]; - - src = fetchurl { - url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0bfg7prmjk3z8irx1nfkkqph3igg3cy4pwd7pcxjxbshqdin6rks"; - }; - - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; - - nativeBuildInputs = [ - appstream - docbook-xsl-nons - docbook_xml_dtd_43 - gettext - gobject-introspection - gtk-doc - itstool - meson - ninja - pkg-config - python3 - wrapGAppsHook - yelp-tools - ]; - - buildInputs = [ - adwaita-icon-theme - atk - dbus # only needed to find the service directory - djvulibre - gdk-pixbuf - ghostscriptX - glib - gnome-desktop - gsettings-desktop-schemas - gspell - gtk3 - libarchive - libhandy - librsvg - libsecret - libspectre - libxml2 - pango - poppler - t1lib - texlive.bin.core # kpathsea for DVI support - ] ++ lib.optional supportXPS libgxps - ++ lib.optionals supportMultimedia (with gst_all_1; [ - gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav ]); - - mesonFlags = [ - "-Dnautilus=false" - "-Dps=enabled" - ]; - - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - - preFixup = '' - gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Evince"; - description = "GNOME's document viewer"; - - longDescription = '' - Evince is a document viewer for multiple document formats. It - currently supports PDF, PostScript, DjVu, TIFF and DVI. The goal - of Evince is to replace the multiple document viewers that exist - on the GNOME Desktop with a single simple application. - ''; - - license = lib.licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = teams.gnome.members; - }; -} diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix deleted file mode 100644 index dc3f4b493b0c1..0000000000000 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ fetchurl, lib, stdenv, substituteAll, pkg-config, gnome3, python3, gobject-introspection -, intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata, libcanberra-gtk3, gcr, p11-kit -, db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking, pcre, vala, cmake, ninja -, libkrb5, openldap, webkitgtk, libaccounts-glib, json-glib, glib, gtk3, libphonenumber -, gnome-online-accounts, libgweather, libgdata, gsettings-desktop-schemas, boost, protobuf }: - -stdenv.mkDerivation rec { - pname = "evolution-data-server"; - version = "3.40.1"; - - outputs = [ "out" "dev" ]; - - src = fetchurl { - url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "08iykha7zhk21b3axsp3v1jfwda612v0m8rz8zlzppm5i8s5ziza"; - }; - - patches = [ - (substituteAll { - src = ./fix-paths.patch; - inherit tzdata; - }) - ]; - - prePatch = '' - substitute ${./hardcode-gsettings.patch} hardcode-gsettings.patch --subst-var-by ESD_GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"} \ - --subst-var-by GDS_GSETTINGS_PATH ${glib.getSchemaPath gsettings-desktop-schemas} - patches="$patches $PWD/hardcode-gsettings.patch" - ''; - - nativeBuildInputs = [ - cmake ninja pkg-config intltool python3 gperf wrapGAppsHook gobject-introspection vala - ]; - buildInputs = [ - glib libsoup libxml2 gtk3 gnome-online-accounts - gcr p11-kit libgweather libgdata libaccounts-glib json-glib - icu sqlite libkrb5 openldap webkitgtk glib-networking - libcanberra-gtk3 pcre libphonenumber boost protobuf - ]; - - propagatedBuildInputs = [ libsecret nss nspr libical db libsoup ]; - - cmakeFlags = [ - "-DENABLE_UOA=OFF" - "-DENABLE_VALA_BINDINGS=ON" - "-DENABLE_INTROSPECTION=ON" - "-DCMAKE_SKIP_BUILD_RPATH=OFF" - "-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include" - "-DWITH_PHONENUMBER=ON" - ]; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "evolution-data-server"; - versionPolicy = "odd-unstable"; - }; - }; - - meta = with lib; { - description = "Unified backend for programs that work with contacts, tasks, and calendar information"; - homepage = "https://wiki.gnome.org/Apps/Evolution"; - license = licenses.lgpl2; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/fix-paths.patch b/pkgs/desktops/gnome-3/core/evolution-data-server/fix-paths.patch deleted file mode 100644 index 334235516591f..0000000000000 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/fix-paths.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/calendar/libecal/e-cal-system-timezone.c -+++ b/src/calendar/libecal/e-cal-system-timezone.c -@@ -26,7 +26,7 @@ - #ifdef HAVE_SOLARIS - #define SYSTEM_ZONEINFODIR "/usr/share/lib/zoneinfo/tab" - #else --#define SYSTEM_ZONEINFODIR "/usr/share/zoneinfo" -+#define SYSTEM_ZONEINFODIR "@tzdata@/share/zoneinfo" - #endif - - #define ETC_TIMEZONE "/etc/timezone" diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/hardcode-gsettings.patch b/pkgs/desktops/gnome-3/core/evolution-data-server/hardcode-gsettings.patch deleted file mode 100644 index 4e345c3cb3ca8..0000000000000 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/hardcode-gsettings.patch +++ /dev/null @@ -1,526 +0,0 @@ -diff --git a/src/addressbook/libebook/e-book-client.c b/src/addressbook/libebook/e-book-client.c -index 2c0557c3c..5955aa55e 100644 ---- a/src/addressbook/libebook/e-book-client.c -+++ b/src/addressbook/libebook/e-book-client.c -@@ -1989,7 +1989,20 @@ e_book_client_get_self (ESourceRegistry *registry, - - *out_client = book_client; - -- settings = g_settings_new (SELF_UID_PATH_ID); -+ { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", -+ g_settings_schema_source_get_default(), -+ TRUE, -+ NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ SELF_UID_PATH_ID, -+ FALSE); -+ settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); -+ } - uid = g_settings_get_string (settings, SELF_UID_KEY); - g_object_unref (settings); - -@@ -2057,7 +2070,20 @@ e_book_client_set_self (EBookClient *client, - g_return_val_if_fail ( - e_contact_get_const (contact, E_CONTACT_UID) != NULL, FALSE); - -- settings = g_settings_new (SELF_UID_PATH_ID); -+ { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", -+ g_settings_schema_source_get_default(), -+ TRUE, -+ NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ SELF_UID_PATH_ID, -+ FALSE); -+ settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); -+ } - g_settings_set_string ( - settings, SELF_UID_KEY, - e_contact_get_const (contact, E_CONTACT_UID)); -@@ -2093,8 +2119,20 @@ e_book_client_is_self (EContact *contact) - * unfortunately the API doesn't allow that. - */ - g_mutex_lock (&mutex); -- if (!settings) -- settings = g_settings_new (SELF_UID_PATH_ID); -+ if (!settings) { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", -+ g_settings_schema_source_get_default(), -+ TRUE, -+ NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ SELF_UID_PATH_ID, -+ FALSE); -+ settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); -+ } - uid = g_settings_get_string (settings, SELF_UID_KEY); - g_mutex_unlock (&mutex); - -diff --git a/src/addressbook/libebook/e-book.c b/src/addressbook/libebook/e-book.c -index 3396b57c0..ac6420b2e 100644 ---- a/src/addressbook/libebook/e-book.c -+++ b/src/addressbook/libebook/e-book.c -@@ -2594,7 +2594,20 @@ e_book_get_self (ESourceRegistry *registry, - return FALSE; - } - -- settings = g_settings_new (SELF_UID_PATH_ID); -+ { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", -+ g_settings_schema_source_get_default(), -+ TRUE, -+ NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ SELF_UID_PATH_ID, -+ FALSE); -+ settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); -+ } - uid = g_settings_get_string (settings, SELF_UID_KEY); - g_object_unref (settings); - -@@ -2649,7 +2662,20 @@ e_book_set_self (EBook *book, - g_return_val_if_fail (E_IS_BOOK (book), FALSE); - g_return_val_if_fail (E_IS_CONTACT (contact), FALSE); - -- settings = g_settings_new (SELF_UID_PATH_ID); -+ { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", -+ g_settings_schema_source_get_default(), -+ TRUE, -+ NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ SELF_UID_PATH_ID, -+ FALSE); -+ settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); -+ } - g_settings_set_string ( - settings, SELF_UID_KEY, - e_contact_get_const (contact, E_CONTACT_UID)); -@@ -2677,7 +2703,20 @@ e_book_is_self (EContact *contact) - - g_return_val_if_fail (E_IS_CONTACT (contact), FALSE); - -- settings = g_settings_new (SELF_UID_PATH_ID); -+ { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", -+ g_settings_schema_source_get_default(), -+ TRUE, -+ NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ SELF_UID_PATH_ID, -+ FALSE); -+ settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); -+ } - uid = g_settings_get_string (settings, SELF_UID_KEY); - g_object_unref (settings); - -diff --git a/src/calendar/backends/contacts/e-cal-backend-contacts.c b/src/calendar/backends/contacts/e-cal-backend-contacts.c -index de1716941..e83b104f1 100644 ---- a/src/calendar/backends/contacts/e-cal-backend-contacts.c -+++ b/src/calendar/backends/contacts/e-cal-backend-contacts.c -@@ -1397,7 +1397,20 @@ e_cal_backend_contacts_init (ECalBackendContacts *cbc) - (GDestroyNotify) g_free, - (GDestroyNotify) contact_record_free); - -- cbc->priv->settings = g_settings_new ("org.gnome.evolution-data-server.calendar"); -+ { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", -+ g_settings_schema_source_get_default(), -+ TRUE, -+ NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ "org.gnome.evolution-data-server.calendar", -+ FALSE); -+ cbc->priv->settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); -+ } - cbc->priv->notifyid = 0; - cbc->priv->update_alarms_id = 0; - cbc->priv->alarm_enabled = FALSE; -diff --git a/src/calendar/libecal/e-reminder-watcher.c b/src/calendar/libecal/e-reminder-watcher.c -index b08a7f301..a49fe39c5 100644 ---- a/src/calendar/libecal/e-reminder-watcher.c -+++ b/src/calendar/libecal/e-reminder-watcher.c -@@ -2202,7 +2202,21 @@ e_reminder_watcher_init (EReminderWatcher *watcher) - - watcher->priv = G_TYPE_INSTANCE_GET_PRIVATE (watcher, E_TYPE_REMINDER_WATCHER, EReminderWatcherPrivate); - watcher->priv->cancellable = g_cancellable_new (); -- watcher->priv->settings = g_settings_new ("org.gnome.evolution-data-server.calendar"); -+ { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", -+ g_settings_schema_source_get_default(), -+ TRUE, -+ NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ "org.gnome.evolution-data-server.calendar", -+ FALSE); -+ watcher->priv->settings = g_settings_new_full(schema, NULL, -+ NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); -+ } - watcher->priv->scheduled = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, e_reminder_watcher_free_rd_slist); - watcher->priv->default_zone = icaltimezone_copy (zone); - watcher->priv->timers_enabled = TRUE; -diff --git a/src/camel/camel-cipher-context.c b/src/camel/camel-cipher-context.c -index dcdc3eed0..fd2e428c2 100644 ---- a/src/camel/camel-cipher-context.c -+++ b/src/camel/camel-cipher-context.c -@@ -1635,7 +1635,20 @@ camel_cipher_can_load_photos (void) - GSettings *settings; - gboolean load_photos; - -- settings = g_settings_new ("org.gnome.evolution-data-server"); -+ { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", -+ g_settings_schema_source_get_default(), -+ TRUE, -+ NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ "org.gnome.evolution-data-server", -+ FALSE); -+ settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); -+ } - load_photos = g_settings_get_boolean (settings, "camel-cipher-load-photos"); - g_clear_object (&settings); - -diff --git a/src/camel/camel-gpg-context.c b/src/camel/camel-gpg-context.c -index 1b3362886..f0811b292 100644 ---- a/src/camel/camel-gpg-context.c -+++ b/src/camel/camel-gpg-context.c -@@ -573,7 +573,20 @@ gpg_ctx_get_executable_name (void) - GSettings *settings; - gchar *path; - -- settings = g_settings_new ("org.gnome.evolution-data-server"); -+ { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", -+ g_settings_schema_source_get_default(), -+ TRUE, -+ NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ "org.gnome.evolution-data-server", -+ FALSE); -+ settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); -+ } - path = g_settings_get_string (settings, "camel-gpg-binary"); - g_clear_object (&settings); - -diff --git a/src/libedataserver/e-network-monitor.c b/src/libedataserver/e-network-monitor.c -index e0d8b87d6..3a4d5a359 100644 ---- a/src/libedataserver/e-network-monitor.c -+++ b/src/libedataserver/e-network-monitor.c -@@ -255,7 +255,20 @@ e_network_monitor_constructed (GObject *object) - /* Chain up to parent's method. */ - G_OBJECT_CLASS (e_network_monitor_parent_class)->constructed (object); - -- settings = g_settings_new ("org.gnome.evolution-data-server"); -+ { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", -+ g_settings_schema_source_get_default(), -+ TRUE, -+ NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ "org.gnome.evolution-data-server", -+ FALSE); -+ settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); -+ } - g_settings_bind ( - settings, "network-monitor-gio-name", - object, "gio-name", -diff --git a/src/libedataserver/e-oauth2-service-google.c b/src/libedataserver/e-oauth2-service-google.c -index f0c6f2cbf..0053e3ce6 100644 ---- a/src/libedataserver/e-oauth2-service-google.c -+++ b/src/libedataserver/e-oauth2-service-google.c -@@ -69,7 +69,20 @@ eos_google_read_settings (EOAuth2Service *service, - if (!value) { - GSettings *settings; - -- settings = g_settings_new ("org.gnome.evolution-data-server"); -+ { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", -+ g_settings_schema_source_get_default(), -+ TRUE, -+ NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ "org.gnome.evolution-data-server", -+ FALSE); -+ settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); -+ } - value = g_settings_get_string (settings, key_name); - g_object_unref (settings); - -diff --git a/src/libedataserver/e-oauth2-service-outlook.c b/src/libedataserver/e-oauth2-service-outlook.c -index 687c10d3b..684583c35 100644 ---- a/src/libedataserver/e-oauth2-service-outlook.c -+++ b/src/libedataserver/e-oauth2-service-outlook.c -@@ -70,7 +70,20 @@ eos_outlook_read_settings (EOAuth2Service *service, - if (!value) { - GSettings *settings; - -- settings = g_settings_new ("org.gnome.evolution-data-server"); -+ { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", -+ g_settings_schema_source_get_default(), -+ TRUE, -+ NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ "org.gnome.evolution-data-server", -+ FALSE); -+ settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); -+ } - value = g_settings_get_string (settings, key_name); - g_object_unref (settings); - -diff --git a/src/libedataserver/e-oauth2-service.c b/src/libedataserver/e-oauth2-service.c -index 682673c16..436f52d5f 100644 ---- a/src/libedataserver/e-oauth2-service.c -+++ b/src/libedataserver/e-oauth2-service.c -@@ -95,7 +95,20 @@ eos_default_guess_can_process (EOAuth2Service *service, - name_len = strlen (name); - hostname_len = strlen (hostname); - -- settings = g_settings_new ("org.gnome.evolution-data-server"); -+ { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", -+ g_settings_schema_source_get_default(), -+ TRUE, -+ NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ "org.gnome.evolution-data-server", -+ FALSE); -+ settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); -+ } - values = g_settings_get_strv (settings, "oauth2-services-hint"); - g_object_unref (settings); - -diff --git a/src/libedataserver/e-proxy.c b/src/libedataserver/e-proxy.c -index 883379a60..989353494 100644 ---- a/src/libedataserver/e-proxy.c -+++ b/src/libedataserver/e-proxy.c -@@ -969,8 +969,37 @@ e_proxy_init (EProxy *proxy) - - proxy->priv->type = PROXY_TYPE_SYSTEM; - -- proxy->priv->evolution_proxy_settings = g_settings_new ("org.gnome.evolution.shell.network-config"); -- proxy->priv->proxy_settings = g_settings_new ("org.gnome.system.proxy"); -+ { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", -+ g_settings_schema_source_get_default(), -+ TRUE, -+ NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ "org.gnome.evolution.shell.network-config", -+ FALSE); -+ proxy->priv->evolution_proxy_settings = g_settings_new_full(schema, -+ NULL, -+ NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); -+ } -+ { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@GDS_GSETTINGS_PATH@", -+ g_settings_schema_source_get_default(), -+ TRUE, -+ NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ "org.gnome.system.proxy", -+ FALSE); -+ proxy->priv->proxy_settings = g_settings_new_full(schema, -+ NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); -+ } - proxy->priv->proxy_http_settings = g_settings_get_child (proxy->priv->proxy_settings, "http"); - proxy->priv->proxy_https_settings = g_settings_get_child (proxy->priv->proxy_settings, "https"); - proxy->priv->proxy_socks_settings = g_settings_get_child (proxy->priv->proxy_settings, "socks"); -diff --git a/src/libedataserver/e-source-registry.c b/src/libedataserver/e-source-registry.c -index a5a30a3e1..5fbdf8190 100644 ---- a/src/libedataserver/e-source-registry.c -+++ b/src/libedataserver/e-source-registry.c -@@ -1749,7 +1749,21 @@ e_source_registry_init (ESourceRegistry *registry) - - g_mutex_init (®istry->priv->sources_lock); - -- registry->priv->settings = g_settings_new (GSETTINGS_SCHEMA); -+ { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", -+ g_settings_schema_source_get_default(), -+ TRUE, -+ NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ GSETTINGS_SCHEMA, -+ FALSE); -+ registry->priv->settings = g_settings_new_full(schema, NULL, -+ NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); -+ } - - g_signal_connect ( - registry->priv->settings, "changed", -diff --git a/src/libedataserverui/e-reminders-widget.c b/src/libedataserverui/e-reminders-widget.c -index f89cd4a5c..06cca9b5f 100644 ---- a/src/libedataserverui/e-reminders-widget.c -+++ b/src/libedataserverui/e-reminders-widget.c -@@ -1650,7 +1650,21 @@ static void - e_reminders_widget_init (ERemindersWidget *reminders) - { - reminders->priv = e_reminders_widget_get_instance_private (reminders); -- reminders->priv->settings = g_settings_new ("org.gnome.evolution-data-server.calendar"); -+ { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", -+ g_settings_schema_source_get_default(), -+ TRUE, -+ NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ "org.gnome.evolution-data-server.calendar", -+ FALSE); -+ reminders->priv->settings = g_settings_new_full(schema, NULL, -+ NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); -+ } - reminders->priv->cancellable = g_cancellable_new (); - reminders->priv->is_empty = TRUE; - reminders->priv->is_mapped = FALSE; -diff --git a/src/services/evolution-source-registry/evolution-source-registry-autoconfig.c b/src/services/evolution-source-registry/evolution-source-registry-autoconfig.c -index 6f03053d6..dffc186c7 100644 ---- a/src/services/evolution-source-registry/evolution-source-registry-autoconfig.c -+++ b/src/services/evolution-source-registry/evolution-source-registry-autoconfig.c -@@ -706,7 +706,20 @@ evolution_source_registry_merge_autoconfig_sources (ESourceRegistryServer *serve - gchar *autoconfig_directory; - gint ii; - -- settings = g_settings_new ("org.gnome.evolution-data-server"); -+ { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", -+ g_settings_schema_source_get_default(), -+ TRUE, -+ NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ "org.gnome.evolution-data-server", -+ FALSE); -+ settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); -+ } - - autoconfig_sources = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, e_autoconfig_free_merge_source_data); - -diff --git a/src/services/evolution-source-registry/evolution-source-registry-migrate-proxies.c b/src/services/evolution-source-registry/evolution-source-registry-migrate-proxies.c -index d531cb9e2..c5b1c761c 100644 ---- a/src/services/evolution-source-registry/evolution-source-registry-migrate-proxies.c -+++ b/src/services/evolution-source-registry/evolution-source-registry-migrate-proxies.c -@@ -61,7 +61,20 @@ evolution_source_registry_migrate_proxies (ESourceRegistryServer *server) - extension_name = E_SOURCE_EXTENSION_PROXY; - extension = e_source_get_extension (source, extension_name); - -- settings = g_settings_new (NETWORK_CONFIG_SCHEMA_ID); -+ { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", -+ g_settings_schema_source_get_default(), -+ TRUE, -+ NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ NETWORK_CONFIG_SCHEMA_ID, -+ FALSE); -+ settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); -+ } - - switch (g_settings_get_int (settings, "proxy-type")) { - case 1: -diff --git a/src/services/evolution-source-registry/evolution-source-registry.c b/src/services/evolution-source-registry/evolution-source-registry.c -index 1c0a11382..3e144845e 100644 ---- a/src/services/evolution-source-registry/evolution-source-registry.c -+++ b/src/services/evolution-source-registry/evolution-source-registry.c -@@ -181,7 +181,20 @@ main (gint argc, - - reload: - -- settings = g_settings_new ("org.gnome.evolution-data-server"); -+ { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", -+ g_settings_schema_source_get_default(), -+ TRUE, -+ NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ "org.gnome.evolution-data-server", -+ FALSE); -+ settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); -+ } - - if (!opt_disable_migration && !g_settings_get_boolean (settings, "migrated")) { - g_settings_set_boolean (settings, "migrated", TRUE); diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix deleted file mode 100644 index 6c1db6cebd9e7..0000000000000 --- a/pkgs/desktops/gnome-3/core/gdm/default.nix +++ /dev/null @@ -1,180 +0,0 @@ -{ lib, stdenv -, fetchurl -, fetchpatch -, substituteAll -, meson -, ninja -, python3 -, rsync -, pkg-config -, glib -, itstool -, libxml2 -, xorg -, accountsservice -, libX11 -, gnome3 -, systemd -, dconf -, gtk3 -, libcanberra-gtk3 -, pam -, libselinux -, keyutils -, audit -, gobject-introspection -, plymouth -, librsvg -, coreutils -, xwayland -, dbus -, nixos-icons -}: - -let - - override = substituteAll { - src = ./org.gnome.login-screen.gschema.override; - icon = "${nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake-white.svg"; - }; - -in - -stdenv.mkDerivation rec { - pname = "gdm"; - version = "40.0"; - - outputs = [ "out" "dev" ]; - - src = fetchurl { - url = "mirror://gnome/sources/gdm/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "XtdLc506Iy/7HkoTK8+WW9/pVdmVtSh3NYh3WwLylQ4="; - }; - - mesonFlags = [ - "-Dgdm-xsession=true" - # TODO: Setup a default-path? https://gitlab.gnome.org/GNOME/gdm/-/blob/6fc40ac6aa37c8ad87c32f0b1a5d813d34bf7770/meson_options.txt#L6 - "-Dinitial-vt=${passthru.initialVT}" - "-Dudev-dir=${placeholder "out"}/lib/udev/rules.d" - "-Dsystemdsystemunitdir=${placeholder "out"}/lib/systemd/system" - "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user" - "--sysconfdir=/etc" - "--localstatedir=/var" - ]; - - nativeBuildInputs = [ - dconf - glib # for glib-compile-schemas - itstool - meson - ninja - pkg-config - python3 - rsync - ]; - - buildInputs = [ - accountsservice - audit - glib - gobject-introspection - gtk3 - keyutils - libX11 - libcanberra-gtk3 - libselinux - pam - plymouth - systemd - xorg.libXdmcp - ]; - - patches = [ - # GDM fails to find g-s with the following error in the journal. - # gdm-x-session[976]: dbus-run-session: failed to exec 'gnome-session': No such file or directory - # https://gitlab.gnome.org/GNOME/gdm/-/merge_requests/92 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gdm/-/commit/ccecd9c975d04da80db4cd547b67a1a94fa83292.patch"; - sha256 = "5hKS9wjjhuSAYwXct5vS0dPbmPRIINJoLC0Zm1naz6Q="; - revert = true; - }) - - # Change hardcoded paths to nix store paths. - (substituteAll { - src = ./fix-paths.patch; - inherit coreutils plymouth xwayland dbus; - }) - - # The following patches implement certain environment variables in GDM which are set by - # the gdm configuration module (nixos/modules/services/x11/display-managers/gdm.nix). - - ./gdm-x-session_extra_args.patch - - # Allow specifying a wrapper for running the session command. - ./gdm-x-session_session-wrapper.patch - - # Forwards certain environment variables to the gdm-x-session child process - # to ensure that the above two patches actually work. - ./gdm-session-worker_forward-vars.patch - - # Set up the environment properly when launching sessions - # https://github.com/NixOS/nixpkgs/issues/48255 - ./reset-environment.patch - ]; - - postPatch = '' - patchShebangs build-aux/meson_post_install.py - - # Upstream checks some common paths to find an `X` binary. We already know it. - echo #!/bin/sh > build-aux/find-x-server.sh - echo "echo ${lib.getBin xorg.xorgserver}/bin/X" >> build-aux/find-x-server.sh - patchShebangs build-aux/find-x-server.sh - ''; - - preInstall = '' - install -D ${override} ${DESTDIR}/$out/share/glib-2.0/schemas/org.gnome.login-screen.gschema.override - ''; - - postInstall = '' - # Move stuff from DESTDIR to proper location. - # We use rsync to merge the directories. - rsync --archive "${DESTDIR}/etc" "$out" - rm --recursive "${DESTDIR}/etc" - for o in $outputs; do - rsync --archive "${DESTDIR}/''${!o}" "$(dirname "''${!o}")" - rm --recursive "${DESTDIR}/''${!o}" - done - # Ensure the DESTDIR is removed. - rmdir "${DESTDIR}/nix/store" "${DESTDIR}/nix" "${DESTDIR}" - - # We are setting DESTDIR so the post-install script does not compile the schemas. - glib-compile-schemas "$out/share/glib-2.0/schemas" - ''; - - # HACK: We want to install configuration files to $out/etc - # but GDM should read them from /etc on a NixOS system. - # With autotools, it was possible to override Make variables - # at install time but Meson does not support this - # so we need to convince it to install all files to a temporary - # location using DESTDIR and then move it to proper one in postInstall. - DESTDIR = "${placeholder "out"}/dest"; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "gdm"; - attrPath = "gnome3.gdm"; - }; - - # Used in GDM NixOS module - # Don't remove. - initialVT = "7"; - }; - - meta = with lib; { - description = "A program that manages graphical display servers and handles graphical user logins"; - homepage = "https://wiki.gnome.org/Projects/GDM"; - license = licenses.gpl2Plus; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gdm/fix-paths.patch b/pkgs/desktops/gnome-3/core/gdm/fix-paths.patch deleted file mode 100644 index d649556fe9e62..0000000000000 --- a/pkgs/desktops/gnome-3/core/gdm/fix-paths.patch +++ /dev/null @@ -1,82 +0,0 @@ ---- a/daemon/gdm-local-display-factory.c -+++ b/daemon/gdm-local-display-factory.c -@@ -201,7 +201,7 @@ - #ifdef ENABLE_WAYLAND_SUPPORT - gboolean wayland_enabled = FALSE; - if (gdm_settings_direct_get_boolean (GDM_KEY_WAYLAND_ENABLE, &wayland_enabled)) { -- if (wayland_enabled && g_file_test ("/usr/bin/Xwayland", G_FILE_TEST_IS_EXECUTABLE) ) -+ if (wayland_enabled && g_file_test ("@xwayland@/bin/Xwayland", G_FILE_TEST_IS_EXECUTABLE) ) - return TRUE; - } - #endif ---- a/daemon/gdm-manager.c -+++ b/daemon/gdm-manager.c -@@ -145,7 +145,7 @@ - GError *error; - - error = NULL; -- res = g_spawn_command_line_sync ("plymouth --ping", -+ res = g_spawn_command_line_sync ("@plymouth@/bin/plymouth --ping", - NULL, NULL, &status, &error); - if (! res) { - g_debug ("Could not ping plymouth: %s", error->message); -@@ -163,7 +163,7 @@ - GError *error; - - error = NULL; -- res = g_spawn_command_line_sync ("plymouth deactivate", -+ res = g_spawn_command_line_sync ("@plymouth@/bin/plymouth deactivate", - NULL, NULL, NULL, &error); - if (! res) { - g_warning ("Could not deactivate plymouth: %s", error->message); -@@ -178,7 +178,7 @@ - GError *error; - - error = NULL; -- res = g_spawn_command_line_async ("plymouth quit --retain-splash", &error); -+ res = g_spawn_command_line_async ("@plymouth@/bin/plymouth quit --retain-splash", &error); - if (! res) { - g_warning ("Could not quit plymouth: %s", error->message); - g_error_free (error); -@@ -194,7 +194,7 @@ - GError *error; - - error = NULL; -- res = g_spawn_command_line_async ("plymouth quit", &error); -+ res = g_spawn_command_line_async ("@plymouth@/bin/plymouth quit", &error); - if (! res) { - g_warning ("Could not quit plymouth: %s", error->message); - g_error_free (error); ---- a/data/gdm.service.in -+++ b/data/gdm.service.in -@@ -26,7 +26,7 @@ Restart=always - IgnoreSIGPIPE=no - BusName=org.gnome.DisplayManager - EnvironmentFile=-${LANG_CONFIG_FILE} --ExecReload=/bin/kill -SIGHUP $MAINPID -+ExecReload=@coreutils@/bin/kill -SIGHUP $MAINPID - KeyringMode=shared - - [Install] ---- a/daemon/gdm-session.c -+++ b/daemon/gdm-session.c -@@ -2916,16 +2916,16 @@ gdm_session_start_session (GdmSession *self, - */ - if (run_launcher) { - if (is_x11) { -- program = g_strdup_printf (LIBEXECDIR "/gdm-x-session %s\"dbus-run-session -- %s\"", -+ program = g_strdup_printf (LIBEXECDIR "/gdm-x-session %s\"@dbus@/bin/dbus-run-session --dbus-daemon=@dbus@/bin/dbus-daemon -- %s\"", - register_session ? "--register-session " : "", - self->selected_program); - } else { -- program = g_strdup_printf (LIBEXECDIR "/gdm-wayland-session %s\"dbus-run-session -- %s\"", -+ program = g_strdup_printf (LIBEXECDIR "/gdm-wayland-session %s\"@dbus@/bin/dbus-run-session --dbus-daemon=@dbus@/bin/dbus-daemon -- %s\"", - register_session ? "--register-session " : "", - self->selected_program); - } - } else { -- program = g_strdup_printf ("dbus-run-session -- %s", -+ program = g_strdup_printf ("@dbus@/bin/dbus-run-session --dbus-daemon=@dbus@/bin/dbus-daemon -- %s", - self->selected_program); - } - } diff --git a/pkgs/desktops/gnome-3/core/gdm/gdm-session-worker_forward-vars.patch b/pkgs/desktops/gnome-3/core/gdm/gdm-session-worker_forward-vars.patch deleted file mode 100644 index 401b6aea0c28e..0000000000000 --- a/pkgs/desktops/gnome-3/core/gdm/gdm-session-worker_forward-vars.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c -index 9ef4c5b..94da834 100644 ---- a/daemon/gdm-session-worker.c -+++ b/daemon/gdm-session-worker.c -@@ -1515,6 +1515,16 @@ gdm_session_worker_load_env_d (GdmSessionWorker *worker) - g_object_unref (dir); - } - -+static void -+gdm_session_worker_forward_var (GdmSessionWorker *worker, char const *var) -+{ -+ char const *value = g_getenv(var); -+ if (value != NULL) { -+ g_debug ("forwarding %s= %s", var, value); -+ gdm_session_worker_set_environment_variable(worker, var, value); -+ } -+} -+ - static gboolean - gdm_session_worker_accredit_user (GdmSessionWorker *worker, - GError **error) -@@ -1559,6 +1569,9 @@ gdm_session_worker_accredit_user (GdmSessionWorker *worker, - goto out; - } - -+ gdm_session_worker_forward_var(worker, "GDM_X_SERVER_EXTRA_ARGS"); -+ gdm_session_worker_forward_var(worker, "GDM_X_SESSION_WRAPPER"); -+ - gdm_session_worker_update_environment_from_passwd_info (worker, - uid, - gid, diff --git a/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_extra_args.patch b/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_extra_args.patch deleted file mode 100644 index 66071aa4af805..0000000000000 --- a/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_extra_args.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/daemon/gdm-x-session.c.orig b/daemon/gdm-x-session.c -index d835b34..1f4b7f1 100644 ---- a/daemon/gdm-x-session.c.orig -+++ b/daemon/gdm-x-session.c -@@ -211,6 +211,7 @@ spawn_x_server (State *state, - char *vt_string = NULL; - char *display_number; - gsize display_number_size; -+ gchar **xserver_extra_args = NULL; - - auth_file = prepare_auth_file (); - -@@ -285,6 +286,17 @@ spawn_x_server (State *state, - if (state->debug_enabled) { - g_ptr_array_add (arguments, "-core"); - } -+ -+ if (g_getenv ("GDM_X_SERVER_EXTRA_ARGS") != NULL) { -+ g_debug ("using GDM_X_SERVER_EXTRA_ARGS: %s", g_getenv("GDM_X_SERVER_EXTRA_ARGS")); -+ xserver_extra_args = g_strsplit(g_getenv("GDM_X_SERVER_EXTRA_ARGS"), " ", -1); -+ for (gchar **extra_arg = xserver_extra_args; *extra_arg; extra_arg++) { -+ if (strlen(*extra_arg) < 1) continue; -+ g_debug ("adding: %s", *extra_arg); -+ g_ptr_array_add (arguments, *extra_arg); -+ } -+ } -+ - g_ptr_array_add (arguments, NULL); - - subprocess = g_subprocess_launcher_spawnv (launcher, -@@ -332,6 +344,7 @@ spawn_x_server (State *state, - - is_running = TRUE; - out: -+ g_strfreev(xserver_extra_args); - g_clear_pointer (&auth_file, g_free); - g_clear_object (&data_stream); - g_clear_object (&subprocess); diff --git a/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_session-wrapper.patch b/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_session-wrapper.patch deleted file mode 100644 index 58481f0730fae..0000000000000 --- a/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_session-wrapper.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/daemon/gdm-x-session.c b/daemon/gdm-x-session.c -index 88fe96f..b1b140a 100644 ---- a/daemon/gdm-x-session.c -+++ b/daemon/gdm-x-session.c -@@ -664,18 +664,34 @@ spawn_session (State *state, - state->session_command, - NULL); - } else { -+ char const *session_wrapper; -+ char *eff_session_command; - int ret; - char **argv; - -- ret = g_shell_parse_argv (state->session_command, -+ session_wrapper = g_getenv("GDM_X_SESSION_WRAPPER"); -+ if (session_wrapper != NULL) { -+ char *quoted_wrapper = g_shell_quote(session_wrapper); -+ eff_session_command = g_strjoin(" ", quoted_wrapper, state->session_command, NULL); -+ g_free(quoted_wrapper); -+ } else { -+ eff_session_command = state->session_command; -+ } -+ -+ ret = g_shell_parse_argv (eff_session_command, - NULL, - &argv, - &error); - -+ if (session_wrapper != NULL) { -+ g_free(eff_session_command); -+ } -+ - if (!ret) { - g_debug ("could not parse session arguments: %s", error->message); - goto out; - } -+ - subprocess = g_subprocess_launcher_spawnv (launcher, - (const char * const *) argv, - &error); diff --git a/pkgs/desktops/gnome-3/core/gdm/org.gnome.login-screen.gschema.override b/pkgs/desktops/gnome-3/core/gdm/org.gnome.login-screen.gschema.override deleted file mode 100644 index 8c17f494b0f2a..0000000000000 --- a/pkgs/desktops/gnome-3/core/gdm/org.gnome.login-screen.gschema.override +++ /dev/null @@ -1,2 +0,0 @@ -[org.gnome.login-screen] -logo='@icon@' diff --git a/pkgs/desktops/gnome-3/core/gdm/reset-environment.patch b/pkgs/desktops/gnome-3/core/gdm/reset-environment.patch deleted file mode 100644 index 61defd9c4bc20..0000000000000 --- a/pkgs/desktops/gnome-3/core/gdm/reset-environment.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/daemon/gdm-wayland-session.c -+++ b/daemon/gdm-wayland-session.c -@@ -285,6 +285,7 @@ spawn_session (State *state, - "WAYLAND_DISPLAY", - "WAYLAND_SOCKET", - "GNOME_SHELL_SESSION_MODE", -+ "__NIXOS_SET_ENVIRONMENT_DONE", - NULL }; - - g_debug ("Running wayland session"); ---- a/daemon/gdm-x-session.c -+++ b/daemon/gdm-x-session.c -@@ -610,6 +610,7 @@ spawn_session (State *state, - "WAYLAND_DISPLAY", - "WAYLAND_SOCKET", - "GNOME_SHELL_SESSION_MODE", -+ "__NIXOS_SET_ENVIRONMENT_DONE", - NULL }; - - g_debug ("Running X session"); diff --git a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix deleted file mode 100644 index 2ce5291159552..0000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gnome3, gettext }: - -stdenv.mkDerivation rec { - pname = "gnome-backgrounds"; - version = "40.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "YN+KDaMBzkJbcEPUKuMuxAEf8I8Y4Pxi8pQBMF2jpw4="; - }; - - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-backgrounds"; attrPath = "gnome3.gnome-backgrounds"; }; - }; - - nativeBuildInputs = [ meson ninja pkg-config gettext ]; - - meta = with lib; { - platforms = platforms.unix; - maintainers = teams.gnome.members; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix deleted file mode 100644 index e057cc61da81c..0000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ lib -, stdenv -, fetchurl -, gnome3 -, meson -, ninja -, pkg-config -, gtk3 -, gettext -, glib -, udev -, itstool -, libxml2 -, wrapGAppsHook -, libnotify -, libcanberra-gtk3 -, gobject-introspection -, gtk-doc -, docbook-xsl-nons -, docbook_xml_dtd_43 -, python3 -, gsettings-desktop-schemas -}: - -stdenv.mkDerivation rec { - pname = "gnome-bluetooth"; - version = "3.34.5"; - - # TODO: split out "lib" - outputs = [ "out" "dev" "devdoc" "man" ]; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1a9ynlwwkb3wpg293ym517vmrkk63y809mmcv9a21k5yr199x53c"; - }; - - nativeBuildInputs = [ - meson - ninja - gettext - itstool - pkg-config - libxml2 - wrapGAppsHook - gobject-introspection - gtk-doc - docbook-xsl-nons - docbook_xml_dtd_43 - python3 - ]; - - buildInputs = [ - glib - gtk3 - udev - libnotify - libcanberra-gtk3 - gnome3.adwaita-icon-theme - gsettings-desktop-schemas - ]; - - mesonFlags = [ - "-Dicon_update=false" - "-Dgtk_doc=true" - ]; - - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - meta = with lib; { - homepage = "https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en"; - description = "Application that let you manage Bluetooth in the GNOME destkop"; - maintainers = teams.gnome.members; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix deleted file mode 100644 index 4bf317a4a2605..0000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ stdenv -, lib -, meson -, ninja -, vala -, gettext -, itstool -, fetchurl -, pkg-config -, libxml2 -, gtk3 -, glib -, gtksourceview4 -, wrapGAppsHook -, gobject-introspection -, python3 -, gnome3 -, mpfr -, gmp -, libsoup -, libmpc -, libhandy -, gsettings-desktop-schemas -, libgee -}: - -stdenv.mkDerivation rec { - pname = "gnome-calculator"; - version = "40.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "1xkazxbkpn1z5pfphhps7fc5q4yc8lp7f6b222n8bx5iyxhwbrkz"; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - vala - gettext - itstool - wrapGAppsHook - python3 - gobject-introspection # for finding vapi files - ]; - - buildInputs = [ - gtk3 - glib - libxml2 - gtksourceview4 - mpfr - gmp - gnome3.adwaita-icon-theme - libgee - gsettings-desktop-schemas - libsoup - libmpc - libhandy - ]; - - doCheck = true; - - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - ''; - - preCheck = '' - # Currency conversion test tries to store currency data in $HOME/.cache. - export HOME=$TMPDIR - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "gnome-calculator"; - attrPath = "gnome3.gnome-calculator"; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Calculator"; - description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment"; - maintainers = teams.gnome.members; - license = licenses.gpl3Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix b/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix deleted file mode 100644 index 73db99f3d379e..0000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ lib, stdenv -, fetchurl -, meson -, ninja -, pkg-config -, gettext -, itstool -, desktop-file-utils -, gnome3 -, glib -, gtk3 -, libexif -, libtiff -, colord -, colord-gtk -, libcanberra-gtk3 -, lcms2 -, vte -, exiv2 -}: - -stdenv.mkDerivation rec { - pname = "gnome-color-manager"; - version = "3.32.0"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1vpxa2zjz3lkq9ldjg0fl65db9s6b4kcs8nyaqfz3jygma7ifg3w"; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gettext - itstool - desktop-file-utils - ]; - - buildInputs = [ - glib - gtk3 - libexif - libtiff - colord - colord-gtk - libcanberra-gtk3 - lcms2 - vte - exiv2 - ]; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - meta = with lib; { - description = "A set of graphical utilities for color management to be used in the GNOME desktop"; - license = licenses.gpl2Plus; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/core/gnome-common/default.nix deleted file mode 100644 index 53e3ed47ebe79..0000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-common/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchurl, which, gnome3, autoconf, automake }: - -stdenv.mkDerivation rec { - pname = "gnome-common"; - version = "3.18.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-common/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "22569e370ae755e04527b76328befc4c73b62bfd4a572499fde116b8318af8cf"; - }; - - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-common"; attrPath = "gnome3.gnome-common"; }; - }; - - patches = [(fetchurl { - name = "gnome-common-patch"; - url = "https://bug697543.bugzilla-attachments.gnome.org/attachment.cgi?id=240935"; - sha256 = "17abp7czfzirjm7qsn2czd03hdv9kbyhk3lkjxg2xsf5fky7z7jl"; - })]; - - propagatedBuildInputs = [ which autoconf automake ]; # autogen.sh which is using gnome-common tends to require which - - meta = with lib; { - maintainers = teams.gnome.members; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix deleted file mode 100644 index 3146ca717d35d..0000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ lib, stdenv -, gettext -, fetchurl -, evolution-data-server -, pkg-config -, libxslt -, docbook_xsl -, docbook_xml_dtd_42 -, python3 -, gtk3 -, glib -, cheese -, libchamplain -, clutter-gtk -, geocode-glib -, gnome-desktop -, gnome-online-accounts -, wrapGAppsHook -, folks -, libgdata -, libxml2 -, gnome3 -, vala -, meson -, ninja -, libhandy -, gsettings-desktop-schemas -}: - -stdenv.mkDerivation rec { - pname = "gnome-contacts"; - version = "40.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-contacts/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0w2g5xhw65adzvwzakrj5kaim4sw1w7s8qqwm3nm6inq50znzpn9"; - }; - - propagatedUserEnvPkgs = [ - evolution-data-server - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - vala - gettext - libxslt - docbook_xsl - docbook_xml_dtd_42 - python3 - wrapGAppsHook - ]; - - buildInputs = [ - gtk3 - glib - evolution-data-server - gsettings-desktop-schemas - folks - libgdata # required by some dependency transitively - gnome-desktop - libhandy - libxml2 - gnome-online-accounts - cheese - gnome3.adwaita-icon-theme - libchamplain - clutter-gtk - geocode-glib - ]; - - postPatch = '' - chmod +x build-aux/meson_post_install.py - patchShebangs build-aux/meson_post_install.py - ''; - - doCheck = true; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "gnome-contacts"; - attrPath = "gnome3.gnome-contacts"; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Contacts"; - description = "GNOME’s integrated address book"; - maintainers = teams.gnome.members; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix deleted file mode 100644 index 371f2d794a005..0000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ /dev/null @@ -1,190 +0,0 @@ -{ fetchurl -, fetchpatch -, lib -, stdenv -, substituteAll -, accountsservice -, adwaita-icon-theme -, cheese -, clutter -, clutter-gtk -, colord -, colord-gtk -, cups -, docbook-xsl-nons -, fontconfig -, gdk-pixbuf -, gettext -, glib -, glib-networking -, glibc -, gnome-bluetooth -, gnome-color-manager -, gnome-desktop -, gnome-online-accounts -, gnome-settings-daemon -, gnome3 -, grilo -, grilo-plugins -, gsettings-desktop-schemas -, gsound -, gtk3 -, ibus -, libcanberra-gtk3 -, libgnomekbd -, libgtop -, libgudev -, libhandy -, libkrb5 -, libpulseaudio -, libpwquality -, librsvg -, libsecret -, libsoup -, libwacom -, libxml2 -, libxslt -, meson -, modemmanager -, mutter -, networkmanager -, networkmanagerapplet -, libnma -, ninja -, pkg-config -, polkit -, python3 -, samba -, shared-mime-info -, sound-theme-freedesktop -, tracker -, tracker-miners -, tzdata -, udisks2 -, upower -, epoxy -, gnome-user-share -, gnome-remote-desktop -, wrapGAppsHook -}: - -stdenv.mkDerivation rec { - pname = "gnome-control-center"; - version = "40.0"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-zMmlc2UXOFEJrlpZkGwlgkTdh5t1A61ZhM9BZVyzAvE="; - }; - - patches = [ - (substituteAll { - src = ./paths.patch; - gcm = gnome-color-manager; - gnome_desktop = gnome-desktop; - inherit glibc libgnomekbd tzdata; - inherit cups networkmanagerapplet; - }) - - # Fix startup assertion in power panel. - # https://gitlab.gnome.org/GNOME/gnome-control-center/merge_requests/974 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-control-center/commit/9acaa10567c94048657c69538e5d7813f82c4224.patch"; - sha256 = "59GeTPcG2UiVTL4VTS/TP0p0QkAQpm3VgvuAiw64wUU="; - }) - ]; - - nativeBuildInputs = [ - docbook-xsl-nons - gettext - libxslt - meson - ninja - pkg-config - python3 - shared-mime-info - wrapGAppsHook - ]; - - buildInputs = [ - accountsservice - adwaita-icon-theme - cheese - clutter - clutter-gtk - colord - colord-gtk - epoxy - fontconfig - gdk-pixbuf - glib - glib-networking - gnome-bluetooth - gnome-desktop - gnome-online-accounts - gnome-remote-desktop # optional, sharing panel - gnome-settings-daemon - gnome-user-share # optional, sharing panel - grilo - grilo-plugins # for setting wallpaper from Flickr - gsettings-desktop-schemas - gsound - gtk3 - ibus - libcanberra-gtk3 - libgtop - libgudev - libhandy - libkrb5 - libnma - libpulseaudio - libpwquality - librsvg - libsecret - libsoup - libwacom - libxml2 - modemmanager - mutter # schemas for the keybindings - networkmanager - polkit - samba - tracker - tracker-miners # for search locations dialog - udisks2 - upower - ]; - - postPatch = '' - chmod +x build-aux/meson/meson_post_install.py # patchShebangs requires executable file - patchShebangs build-aux/meson/meson_post_install.py - ''; - - preFixup = '' - gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${sound-theme-freedesktop}/share" - # Thumbnailers (for setting user profile pictures) - --prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share" - --prefix XDG_DATA_DIRS : "${librsvg}/share" - # WM keyboard shortcuts - --prefix XDG_DATA_DIRS : "${mutter}/share" - ) - for i in $out/share/applications/*; do - substituteInPlace $i --replace "Exec=gnome-control-center" "Exec=$out/bin/gnome-control-center" - done - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - meta = with lib; { - description = "Utilities to configure the GNOME desktop"; - license = licenses.gpl2Plus; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch b/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch deleted file mode 100644 index a6787477b8144..0000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch +++ /dev/null @@ -1,194 +0,0 @@ -diff --git a/panels/color/cc-color-panel.c b/panels/color/cc-color-panel.c -index 603178efc..c363a6a5c 100644 ---- a/panels/color/cc-color-panel.c -+++ b/panels/color/cc-color-panel.c -@@ -591,7 +591,7 @@ gcm_prefs_calibrate_cb (CcColorPanel *prefs) - - /* run with modal set */ - argv = g_ptr_array_new_with_free_func (g_free); -- g_ptr_array_add (argv, g_strdup ("gcm-calibrate")); -+ g_ptr_array_add (argv, g_build_filename ("@gcm@", "bin", "gcm-calibrate", NULL)); - g_ptr_array_add (argv, g_strdup ("--device")); - g_ptr_array_add (argv, g_strdup (cd_device_get_id (prefs->current_device))); - g_ptr_array_add (argv, g_strdup ("--parent-window")); -@@ -1029,7 +1029,7 @@ gcm_prefs_profile_view (CcColorPanel *prefs, CdProfile *profile) - - /* open up gcm-viewer as a info pane */ - argv = g_ptr_array_new_with_free_func (g_free); -- g_ptr_array_add (argv, g_strdup ("gcm-viewer")); -+ g_ptr_array_add (argv, g_build_filename ("@gcm@", "bin", "gcm-viewer", NULL)); - g_ptr_array_add (argv, g_strdup ("--profile")); - g_ptr_array_add (argv, g_strdup (cd_profile_get_id (profile))); - g_ptr_array_add (argv, g_strdup ("--parent-window")); -@@ -1275,15 +1275,12 @@ gcm_prefs_device_clicked (CcColorPanel *prefs, CdDevice *device) - static void - gcm_prefs_profile_clicked (CcColorPanel *prefs, CdProfile *profile, CdDevice *device) - { -- g_autofree gchar *s = NULL; -- - /* get profile */ - g_debug ("selected profile = %s", - cd_profile_get_filename (profile)); - - /* allow getting profile info */ -- if (cd_profile_get_filename (profile) != NULL && -- (s = g_find_program_in_path ("gcm-viewer")) != NULL) -+ if (cd_profile_get_filename (profile) != NULL) - gtk_widget_set_sensitive (prefs->toolbutton_profile_view, TRUE); - else - gtk_widget_set_sensitive (prefs->toolbutton_profile_view, FALSE); -diff --git a/panels/datetime/tz.h b/panels/datetime/tz.h -index a2376f8a4..98769e08f 100644 ---- a/panels/datetime/tz.h -+++ b/panels/datetime/tz.h -@@ -27,11 +27,7 @@ - - G_BEGIN_DECLS - --#ifndef __sun --# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab" --#else --# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab" --#endif -+#define TZ_DATA_FILE "@tzdata@/share/zoneinfo/zone.tab" - - typedef struct _TzDB TzDB; - typedef struct _TzLocation TzLocation; -diff --git a/panels/info-overview/cc-info-overview-panel.c b/panels/info-overview/cc-info-overview-panel.c -index bd0e07762..0e71351f8 100644 ---- a/panels/info-overview/cc-info-overview-panel.c -+++ b/panels/info-overview/cc-info-overview-panel.c -@@ -172,7 +172,7 @@ load_gnome_version (char **version, - gsize length; - g_autoptr(VersionData) data = NULL; - -- if (!g_file_get_contents (DATADIR "/gnome/gnome-version.xml", -+ if (!g_file_get_contents ("@gnome_desktop@/share/gnome/gnome-version.xml", - &contents, - &length, - &error)) -diff --git a/panels/keyboard/cc-input-list-box.c b/panels/keyboard/cc-input-list-box.c -index 6c2cb5614..8f57159cc 100644 ---- a/panels/keyboard/cc-input-list-box.c -+++ b/panels/keyboard/cc-input-list-box.c -@@ -223,10 +223,10 @@ row_layout_cb (CcInputListBox *self, - layout_variant = cc_input_source_get_layout_variant (source); - - if (layout_variant && layout_variant[0]) -- commandline = g_strdup_printf ("gkbd-keyboard-display -l \"%s\t%s\"", -+ commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l \"%s\t%s\"", - layout, layout_variant); - else -- commandline = g_strdup_printf ("gkbd-keyboard-display -l %s", -+ commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l %s", - layout); - - g_spawn_command_line_async (commandline, NULL); -diff --git a/panels/network/connection-editor/net-connection-editor.c b/panels/network/connection-editor/net-connection-editor.c -index 505b8ee25..62e94009f 100644 ---- a/panels/network/connection-editor/net-connection-editor.c -+++ b/panels/network/connection-editor/net-connection-editor.c -@@ -267,9 +267,9 @@ net_connection_editor_do_fallback (NetConnectionEditor *self, const gchar *type) - g_autoptr(GError) error = NULL; - - if (self->is_new_connection) { -- cmdline = g_strdup_printf ("nm-connection-editor --type='%s' --create", type); -+ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --type='%s' --create", type); - } else { -- cmdline = g_strdup_printf ("nm-connection-editor --edit='%s'", -+ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --edit='%s'", - nm_connection_get_uuid (self->connection)); - } - -diff --git a/panels/network/net-device-bluetooth.c b/panels/network/net-device-bluetooth.c -index 74dfb0e9a..5f53d1a20 100644 ---- a/panels/network/net-device-bluetooth.c -+++ b/panels/network/net-device-bluetooth.c -@@ -90,7 +90,7 @@ nm_device_bluetooth_refresh_ui (NetDeviceBluetooth *self) - update_off_switch_from_device_state (self->device_off_switch, state, self); - - /* set up the Options button */ -- path = g_find_program_in_path ("nm-connection-editor"); -+ path = g_find_program_in_path ("@networkmanagerapplet@/bin/nm-connection-editor"); - gtk_widget_set_visible (GTK_WIDGET (self->options_button), state != NM_DEVICE_STATE_UNMANAGED && path != NULL); - } - -@@ -141,7 +141,7 @@ options_button_clicked_cb (NetDeviceBluetooth *self) - - connection = net_device_get_find_connection (self->client, self->device); - uuid = nm_connection_get_uuid (connection); -- cmdline = g_strdup_printf ("nm-connection-editor --edit %s", uuid); -+ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --edit %s", uuid); - g_debug ("Launching '%s'\n", cmdline); - if (!g_spawn_command_line_async (cmdline, &error)) - g_warning ("Failed to launch nm-connection-editor: %s", error->message); -@@ -185,7 +185,7 @@ net_device_bluetooth_init (NetDeviceBluetooth *self) - - gtk_widget_init_template (GTK_WIDGET (self)); - -- path = g_find_program_in_path ("nm-connection-editor"); -+ path = g_find_program_in_path ("@networkmanagerapplet@/bin/nm-connection-editor"); - gtk_widget_set_visible (GTK_WIDGET (self->options_button), path != NULL); - } - -diff --git a/panels/network/net-device-mobile.c b/panels/network/net-device-mobile.c -index 34eb86241..50d0a2bed 100644 ---- a/panels/network/net-device-mobile.c -+++ b/panels/network/net-device-mobile.c -@@ -508,7 +508,7 @@ options_button_clicked_cb (NetDeviceMobile *self) - - connection = net_device_get_find_connection (self->client, self->device); - uuid = nm_connection_get_uuid (connection); -- cmdline = g_strdup_printf ("nm-connection-editor --edit %s", uuid); -+ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --edit %s", uuid); - g_debug ("Launching '%s'\n", cmdline); - if (!g_spawn_command_line_async (cmdline, &error)) - g_warning ("Failed to launch nm-connection-editor: %s", error->message); -@@ -797,7 +797,7 @@ net_device_mobile_init (NetDeviceMobile *self) - - self->cancellable = g_cancellable_new (); - -- path = g_find_program_in_path ("nm-connection-editor"); -+ path = g_find_program_in_path ("@networkmanagerapplet@/bin/nm-connection-editor"); - gtk_widget_set_visible (GTK_WIDGET (self->options_button), path != NULL); - } - -diff --git a/panels/printers/pp-host.c b/panels/printers/pp-host.c -index a31a606e3..ed5133d29 100644 ---- a/panels/printers/pp-host.c -+++ b/panels/printers/pp-host.c -@@ -256,7 +256,7 @@ _pp_host_get_snmp_devices_thread (GTask *task, - devices = g_ptr_array_new_with_free_func (g_object_unref); - - argv = g_new0 (gchar *, 3); -- argv[0] = g_strdup ("/usr/lib/cups/backend/snmp"); -+ argv[0] = g_strdup ("@cups@/lib/cups/backend/snmp"); - argv[1] = g_strdup (priv->hostname); - - /* Use SNMP to get printer's informations */ -diff --git a/panels/user-accounts/run-passwd.c b/panels/user-accounts/run-passwd.c -index 86f53d4fc..0b052856f 100644 ---- a/panels/user-accounts/run-passwd.c -+++ b/panels/user-accounts/run-passwd.c -@@ -150,7 +150,7 @@ spawn_passwd (PasswdHandler *passwd_handler, GError **error) - gchar **envp; - gint my_stdin, my_stdout, my_stderr; - -- argv[0] = "/usr/bin/passwd"; /* Is it safe to rely on a hard-coded path? */ -+ argv[0] = "/run/wrappers/bin/passwd"; /* Is it safe to rely on a hard-coded path? */ - argv[1] = NULL; - - envp = g_get_environ (); -diff --git a/tests/datetime/test-endianess.c b/tests/datetime/test-endianess.c -index 9cb92007a..84d2f0fa3 100644 ---- a/tests/datetime/test-endianess.c -+++ b/tests/datetime/test-endianess.c -@@ -26,7 +26,7 @@ test_endianess (void) - g_autoptr(GDir) dir = NULL; - const char *name; - -- dir = g_dir_open ("/usr/share/i18n/locales/", 0, NULL); -+ dir = g_dir_open ("@glibc@/share/i18n/locales/", 0, NULL); - if (dir == NULL) { - /* Try with /usr/share/locale/ - * https://bugzilla.gnome.org/show_bug.cgi?id=646780 */ diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch b/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch deleted file mode 100644 index 57eb4b3d44a9a..0000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/libgnome-desktop/gnome-desktop-thumbnail-script.c -+++ b/libgnome-desktop/gnome-desktop-thumbnail-script.c -@@ -536,9 +536,9 @@ add_bwrap (GPtrArray *array, - g_return_val_if_fail (script->s_infile != NULL, FALSE); - - add_args (array, -- "bwrap", -- "--ro-bind", "/usr", "/usr", -- "--ro-bind", "/etc/ld.so.cache", "/etc/ld.so.cache", -+ "@bubblewrap_bin@", -+ "--ro-bind", "@storeDir@", "@storeDir@", -+ "--ro-bind", "/run/current-system", "/run/current-system", - NULL); - - /* These directories might be symlinks into /usr/... */ diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix deleted file mode 100644 index 4294e2db24066..0000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ /dev/null @@ -1,96 +0,0 @@ -{ lib -, stdenv -, fetchurl -, substituteAll -, pkg-config -, libxslt -, ninja -, gnome3 -, gtk3 -, glib -, gettext -, libxml2 -, xkeyboard_config -, libxkbcommon -, isocodes -, meson -, wayland -, libseccomp -, systemd -, bubblewrap -, gobject-introspection -, gtk-doc -, docbook-xsl-nons -, gsettings-desktop-schemas -}: - -stdenv.mkDerivation rec { - pname = "gnome-desktop"; - version = "40.1"; - - outputs = [ "out" "dev" "devdoc" ]; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-igeJcwUhnFaZVJriBI9xVVFe+Xx85NZYXd2hXVhZ4c8="; - }; - - patches = [ - (substituteAll { - src = ./bubblewrap-paths.patch; - bubblewrap_bin = "${bubblewrap}/bin/bwrap"; - inherit (builtins) storeDir; - }) - ]; - - nativeBuildInputs = [ - pkg-config - meson - ninja - gettext - libxslt - libxml2 - gobject-introspection - gtk-doc - docbook-xsl-nons - glib - ]; - - buildInputs = [ - bubblewrap - xkeyboard_config - libxkbcommon # for xkbregistry - isocodes - wayland - gtk3 - glib - libseccomp - systemd - ]; - - propagatedBuildInputs = [ - gsettings-desktop-schemas - ]; - - mesonFlags = [ - "-Dgtk_doc=true" - "-Ddesktop_docs=false" - ]; - - separateDebugInfo = stdenv.isLinux; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "gnome-desktop"; - attrPath = "gnome3.gnome-desktop"; - }; - }; - - meta = with lib; { - description = "Library with common API for various GNOME modules"; - homepage = "https://gitlab.gnome.org/GNOME/gnome-desktop"; - license = with licenses; [ gpl2Plus lgpl2Plus ]; - platforms = platforms.linux; - maintainers = teams.gnome.members; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix deleted file mode 100644 index 8ff4145a271a2..0000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, desktop-file-utils, appstream-glib, libxslt -, libxml2, gettext, itstool, wrapGAppsHook, docbook_xsl, docbook_xml_dtd_43 -, gnome3, gtk3, glib, gsettings-desktop-schemas }: - -stdenv.mkDerivation rec { - pname = "gnome-dictionary"; - version = "40.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-dictionary/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "1d8dhcfys788vv27v34i3s3x3jdvdi2kqn2a5p8c937a9hm0qr9f"; - }; - - doCheck = true; - - nativeBuildInputs = [ - meson ninja pkg-config wrapGAppsHook libxml2 gettext itstool - desktop-file-utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43 - ]; - buildInputs = [ gtk3 glib gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "gnome-dictionary"; - attrPath = "gnome3.gnome-dictionary"; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Dictionary"; - description = "Dictionary is the GNOME application to look up definitions"; - maintainers = teams.gnome.members; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix deleted file mode 100644 index 87b89c3a05ba1..0000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ lib -, stdenv -, gettext -, fetchurl -, pkg-config -, udisks2 -, libhandy -, libsecret -, libdvdread -, meson -, ninja -, gtk3 -, glib -, wrapGAppsHook -, python3 -, libnotify -, itstool -, gnome3 -, libxml2 -, gsettings-desktop-schemas -, libcanberra-gtk3 -, libxslt -, docbook-xsl-nons -, libpwquality -, systemd -}: - -stdenv.mkDerivation rec { - pname = "gnome-disk-utility"; - version = "40.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-KkuZrBHKIzlLKMVYS56WKE6MWk2mXPBiB95U9Csf8UE="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gettext - itstool - libxslt - docbook-xsl-nons - wrapGAppsHook - python3 - libxml2 - ]; - - buildInputs = [ - gtk3 - glib - libhandy - libsecret - libpwquality - libnotify - libdvdread - libcanberra-gtk3 - udisks2 - gnome3.adwaita-icon-theme - systemd - gnome3.gnome-settings-daemon - gsettings-desktop-schemas - ]; - - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "gnome-disk-utility"; - attrPath = "gnome3.gnome-disk-utility"; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Disks"; - description = "A udisks graphical front-end"; - maintainers = teams.gnome.members; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix deleted file mode 100644 index 6e9b6d22f57cb..0000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, meson, ninja, gettext, fetchurl -, pkg-config, gtk3, glib, libxml2, gnome-desktop, adwaita-icon-theme, libhandy -, wrapGAppsHook, gnome3, harfbuzz }: - -stdenv.mkDerivation rec { - pname = "gnome-font-viewer"; - version = "40.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0hpyi0sz3gcqqs9lkwyk8b6hr39m3n27432x98kxr436jj37dk6j"; - }; - - doCheck = true; - - nativeBuildInputs = [ meson ninja pkg-config gettext wrapGAppsHook libxml2 ]; - buildInputs = [ gtk3 glib gnome-desktop adwaita-icon-theme harfbuzz libhandy ]; - - # Do not run meson-postinstall.sh - preConfigure = "sed -i '2,$ d' meson-postinstall.sh"; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "gnome-font-viewer"; - attrPath = "gnome3.gnome-font-viewer"; - }; - }; - - meta = with lib; { - description = "Program that can preview fonts and create thumbnails for fonts"; - maintainers = teams.gnome.members; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/0001-fix-paths.patch b/pkgs/desktops/gnome-3/core/gnome-initial-setup/0001-fix-paths.patch deleted file mode 100644 index 2323759522535..0000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-initial-setup/0001-fix-paths.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 1ae0eca39ba6af27f37e2fe81395b91a2761a408 Mon Sep 17 00:00:00 2001 -Message-Id: <1ae0eca39ba6af27f37e2fe81395b91a2761a408.1600627676.git-series.worldofpeace@protonmail.ch> -From: WORLDofPEACE -Date: Sun, 20 Sep 2020 14:46:59 -0400 -Subject: [PATCH] fix paths - ---- - gnome-initial-setup/pages/keyboard/cc-input-chooser.c | 6 +++--- - gnome-initial-setup/pages/timezone/tz.h | 4 ++-- - 3 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/gnome-initial-setup/pages/keyboard/cc-input-chooser.c b/gnome-initial-setup/pages/keyboard/cc-input-chooser.c -index 196abf6..613d0e5 100644 ---- a/gnome-initial-setup/pages/keyboard/cc-input-chooser.c -+++ b/gnome-initial-setup/pages/keyboard/cc-input-chooser.c -@@ -177,9 +177,9 @@ preview_cb (GtkLabel *label, - return TRUE; - - if (variant[0]) -- commandline = g_strdup_printf ("gkbd-keyboard-display -l \"%s\t%s\"", layout, variant); -+ commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l \"%s\t%s\"", layout, variant); - else -- commandline = g_strdup_printf ("gkbd-keyboard-display -l %s", layout); -+ commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l %s", layout); - g_spawn_command_line_async (commandline, NULL); - g_free (commandline); - -@@ -831,7 +831,7 @@ cc_input_chooser_class_init (CcInputChooserClass *klass) - g_param_spec_string ("showing-extra", "", "", "", - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); - -- signals[CHANGED] = -+ signals[CHANGED] = - g_signal_new ("changed", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_FIRST, -diff --git a/gnome-initial-setup/pages/timezone/tz.h b/gnome-initial-setup/pages/timezone/tz.h -index a2376f8..5cb7bc9 100644 ---- a/gnome-initial-setup/pages/timezone/tz.h -+++ b/gnome-initial-setup/pages/timezone/tz.h -@@ -4,7 +4,7 @@ - * Copyright (C) 2000-2001 Ximian, Inc. - * - * Authors: Hans Petter Jansson -- * -+ * - * Largely based on Michael Fulbright's work on Anaconda. - * - * This program is free software; you can redistribute it and/or modify -@@ -28,7 +28,7 @@ - G_BEGIN_DECLS - - #ifndef __sun --# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab" -+# define TZ_DATA_FILE "@tzdata@/share/zoneinfo/zone.tab" - #else - # define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab" - #endif - -base-commit: 5132e206a6bf81964450561d68473ac015760455 --- -git-series 0.9.1 diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix deleted file mode 100644 index 6cf549dc5cab5..0000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix +++ /dev/null @@ -1,106 +0,0 @@ -{ lib, stdenv -, fetchurl -, substituteAll -, gettext -, meson -, ninja -, pkg-config -, wrapGAppsHook -, gnome3 -, accountsservice -, fontconfig -, gdm -, geoclue2 -, geocode-glib -, glib -, gnome-desktop -, gnome-online-accounts -, gtk3 -, libgweather -, json-glib -, krb5 -, libpwquality -, librest -, libsecret -, networkmanager -, pango -, polkit -, webkitgtk -, systemd -, libnma -, tzdata -, libgnomekbd -, gsettings-desktop-schemas -}: - -stdenv.mkDerivation rec { - pname = "gnome-initial-setup"; - version = "40.1"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "10zf87n6c947k9rkk2rqc9cbfwcvq23axq3rf7x1an7npv3414gi"; - }; - - patches = [ - (substituteAll { - src = ./0001-fix-paths.patch; - inherit tzdata libgnomekbd; - }) - ]; - - nativeBuildInputs = [ - gettext - meson - ninja - pkg-config - systemd - wrapGAppsHook - ]; - - buildInputs = [ - accountsservice - fontconfig - gdm - geoclue2 - geocode-glib - glib - gnome-desktop - gnome-online-accounts - gsettings-desktop-schemas - gtk3 - json-glib - krb5 - libgweather - libnma - libpwquality - librest - libsecret - networkmanager - pango - polkit - webkitgtk - ]; - - mesonFlags = [ - "-Dcheese=disabled" - "-Dibus=disabled" - "-Dparental_controls=disabled" - "-Dvendor-conf-file=${./vendor.conf}" - ]; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - meta = with lib; { - description = "Simple, easy, and safe way to prepare a new system"; - homepage = "https://gitlab.gnome.org/GNOME/gnome-initial-setup"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = teams.gnome.members; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/vendor.conf b/pkgs/desktops/gnome-3/core/gnome-initial-setup/vendor.conf deleted file mode 100644 index a06b37e100edc..0000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-initial-setup/vendor.conf +++ /dev/null @@ -1,5 +0,0 @@ -# Disable pages not right for NixOS -# For example user accounts should be preconfigured -# and we can't modify system time with systemd. -[pages] -skip=account;software;password;timezone; diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix deleted file mode 100644 index 833f58f74a45e..0000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ /dev/null @@ -1,102 +0,0 @@ -{ lib -, stdenv -, fetchurl -, pkg-config -, dbus -, libgcrypt -, pam -, python2 -, glib -, libxslt -, gettext -, gcr -, libcap_ng -, libselinux -, p11-kit -, openssh -, wrapGAppsHook -, docbook-xsl-nons -, docbook_xml_dtd_43 -, gnome3 -}: - -stdenv.mkDerivation rec { - pname = "gnome-keyring"; - version = "40.0"; - - outputs = [ "out" "dev" ]; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-keyring/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0cdrlcw814zayhvlaxqs1sm9bqlfijlp22dzzd0g5zg2isq4vlm3"; - }; - - nativeBuildInputs = [ - pkg-config - gettext - libxslt - docbook-xsl-nons - docbook_xml_dtd_43 - wrapGAppsHook - ]; - - buildInputs = [ - glib - libgcrypt - pam - openssh - libcap_ng - libselinux - gcr - p11-kit - ]; - - # In 3.20.1, tests do not support Python 3 - checkInputs = [ dbus python2 ]; - - configureFlags = [ - "--with-pkcs11-config=${placeholder "out"}/etc/pkcs11/" # installation directories - "--with-pkcs11-modules=${placeholder "out"}/lib/pkcs11/" - ]; - - # Tends to fail non-deterministically. - # - https://github.com/NixOS/nixpkgs/issues/55293 - # - https://github.com/NixOS/nixpkgs/issues/51121 - doCheck = false; - - postPatch = '' - patchShebangs build - ''; - - checkPhase = '' - export HOME=$(mktemp -d) - dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ - make check - ''; - - # Use wrapped gnome-keyring-daemon with cap_ipc_lock=ep - postFixup = '' - files=($out/etc/xdg/autostart/* $out/share/dbus-1/services/*) - - for file in ''${files[*]}; do - substituteInPlace $file \ - --replace "$out/bin/gnome-keyring-daemon" "/run/wrappers/bin/gnome-keyring-daemon" - done - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "gnome-keyring"; - attrPath = "gnome3.gnome-keyring"; - }; - }; - - meta = with lib; { - description = "Collection of components in GNOME that store secrets, passwords, keys, certificates and make them available to applications"; - homepage = "https://wiki.gnome.org/Projects/GnomeKeyring"; - license = licenses.gpl2; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix deleted file mode 100644 index 3cc85053bcef9..0000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix +++ /dev/null @@ -1,116 +0,0 @@ -{ lib, stdenv -, fetchurl -, fetchpatch -, autoconf-archive -, autoreconfHook -, pkg-config -, glib -, gnome3 -, libxml2 -, libgdata -, grilo -, libzapojit -, grilo-plugins -, gnome-online-accounts -, libmediaart -, tracker -, gfbgraph -, librest -, libsoup -, json-glib -, gmp -, openssl -, dleyna-server -, wrapGAppsHook -}: - -stdenv.mkDerivation rec { - pname = "gnome-online-miners"; - version = "3.34.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-online-miners/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1n2jz9i8a42zwxx5h8j2gdy6q1vyydh4vl00r0al7w8jzdh24p44"; - }; - - patches = [ - # Fix use after free - # https://gitlab.gnome.org/GNOME/gnome-online-miners/merge_requests/4 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-online-miners/commit/9eb57c6a8cd1a925c508646edae936eee0a8e46b.patch"; - sha256 = "O1GRnzs33I0mFzrNDFkTGiBKstq5krYg7fwj60367TA="; - }) - - # Port to Tracker 3 - # https://gitlab.gnome.org/GNOME/gnome-online-miners/merge_requests/3 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-online-miners/commit/2d3798252807cad9eb061ed2b37e35170c1a1daf.patch"; - sha256 = "hwrkxroMpTfOwJAPkYQFdDCroZ2qSsvOgDetrJDig20="; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-online-miners/commit/1548c0c527f0e4389047448d7d3b6cff55278c8e.patch"; - sha256 = "U9w81c9Kze7kv5KHeGqvDeSNHzSayVrUG0XYsYMa1sg="; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-online-miners/commit/941ebd8890c9ac4f75a1f58ccbea9731f46ad912.patch"; - sha256 = "JHtDlZ54/BlSiUA3ROHfCTtTKSin3g6JNm8NS6pYML8="; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-online-miners/commit/d1681a64bc3f65894af2549e3ba2bffbaf6f539a.patch"; - sha256 = "9ZEatz5I81UAnjS1qCGWYDQQOxg/qp9Tg3xG/a+3goc="; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-online-miners/commit/3d2af8785c84d6e50d8a8e6a2569a4b709184e94.patch"; - sha256 = "7bdUE2k6g3Z8sdGYEb6pUm1/wbKDe4BHbylXUzfuTG0="; - }) - ]; - - nativeBuildInputs = [ - # patch changes configure.ac - autoconf-archive - autoreconfHook - - pkg-config - wrapGAppsHook - ]; - - buildInputs = [ - glib - libgdata - libxml2 - libsoup - gmp - openssl - grilo - libzapojit - grilo-plugins - gnome-online-accounts - libmediaart - tracker - gfbgraph - json-glib - librest - dleyna-server - ]; - - NIX_CFLAGS_COMPILE = [ - "-Wno-error=format-security" # https://gitlab.gnome.org/GNOME/gnome-online-miners/merge_requests/3/diffs#note_942747 - ]; - - enableParallelBuilding = true; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "gnome-online-miners"; - attrPath = "gnome3.gnome-online-miners"; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Projects/GnomeOnlineMiners"; - description = "A set of crawlers that go through your online content and index them locally in Tracker"; - maintainers = teams.gnome.members; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix deleted file mode 100644 index 8411b2edecb49..0000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib, stdenv -, fetchurl -, cairo -, meson -, ninja -, pkg-config -, python3 -, wrapGAppsHook -, glib -, pipewire -, systemd -, libvncserver -, libsecret -, libnotify -, gdk-pixbuf -, freerdp -}: - -stdenv.mkDerivation rec { - pname = "gnome-remote-desktop"; - version = "0.1.9"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-8iZtp4tBRT7NNRKuzwop3rcMvq16RG/I2sAlEIsJ0M8="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - python3 - wrapGAppsHook - ]; - - buildInputs = [ - cairo - freerdp - gdk-pixbuf # For libnotify - glib - libnotify - libsecret - libvncserver - pipewire - systemd - ]; - - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - ''; - - mesonFlags = [ - "-Dsystemd_user_unit_dir=${placeholder "out"}/lib/systemd/user" - ]; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Projects/Mutter/RemoteDesktop"; - description = "GNOME Remote Desktop server"; - maintainers = teams.gnome.members; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix deleted file mode 100644 index 35e7b1a0b0233..0000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, stdenv, gettext, libxml2, libhandy, fetchurl, pkg-config, libcanberra-gtk3 -, gtk3, glib, meson, ninja, python3, wrapGAppsHook, appstream-glib, desktop-file-utils -, gnome3, gsettings-desktop-schemas }: - -let - pname = "gnome-screenshot"; - version = "40.0"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${name}.tar.xz"; - sha256 = "1qm544ymwibk31s30k47vnn79xg30m18r7l4di0c57g375dak31n"; - }; - - doCheck = true; - - postPatch = '' - chmod +x build-aux/postinstall.py # patchShebangs requires executable file - patchShebangs build-aux/postinstall.py - ''; - - nativeBuildInputs = [ meson ninja pkg-config gettext appstream-glib libxml2 desktop-file-utils python3 wrapGAppsHook ]; - buildInputs = [ - gtk3 glib libcanberra-gtk3 libhandy gnome3.adwaita-icon-theme - gsettings-desktop-schemas - ]; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - meta = with lib; { - homepage = "https://en.wikipedia.org/wiki/GNOME_Screenshot"; - description = "Utility used in the GNOME desktop environment for taking screenshots"; - maintainers = teams.gnome.members; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-session/ctl.nix b/pkgs/desktops/gnome-3/core/gnome-session/ctl.nix deleted file mode 100644 index 6a274e35bf568..0000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-session/ctl.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, meson -, ninja -, pkg-config -, glib -, systemd -, wrapGAppsHook -}: - -stdenv.mkDerivation rec { - pname = "gnome-session-ctl"; - version = "40.0"; - - src = fetchFromGitHub { - owner = "nix-community"; - repo = pname; - rev = version; - hash = "sha256-gvBmLx8Qoj1vPsOwaZsd9+pTDvU5D7uUts7ZT1pXwNo="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - wrapGAppsHook - ]; - - buildInputs = [ - glib - systemd - ]; - - meta = with lib; { - description = "gnome-session-ctl extracted from gnome-session for nixpkgs"; - homepage = "https://github.com/nix-community/gnome-session-ctl"; - license = licenses.gpl2Plus; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix deleted file mode 100644 index 49363568eab08..0000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix +++ /dev/null @@ -1,90 +0,0 @@ -{ fetchurl, lib, stdenv, substituteAll, meson, ninja, pkg-config, gnome3, glib, gtk3, gsettings-desktop-schemas -, gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412, python3 -, libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash, gnome-session-ctl }: - -stdenv.mkDerivation rec { - pname = "gnome-session"; - version = "40.1.1"; - - outputs = ["out" "sessions"]; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-session/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "10nzyhmgkrzk6i70kj7690na0hmsv6qy5bmr10akxq9jxqlphy4w"; - }; - - patches = [ - (substituteAll { - src = ./fix-paths.patch; - gsettings = "${glib.bin}/bin/gsettings"; - dbusLaunch = "${dbus.lib}/bin/dbus-launch"; - grep = "${gnugrep}/bin/grep"; - bash = "${bash}/bin/bash"; - }) - ]; - - mesonFlags = [ "-Dsystemd=true" "-Dsystemd_session=default" ]; - - nativeBuildInputs = [ - meson ninja pkg-config gettext makeWrapper - xmlto libxslt docbook_xsl docbook_xml_dtd_412 python3 - dbus # for DTD - ]; - - buildInputs = [ - glib gtk3 libICE gnome-desktop json-glib xorg.xtrans gnome3.adwaita-icon-theme - gnome3.gnome-settings-daemon gsettings-desktop-schemas systemd epoxy - ]; - - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - - # Use our provided `gnome-session-ctl` - original="@libexecdir@/gnome-session-ctl" - replacement="${gnome-session-ctl}/libexec/gnome-session-ctl" - - find data/ -type f -name "*.service.in" -exec sed -i \ - -e s,$original,$replacement,g \ - {} + - ''; - - # `bin/gnome-session` will reset the environment when run in wayland, we - # therefor wrap `libexec/gnome-session-binary` instead which is the actual - # binary needing wrapping - preFixup = '' - wrapProgram "$out/libexec/gnome-session-binary" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_DATA_DIRS : "${gnome3.gnome-shell}/share"\ - --suffix XDG_CONFIG_DIRS : "${gnome3.gnome-settings-daemon}/etc/xdg" - ''; - - # We move the GNOME sessions to another output since gnome-session is a dependency of - # GDM itself. If we do not hide them, it will show broken GNOME sessions when GDM is - # enabled without proper GNOME installation. - postInstall = '' - mkdir $sessions - moveToOutput share/wayland-sessions "$sessions" - moveToOutput share/xsessions "$sessions" - - # Our provided one is being used - rm -rf $out/libexec/gnome-session-ctl - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "gnome-session"; - attrPath = "gnome3.gnome-session"; - }; - providedSessions = [ "gnome" "gnome-xorg" ]; - }; - - meta = with lib; { - description = "GNOME session manager"; - homepage = "https://wiki.gnome.org/Projects/SessionManagement"; - license = licenses.gpl2Plus; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch b/pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch deleted file mode 100644 index 320b3024deee2..0000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/gnome-session/gnome-session.in b/gnome-session/gnome-session.in -index ddd1a591..46a3488b 100755 ---- a/gnome-session/gnome-session.in -+++ b/gnome-session/gnome-session.in -@@ -3,17 +3,19 @@ - if [ "x$XDG_SESSION_TYPE" = "xwayland" ] && - [ "x$XDG_SESSION_CLASS" != "xgreeter" ] && - [ -n "$SHELL" ] && -- grep -q "$SHELL" /etc/shells && -- ! (echo "$SHELL" | grep -q "false") && -- ! (echo "$SHELL" | grep -q "nologin"); then -+ @grep@ -q "$SHELL" /etc/shells && -+ ! (echo "$SHELL" | @grep@ -q "false") && -+ ! (echo "$SHELL" | @grep@ -q "nologin"); then - if [ "$1" != '-l' ]; then -- exec bash -c "exec -l '$SHELL' -c '$0 -l $*'" -+ # Make sure the shell actually sets up the environment. -+ unset __NIXOS_SET_ENVIRONMENT_DONE -+ exec @bash@ -c "exec -l '$SHELL' -c '$0 -l $*'" - else - shift - fi - fi - --SETTING=$(G_MESSAGES_DEBUG='' gsettings get org.gnome.system.locale region) -+SETTING=$(G_MESSAGES_DEBUG='' @gsettings@ get org.gnome.system.locale region) - REGION=${SETTING#\'} - REGION=${REGION%\'} - -diff --git a/gnome-session/main.c b/gnome-session/main.c -index 84edfbe5..e5285489 100644 ---- a/gnome-session/main.c -+++ b/gnome-session/main.c -@@ -215,7 +215,7 @@ require_dbus_session (int argc, - } - new_argv[i + 2] = NULL; - -- if (!execvp ("dbus-launch", new_argv)) { -+ if (!execvp ("@dbusLaunch@", new_argv)) { - g_set_error (error, - G_SPAWN_ERROR, - G_SPAWN_ERROR_FAILED, diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix deleted file mode 100644 index d7e549e289393..0000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix +++ /dev/null @@ -1,133 +0,0 @@ -{ lib, stdenv -, fetchpatch -, substituteAll -, fetchurl -, meson -, ninja -, pkg-config -, gnome3 -, perl -, gettext -, gtk3 -, glib -, libnotify -, libgnomekbd -, lcms2 -, libpulseaudio -, alsaLib -, libcanberra-gtk3 -, upower -, colord -, libgweather -, polkit -, gsettings-desktop-schemas -, geoclue2 -, systemd -, libgudev -, libwacom -, libxslt -, libxml2 -, modemmanager -, networkmanager -, gnome-desktop -, geocode-glib -, docbook_xsl -, wrapGAppsHook -, python3 -, tzdata -, nss -, gcr -, gnome-session-ctl -}: - -stdenv.mkDerivation rec { - pname = "gnome-settings-daemon"; - version = "40.0.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "08bv32hvsmd8izw0llvldg0c2d71srch4hi8j94jwgm5d4dsrprp"; - }; - - patches = [ - # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/202 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/commit/aae1e774dd9de22fe3520cf9eb2bfbf7216f5eb0.patch"; - sha256 = "O4m0rOW8Zrgu3Q0p0OA8b951VC0FjYbOUk9MLzB9icI="; - }) - - (substituteAll { - src = ./fix-paths.patch; - inherit tzdata; - }) - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - perl - gettext - libxml2 - libxslt - docbook_xsl - wrapGAppsHook - python3 - ]; - - buildInputs = [ - gtk3 - glib - gsettings-desktop-schemas - modemmanager - networkmanager - libnotify - libgnomekbd # for org.gnome.libgnomekbd.keyboard schema - gnome-desktop - lcms2 - libpulseaudio - alsaLib - libcanberra-gtk3 - upower - colord - libgweather - nss - polkit - geocode-glib - geoclue2 - systemd - libgudev - libwacom - gcr - ]; - - mesonFlags = [ - "-Dudev_dir=${placeholder "out"}/lib/udev" - "-Dgnome_session_ctl_path=${gnome-session-ctl}/libexec/gnome-session-ctl" - ]; - - # Default for release buildtype but passed manually because - # we're using plain - NIX_CFLAGS_COMPILE = "-DG_DISABLE_CAST_CHECKS"; - - - postPatch = '' - for f in gnome-settings-daemon/codegen.py plugins/power/gsd-power-constants-update.pl meson_post_install.py; do - chmod +x $f - patchShebangs $f - done - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - meta = with lib; { - license = licenses.gpl2Plus; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/fix-paths.patch b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/fix-paths.patch deleted file mode 100644 index 2229302cab7c0..0000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/fix-paths.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/plugins/datetime/tz.h -+++ b/plugins/datetime/tz.h -@@ -27,11 +27,7 @@ - - #include - --#ifndef __sun --# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab" --#else --# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab" --#endif -+#define TZ_DATA_FILE "@tzdata@/share/zoneinfo/zone.tab" - - typedef struct _TzDB TzDB; - typedef struct _TzLocation TzLocation; diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/global-backlight-helper.patch b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/global-backlight-helper.patch deleted file mode 100644 index 8f3951af2da85..0000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/global-backlight-helper.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/plugins/power/gsd-backlight.c b/plugins/power/gsd-backlight.c -index d7d10fd2..5619d6ad 100644 ---- a/plugins/power/gsd-backlight.c -+++ b/plugins/power/gsd-backlight.c -@@ -358,7 +358,7 @@ gsd_backlight_run_set_helper (GsdBacklight *backlight, GTask *task) - proc = g_subprocess_new (G_SUBPROCESS_FLAGS_STDOUT_SILENCE, - &error, - "pkexec", -- LIBEXECDIR "/gsd-backlight-helper", -+ "/run/current-system/sw/bin/gnome-settings-daemon/gsd-backlight-helper", - g_udev_device_get_sysfs_path (backlight->udev_device), - data->value_str, NULL); - } else { -diff --git a/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in b/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in -index f16300f8..79d6bd17 100644 ---- a/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in -+++ b/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in -@@ -25,7 +25,7 @@ - no - yes - -- @libexecdir@/gsd-backlight-helper -+ /run/current-system/sw/bin/gnome-settings-daemon/gsd-backlight-helper - - - diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix deleted file mode 100644 index 035633d676adf..0000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, meson, ninja, gettext, pkg-config, spidermonkey_68, glib -, gnome3, gnome-menus, substituteAll }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extensions"; - version = "40.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "15hak4prx2nx1svfii39clxy1lll8crdf7p91if85jcsh6r8ab8p"; - }; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - patches = [ - (substituteAll { - src = ./fix_gmenu.patch; - gmenu_path = "${gnome-menus}/lib/girepository-1.0"; - }) - - # Do not show welcome dialog in gnome-classic. - # Needed for gnome-shell 40.1. - # https://gitlab.gnome.org/GNOME/gnome-shell-extensions/merge_requests/169 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-shell-extensions/commit/3e8bbb07ea7109c44d5ac7998f473779e742d041.patch"; - sha256 = "jSmPwSBgRBfPPP9mGVjw1mSWumIXQqtA6tSqHr3U+3w="; - }) - ]; - - doCheck = true; - # 60 is required for tests - # https://gitlab.gnome.org/GNOME/gnome-shell-extensions/blob/3.34.0/meson.build#L23 - checkInputs = [ spidermonkey_68 ]; - - nativeBuildInputs = [ meson ninja pkg-config gettext glib ]; - - mesonFlags = [ "-Dextension_set=all" ]; - - preFixup = '' - # The meson build doesn't compile the schemas. - # Fixup adapted from export-zips.sh in the source. - - extensiondir=$out/share/gnome-shell/extensions - schemadir=${glib.makeSchemaPath "$out" "${pname}-${version}"} - - glib-compile-schemas $schemadir - - for f in $extensiondir/*; do - name=`basename ''${f%%@*}` - uuid=$name@gnome-shell-extensions.gcampax.github.com - schema=$schemadir/org.gnome.shell.extensions.$name.gschema.xml - - if [ -f $schema ]; then - mkdir $f/schemas - ln -s $schema $f/schemas; - glib-compile-schemas $f/schemas - fi - done - ''; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Projects/GnomeShell/Extensions"; - description = "Modify and extend GNOME Shell functionality and behavior"; - maintainers = teams.gnome.members; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/fix_gmenu.patch b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/fix_gmenu.patch deleted file mode 100644 index 555664e8ae25f..0000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/fix_gmenu.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/extensions/apps-menu/extension.js -+++ b/extensions/apps-menu/extension.js -@@ -1,6 +1,8 @@ - /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */ - /* exported init enable disable */ - -+imports.gi.GIRepository.Repository.prepend_search_path('@gmenu_path@'); -+ - const { - Atk, Clutter, Gio, GLib, GMenu, GObject, Gtk, Meta, Shell, St - } = imports.gi; diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix deleted file mode 100644 index 078582f439f8b..0000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ /dev/null @@ -1,225 +0,0 @@ -{ fetchurl -, fetchpatch -, fetchgit -, substituteAll -, lib, stdenv -, meson -, ninja -, pkg-config -, gnome3 -, json-glib -, gettext -, libsecret -, python3 -, polkit -, networkmanager -, gtk-doc -, docbook-xsl-nons -, at-spi2-core -, libstartup_notification -, unzip -, shared-mime-info -, libgweather -, librsvg -, geoclue2 -, perl -, docbook_xml_dtd_45 -, desktop-file-utils -, libpulseaudio -, libical -, gobject-introspection -, wrapGAppsHook -, libxslt -, gcr -, accountsservice -, gdk-pixbuf -, gdm -, upower -, ibus -, libnma -, libgnomekbd -, gnome-desktop -, gsettings-desktop-schemas -, gnome-keyring -, glib -, gjs -, mutter -, evolution-data-server -, gtk3 -, gtk4 -, sassc -, systemd -, pipewire -, gst_all_1 -, adwaita-icon-theme -, gnome-bluetooth -, gnome-clocks -, gnome-settings-daemon -, gnome-autoar -, asciidoc-full -, bash-completion -, mesa -}: - -# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup -let - pythonEnv = python3.withPackages (ps: with ps; [ pygobject3 ]); -in -stdenv.mkDerivation rec { - pname = "gnome-shell"; - version = "40.0-unstable-2021-05-01"; - - outputs = [ "out" "devdoc" ]; - - src = fetchgit { - url = "https://gitlab.gnome.org/GNOME/gnome-shell.git"; - rev = "a8a79c03330427808e776c344f7ebc42782a1b5a"; - sha256 = "ivHV0SRpnBqsdC7fu1Xhtd/BA55O0UdbUyDLy5KHNYs="; - fetchSubmodules = true; - }; - # src = fetchurl { - # url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz"; - # sha256 = "sha256-vOcfQC36qcXiab9lv0iiI0PYlubPmiw0ZpOS1/v2hHg="; - # }; - - patches = [ - # Hardcode paths to various dependencies so that they can be found at runtime. - (substituteAll { - src = ./fix-paths.patch; - inherit libgnomekbd unzip; - gsettings = "${glib.bin}/bin/gsettings"; - }) - - # Use absolute path for libshew installation to make our patched gobject-introspection - # aware of the location to hardcode in the generated GIR file. - ./shew-gir-path.patch - - # Make D-Bus services wrappable. - ./wrap-services.patch - - # Fix greeter logo being too big. - # https://gitlab.gnome.org/GNOME/gnome-shell/issues/2591 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-shell/commit/ffb8bd5fa7704ce70ce7d053e03549dd15dce5ae.patch"; - revert = true; - sha256 = "14h7ahlxgly0n3sskzq9dhxzbyb04fn80pv74vz1526396676dzl"; - }) - - # Work around failing fingerprint auth - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/gnome-shell/raw/9a647c460b651aaec0b8a21f046cc289c1999416/f/0001-gdm-Work-around-failing-fingerprint-auth.patch"; - sha256 = "pFvZli3TilUt6YwdZztpB8Xq7O60XfuWUuPMMVSpqLw="; - }) - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gettext - docbook-xsl-nons - docbook_xml_dtd_45 - gtk-doc - perl - wrapGAppsHook - sassc - desktop-file-utils - libxslt.bin - python3 - asciidoc-full - ]; - - buildInputs = [ - systemd - gsettings-desktop-schemas - gnome-keyring - glib - gcr - accountsservice - libsecret - polkit - gdk-pixbuf - librsvg - networkmanager - libstartup_notification - gjs - mutter - libpulseaudio - evolution-data-server - libical - gtk3 - gtk4 - gdm - geoclue2 - adwaita-icon-theme - gnome-bluetooth - gnome-clocks # schemas needed - at-spi2-core - upower - ibus - gnome-desktop - gnome-settings-daemon - gobject-introspection - mesa - - # recording - pipewire - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - - # not declared at build time, but typelib is needed at runtime - libgweather - libnma - - # for gnome-extension tool - bash-completion - gnome-autoar - json-glib - ]; - - mesonFlags = [ - "-Dgtk_doc=true" - ]; - - postPatch = '' - patchShebangs src/data-to-c.pl - chmod +x meson/postinstall.py - patchShebangs meson/postinstall.py - - substituteInPlace src/gnome-shell-extension-tool.in --replace "@PYTHON@" "${pythonEnv}/bin/python" - substituteInPlace src/gnome-shell-perf-tool.in --replace "@PYTHON@" "${pythonEnv}/bin/python" - ''; - - preFixup = '' - gappsWrapperArgs+=( - # Until glib’s xdgmime is patched - # Fixes “Failed to load resource:///org/gnome/shell/theme/noise-texture.png: Unrecognized image file format” - --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" - ) - ''; - - postFixup = '' - # The services need typelibs. - for svc in org.gnome.ScreenSaver org.gnome.Shell.Extensions org.gnome.Shell.Notifications org.gnome.Shell.Screencast; do - wrapGApp $out/share/gnome-shell/$svc - done - ''; - - passthru = { - mozillaPlugin = "/lib/mozilla/plugins"; - updateScript = gnome3.updateScript { - packageName = "gnome-shell"; - attrPath = "gnome3.gnome-shell"; - }; - }; - - meta = with lib; { - description = "Core user interface for the GNOME 3 desktop"; - homepage = "https://wiki.gnome.org/Projects/GnomeShell"; - license = licenses.gpl2Plus; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; - -} diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch b/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch deleted file mode 100644 index e17a608a2d85e..0000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/js/ui/extensionDownloader.js -+++ b/js/ui/extensionDownloader.js -@@ -86,7 +86,7 @@ - stream.output_stream.write_bytes(contents, null); - stream.close(null); - let [success, pid] = GLib.spawn_async(null, -- ['unzip', '-uod', dir.get_path(), '--', file.get_path()], -+ ['@unzip@/bin/unzip', '-uod', dir.get_path(), '--', file.get_path()], - null, - GLib.SpawnFlags.SEARCH_PATH | GLib.SpawnFlags.DO_NOT_REAP_CHILD, - null); ---- a/js/ui/status/keyboard.js -+++ b/js/ui/status/keyboard.js -@@ -1062,6 +1062,6 @@ class InputSourceIndicator extends PanelMenu.Button { - if (xkbVariant.length > 0) - description = `${description}\t${xkbVariant}`; - -- Util.spawn(['gkbd-keyboard-display', '-l', description]); -+ Util.spawn(['@libgnomekbd@/bin/gkbd-keyboard-display', '-l', description]); - } - }); ---- a/data/org.gnome.Shell-disable-extensions.service -+++ b/data/org.gnome.Shell-disable-extensions.service -@@ -10,5 +10,5 @@ Requisite=gnome-session-stable.timer - [Service] - Type=simple - # Disable extensions --ExecStart=gsettings set org.gnome.shell disable-user-extensions true -+ExecStart=@gsettings@ set org.gnome.shell disable-user-extensions true - Restart=no diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/shew-gir-path.patch b/pkgs/desktops/gnome-3/core/gnome-shell/shew-gir-path.patch deleted file mode 100644 index 6d888725b5d2e..0000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-shell/shew-gir-path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/subprojects/shew/src/meson.build -+++ b/subprojects/shew/src/meson.build -@@ -13,7 +13,7 @@ shew_sources = [ - libshew = library(full_name, - sources: shew_sources, - dependencies: [gtk_dep, x11_dep], -- install_dir: pkglibdir, -+ install_dir: get_option('prefix') / pkglibdir, - install: true, - ) - diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/wrap-services.patch b/pkgs/desktops/gnome-3/core/gnome-shell/wrap-services.patch deleted file mode 100644 index bc494caea9dd0..0000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-shell/wrap-services.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git a/js/dbusServices/dbus-service.in b/js/dbusServices/dbus-service.in -old mode 100644 -new mode 100755 -index 524166102..100b81a63 ---- a/js/dbusServices/dbus-service.in -+++ b/js/dbusServices/dbus-service.in -@@ -1,3 +1,9 @@ -+#!@gjs@ -+ -+// gjs determines the package name from argv[0], which is .*-wrapped -+// so we need to override it to the original one. -+imports.package._findEffectiveEntryPointName = () => '@service@' -+ - imports.package.start({ - name: '@PACKAGE_NAME@', - prefix: '@prefix@', -diff --git a/js/dbusServices/dbus-service.service.in b/js/dbusServices/dbus-service.service.in -index 3b0d09abe..4fd4bb66d 100644 ---- a/js/dbusServices/dbus-service.service.in -+++ b/js/dbusServices/dbus-service.service.in -@@ -1,3 +1,3 @@ - [D-BUS Service] - Name=@service@ --Exec=@gjs@ @pkgdatadir@/@service@ -+Exec=@pkgdatadir@/@service@ -diff --git a/js/dbusServices/meson.build b/js/dbusServices/meson.build -index c749f45dc..11bcb0c9e 100644 ---- a/js/dbusServices/meson.build -+++ b/js/dbusServices/meson.build -@@ -2,6 +2,7 @@ launcherconf = configuration_data() - launcherconf.set('PACKAGE_NAME', meson.project_name()) - launcherconf.set('prefix', prefix) - launcherconf.set('libdir', libdir) -+launcherconf.set('gjs', gjs.path()) - - dbus_services = { - 'org.gnome.Shell.Extensions': 'extensions', -@@ -11,16 +12,17 @@ dbus_services = { - config_dir = '@0@/..'.format(meson.current_build_dir()) - - foreach service, dir : dbus_services -+ svc_launcherconf = launcherconf -+ svc_launcherconf.set('service', service) - configure_file( - input: 'dbus-service.in', - output: service, -- configuration: launcherconf, -+ configuration: svc_launcherconf, - install_dir: pkgdatadir, - ) - - serviceconf = configuration_data() - serviceconf.set('service', service) -- serviceconf.set('gjs', gjs.path()) - serviceconf.set('pkgdatadir', pkgdatadir) - - configure_file( diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix deleted file mode 100644 index d26dc801d693d..0000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ /dev/null @@ -1,120 +0,0 @@ -{ lib -, stdenv -, fetchurl -, substituteAll -, pkg-config -, meson -, ninja -, gettext -, gnome3 -, wrapGAppsHook -, packagekit -, ostree -, glib -, appstream -, libsoup -, libhandy -, polkit -, isocodes -, gspell -, libxslt -, gobject-introspection -, flatpak -, fwupd -, gtk3 -, gsettings-desktop-schemas -, gnome-desktop -, libxmlb -, gnome-online-accounts -, json-glib -, libsecret -, valgrind-light -, docbook-xsl-nons -, docbook_xml_dtd_42 -, docbook_xml_dtd_43 -, gtk-doc -, desktop-file-utils -, libsysprof-capture -}: - -let - withFwupd = stdenv.isx86_64 || stdenv.isi686; -in - -stdenv.mkDerivation rec { - pname = "gnome-software"; - version = "40.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "16q2902swxsjdxb1nj335sv1bb76rvq4w6dn4yszkwf3s0fd86in"; - }; - - patches = [ - (substituteAll { - src = ./fix-paths.patch; - inherit isocodes; - }) - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gettext - wrapGAppsHook - libxslt - docbook_xml_dtd_42 - docbook_xml_dtd_43 - valgrind-light - docbook-xsl-nons - gtk-doc - desktop-file-utils - gobject-introspection - ]; - - buildInputs = [ - gtk3 - glib - packagekit - appstream - libsoup - libhandy - gsettings-desktop-schemas - gnome-desktop - gspell - json-glib - libsecret - ostree - polkit - flatpak - libxmlb - gnome-online-accounts - libsysprof-capture - ] ++ lib.optionals withFwupd [ - fwupd - ]; - - mesonFlags = [ - "-Dgudev=false" - # FIXME: package malcontent parental controls - "-Dmalcontent=false" - ] ++ lib.optionals (!withFwupd) [ - "-Dfwupd=false" - ]; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.gnome-software"; - }; - }; - - meta = with lib; { - description = "Software store that lets you install and update applications and system extensions"; - homepage = "https://wiki.gnome.org/Apps/Software"; - license = licenses.gpl2Plus; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-software/fix-paths.patch b/pkgs/desktops/gnome-3/core/gnome-software/fix-paths.patch deleted file mode 100644 index 6f443a8a43edb..0000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-software/fix-paths.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/gs-language.c -+++ b/src/gs-language.c -@@ -95,7 +95,7 @@ - g_autoptr(GMarkupParseContext) context = NULL; - - /* find filename */ -- filename = g_build_filename (DATADIR, "xml", "iso-codes", "iso_639.xml", NULL); -+ filename = g_build_filename ("@isocodes@", "share", "xml", "iso-codes", "iso_639.xml", NULL); - if (!g_file_test (filename, G_FILE_TEST_EXISTS)) { - g_free (filename); - filename = g_build_filename ("/usr", "share", "xml", "iso-codes", "iso_639.xml", NULL); diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix deleted file mode 100644 index 44e24e7cdf645..0000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ lib -, stdenv -, gettext -, fetchurl -, pkg-config -, gtkmm3 -, libxml2 -, bash -, gtk3 -, libhandy -, glib -, wrapGAppsHook -, meson -, ninja -, python3 -, gsettings-desktop-schemas -, itstool -, gnome3 -, librsvg -, gdk-pixbuf -, libgtop -, systemd -}: - -stdenv.mkDerivation rec { - pname = "gnome-system-monitor"; - version = "40.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-system-monitor/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "06hxd4igxas2kyind5jwfq5qbfkknykpdfy2sy3anylhcx1hzczx"; - }; - - nativeBuildInputs = [ - pkg-config - gettext - itstool - wrapGAppsHook - meson - ninja - python3 - ]; - - buildInputs = [ - bash - gtk3 - libhandy - glib - libxml2 - gtkmm3 - libgtop - gdk-pixbuf - gnome3.adwaita-icon-theme - librsvg - gsettings-desktop-schemas - systemd - ]; - - doCheck = true; - - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - sed -i '/gtk-update-icon-cache/s/^/#/' meson_post_install.py - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "gnome-system-monitor"; - attrPath = "gnome3.gnome-system-monitor"; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/SystemMonitor"; - description = "System Monitor shows you what programs are running and how much processor time, memory, and disk space are being used"; - maintainers = teams.gnome.members; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix deleted file mode 100644 index de5cb767d543d..0000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, libxml2, gnome3, dconf, nautilus -, gtk3, gsettings-desktop-schemas, vte, gettext, which, libuuid, vala -, desktop-file-utils, itstool, wrapGAppsHook, pcre2 -, libxslt, docbook-xsl-nons }: - -stdenv.mkDerivation rec { - pname = "gnome-terminal"; - version = "3.40.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-terminal/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1r6qd6w18gk83w32y6bvn4hg2hd7qvngak4ymwpgndyp41rwqw07"; - }; - - buildInputs = [ - gtk3 gsettings-desktop-schemas vte libuuid dconf - # For extension - nautilus - ]; - - nativeBuildInputs = [ - pkg-config gettext itstool which libxml2 libxslt docbook-xsl-nons - vala desktop-file-utils wrapGAppsHook pcre2 - ]; - - # Silly ./configure, it looks for dbus file from gnome-shell in the - # installation tree of the package it is configuring. - postPatch = '' - substituteInPlace configure --replace '$(eval echo $(eval echo $(eval echo ''${dbusinterfacedir})))/org.gnome.ShellSearchProvider2.xml' "${gnome3.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" - substituteInPlace src/Makefile.in --replace '$(dbusinterfacedir)/org.gnome.ShellSearchProvider2.xml' "${gnome3.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" - ''; - - configureFlags = [ "--disable-migration" ]; # TODO: remove this with 3.30 - - passthru = { - updateScript = gnome3.updateScript { - packageName = "gnome-terminal"; - attrPath = "gnome3.gnome-terminal"; - }; - }; - - enableParallelBuilding = true; - - meta = with lib; { - description = "The GNOME Terminal Emulator"; - homepage = "https://wiki.gnome.org/Apps/Terminal"; - platforms = platforms.linux; - license = licenses.gpl3Plus; - maintainers = teams.gnome.members; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix deleted file mode 100644 index 7b42d724593a2..0000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkg-config, pango, atk, gtk2 -, gdk-pixbuf, hicolor-icon-theme }: - -let - pname = "gnome-themes-extra"; - version = "3.28"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "06aqg9asq2vqi9wr29bs4v8z2bf4manhbhfghf4nvw01y2zs0jvw"; - }; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - }; - }; - - nativeBuildInputs = [ pkg-config intltool ]; - buildInputs = [ gtk3 librsvg pango atk gtk2 gdk-pixbuf ]; - propagatedBuildInputs = [ gnome3.adwaita-icon-theme hicolor-icon-theme ]; - - dontDropIconThemeCache = true; - - postInstall = '' - gtk-update-icon-cache "$out"/share/icons/HighContrast - ''; - - meta = with lib; { - platforms = platforms.linux; - maintainers = teams.gnome.members; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-tour/default.nix b/pkgs/desktops/gnome-3/core/gnome-tour/default.nix deleted file mode 100644 index 4e6c58a14e8f6..0000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-tour/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ lib -, stdenv -, rustPlatform -, gettext -, meson -, ninja -, fetchurl -, pkg-config -, gtk3 -, glib -, gdk-pixbuf -, desktop-file-utils -, appstream-glib -, wrapGAppsHook -, python3 -, gnome3 -, libhandy -, librsvg -, rustc -, cargo -}: - -stdenv.mkDerivation rec { - pname = "gnome-tour"; - version = "40.0"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-cGMiOGmgdHJ0FL7H23ONhQYhbuhMz8O8p9rFLkmMG/k="; - }; - - cargoVendorDir = "vendor"; - - nativeBuildInputs = [ - appstream-glib - cargo - desktop-file-utils - gettext - glib # glib-compile-resources - meson - ninja - pkg-config - python3 - rustPlatform.cargoSetupHook - rustc - wrapGAppsHook - ]; - - buildInputs = [ - gdk-pixbuf - glib - gtk3 - libhandy - librsvg - ]; - - postPatch = '' - chmod +x build-aux/meson_post_install.py - patchShebangs build-aux/meson_post_install.py - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - }; - }; - - meta = with lib; { - homepage = "https://gitlab.gnome.org/GNOME/gnome-tour"; - description = "GNOME Greeter & Tour"; - maintainers = teams.gnome.members; - license = licenses.gpl3Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix deleted file mode 100644 index 54fcf531c6586..0000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix +++ /dev/null @@ -1,96 +0,0 @@ -{ lib, stdenv -, gettext -, meson -, ninja -, fetchurl -, fetchpatch -, apacheHttpd -, nautilus -, pkg-config -, gtk3 -, glib -, libxml2 -, systemd -, wrapGAppsHook -, itstool -, libnotify -, mod_dnssd -, gnome3 -, libcanberra-gtk3 -, python3 -}: - -stdenv.mkDerivation rec { - pname = "gnome-user-share"; - version = "3.34.0"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "04r9ck9v4i0d31grbli1d4slw2d6dcsfkpaybkwbzi7wnj72l30x"; - }; - - patches = [ - # fix gio-unix-2.0 lookup - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-user-share/commit/8772980d4732c15505b15dccff2ca3c97e96d49d.patch"; - sha256 = "03clzhrx72pq1cbmg2y24hvw4i1xsvrg9ip113fi5bc3w4gcji7p"; - }) - ]; - - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; - - preConfigure = '' - sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' \ - -e 's,''${HTTP_MODULES_PATH},${apacheHttpd}/modules,' \ - -i data/dav_user_2.4.conf - ''; - - mesonFlags = [ - "-Dhttpd=${apacheHttpd.out}/bin/httpd" - "-Dmodules_path=${apacheHttpd.dev}/modules" - "-Dsystemduserunitdir=${placeholder "out"}/etc/systemd/user" - # In 3.34.0 it defaults to false but it is silently ignored and always installed. - # Let’s add it anyway in case they decide to make build respect the option in the future. - "-Dnautilus_extension=true" - ]; - - nativeBuildInputs = [ - pkg-config - meson - ninja - gettext - itstool - libxml2 - wrapGAppsHook - python3 - ]; - - buildInputs = [ - gtk3 - glib - nautilus - libnotify - libcanberra-gtk3 - systemd - ]; - - doCheck = true; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - meta = with lib; { - homepage = "https://help.gnome.org/users/gnome-user-share/3.8"; - description = "Service that exports the contents of the Public folder in your home directory on the local network"; - maintainers = teams.gnome.members; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix deleted file mode 100644 index aac5a43e4339a..0000000000000 --- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix +++ /dev/null @@ -1,108 +0,0 @@ -{ lib, stdenv -, intltool -, fetchFromGitLab -, meson -, ninja -, pkg-config -, python3 -, gtk3 -, adwaita-icon-theme -, glib -, desktop-file-utils -, gtk-doc -, wrapGAppsHook -, gnome3 -, itstool -, libxml2 -, yelp-tools -, docbook_xsl -, docbook_xml_dtd_412 -, gsettings-desktop-schemas -, callPackage -, unzip -, unicode-character-database -, unihan-database -, runCommand -, symlinkJoin -, gobject-introspection -}: - -let - # TODO: make upstream patch allowing to use the uncompressed file, - # preferably from XDG_DATA_DIRS. - # https://gitlab.gnome.org/GNOME/gucharmap/issues/13 - unihanZip = runCommand "unihan" {} '' - mkdir -p $out/share/unicode - ln -s ${unihan-database.src} $out/share/unicode/Unihan.zip - ''; - ucd = symlinkJoin { - name = "ucd+unihan"; - paths = [ - unihanZip - unicode-character-database - ]; - }; -in stdenv.mkDerivation rec { - pname = "gucharmap"; - version = "13.0.2"; - - outputs = [ "out" "lib" "dev" "devdoc" ]; - - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "GNOME"; - repo = pname; - rev = version; - sha256 = "099za9mc6qdq9pwcbjp3d7hxjbaa43vk2w9qw4yiyswl1xq3jw62"; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - python3 - wrapGAppsHook - unzip - intltool - itstool - gtk-doc - docbook_xsl - docbook_xml_dtd_412 - yelp-tools - libxml2 - desktop-file-utils - gobject-introspection - ]; - - buildInputs = [ - gtk3 - glib - gsettings-desktop-schemas - adwaita-icon-theme - ]; - - mesonFlags = [ - "-Ducd_path=${ucd}/share/unicode" - "-Dvapi=false" - ]; - - doCheck = true; - - postPatch = '' - patchShebangs data/meson_desktopfile.py gucharmap/gen-guch-unicode-tables.pl gucharmap/meson_compileschemas.py - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - }; - }; - - meta = with lib; { - description = "GNOME Character Map, based on the Unicode Character Database"; - homepage = "https://wiki.gnome.org/Apps/Gucharmap"; - license = licenses.gpl3; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix deleted file mode 100644 index f4b76996ac4b3..0000000000000 --- a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool, gobject-introspection, gnome3 }: - -let - pname = "libgnome-keyring"; - version = "3.12.0"; -in -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783"; - }; - - outputs = [ "out" "dev" ]; - - propagatedBuildInputs = [ glib gobject-introspection dbus libgcrypt ]; - nativeBuildInputs = [ pkg-config intltool ]; - - meta = { - description = "Framework for managing passwords and other secrets"; - homepage = "https://wiki.gnome.org/Projects/GnomeKeyring"; - license = with lib.licenses; [ gpl2Plus lgpl2Plus ]; - inherit (glib.meta) platforms maintainers; - - longDescription = '' - gnome-keyring is a program that keeps password and other secrets for - users. The library libgnome-keyring is used by applications to integrate - with the gnome-keyring system. - ''; - }; -} diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/0001-EGL-Include-EGL-eglmesaext.h.patch b/pkgs/desktops/gnome-3/core/mutter/3.34/0001-EGL-Include-EGL-eglmesaext.h.patch deleted file mode 100644 index 3691c034d1ee6..0000000000000 --- a/pkgs/desktops/gnome-3/core/mutter/3.34/0001-EGL-Include-EGL-eglmesaext.h.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d Mon Sep 17 00:00:00 2001 -Message-Id: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch> -From: WORLDofPEACE -Date: Sun, 20 Oct 2019 12:04:31 +0200 -Subject: [PATCH 1/7] EGL: Include EGL/eglmesaext.h - -From: Jan Alexander Steffens (heftig) - -The eglext.h shipped by libglvnd does not include the Mesa extensions, -unlike the header shipped in Mesa. - -Fixes https://gitlab.gnome.org/GNOME/mutter/issues/876 - -(cherry picked from commit a444a4c5f58ea516ad3cd9d6ddc0056c3ca9bc90) ---- - cogl/cogl/meson.build | 2 +- - src/backends/meta-egl-ext.h | 1 + - src/backends/meta-egl.c | 1 + - src/backends/meta-egl.h | 1 + - 4 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build -index 1057ef9..9a64294 100644 ---- a/cogl/cogl/meson.build -+++ b/cogl/cogl/meson.build -@@ -48,7 +48,7 @@ cogl_gl_header_h = configure_file( - built_headers += [cogl_gl_header_h] - - if have_egl -- cogl_egl_includes_string = '#include \n#include ' -+ cogl_egl_includes_string = '#include \n#include \n#include ' - else - cogl_egl_includes_string = '' - endif -diff --git a/src/backends/meta-egl-ext.h b/src/backends/meta-egl-ext.h -index 8705e7d..db0b74f 100644 ---- a/src/backends/meta-egl-ext.h -+++ b/src/backends/meta-egl-ext.h -@@ -29,6 +29,7 @@ - - #include - #include -+#include - - /* - * This is a little different to the tests shipped with EGL implementations, -diff --git a/src/backends/meta-egl.c b/src/backends/meta-egl.c -index 6554be9..fdeff4f 100644 ---- a/src/backends/meta-egl.c -+++ b/src/backends/meta-egl.c -@@ -27,6 +27,7 @@ - - #include - #include -+#include - #include - #include - #include -diff --git a/src/backends/meta-egl.h b/src/backends/meta-egl.h -index f2a8164..4591e7d 100644 ---- a/src/backends/meta-egl.h -+++ b/src/backends/meta-egl.h -@@ -28,6 +28,7 @@ - - #include - #include -+#include - #include - - #define META_EGL_ERROR meta_egl_error_quark () - -base-commit: 48ffbb582404c1d52196eb6cc5f082c31ca4910c --- -git-series 0.9.1 diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/0002-drop-inheritable.patch b/pkgs/desktops/gnome-3/core/mutter/3.34/0002-drop-inheritable.patch deleted file mode 100644 index 28f89ac7c0c61..0000000000000 --- a/pkgs/desktops/gnome-3/core/mutter/3.34/0002-drop-inheritable.patch +++ /dev/null @@ -1,135 +0,0 @@ -From 14cee101882e65a57dcd66ea0f8399477b23ce7e Mon Sep 17 00:00:00 2001 -Message-Id: <14cee101882e65a57dcd66ea0f8399477b23ce7e.1601082838.git-series.worldofpeace@protonmail.ch> -In-Reply-To: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch> -References: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch> -From: WORLDofPEACE -Date: Sat, 19 Oct 2019 13:26:05 +0200 -Subject: [PATCH 2/7] drop inheritable - -From: Tor Hedin Brønner - -Adapted from https://gitlab.gnome.org/GNOME/mutter/commit/c53c47ae123b03cc66044d2b846342123ecb3a01 - -We only want to drop inheritable though, to prevent the ambient set leaking further than gnome-shell. ---- - config.h.meson | 3 +++ - meson.build | 5 +++++ - meson_options.txt | 6 ++++++ - src/core/main.c | 10 ++++++++++ - src/meson.build | 1 + - 5 files changed, 25 insertions(+) - -diff --git a/config.h.meson b/config.h.meson -index 0bab718..202fb7e 100644 ---- a/config.h.meson -+++ b/config.h.meson -@@ -58,6 +58,9 @@ - /* Xwayland applications allowed to issue keyboard grabs */ - #mesondefine XWAYLAND_GRAB_DEFAULT_ACCESS_RULES - -+/* Defined if libcap-ng is available */ -+#mesondefine HAVE_LIBCAPNG -+ - /* XKB base prefix */ - #mesondefine XKB_BASE - -diff --git a/meson.build b/meson.build -index 29d495b..86970df 100644 ---- a/meson.build -+++ b/meson.build -@@ -35,6 +35,7 @@ libstartup_notification_req = '>= 0.7' - libcanberra_req = '>= 0.26' - libwacom_req = '>= 0.13' - atk_req = '>= 2.5.3' -+libcapng_req = '>= 0.7.9' - - # optional version requirements - udev_req = '>= 228' -@@ -125,6 +126,7 @@ xau_dep = dependency('xau') - ice_dep = dependency('ice') - atk_dep = dependency('atk', version: atk_req) - libcanberra_dep = dependency('libcanberra', version: libcanberra_req) -+libcapng_dep = dependency('libcap-ng', required: get_option('libcapng')) - - # For now always require X11 support - have_x11 = true -@@ -256,6 +258,7 @@ have_core_tests = false - have_cogl_tests = false - have_clutter_tests = false - have_installed_tests = false -+have_libcapng = libcapng_dep.found() - - if have_tests - have_core_tests = get_option('core_tests') -@@ -361,6 +364,7 @@ cdata.set('HAVE_LIBWACOM', have_libwacom) - cdata.set('HAVE_SM', have_sm) - cdata.set('HAVE_STARTUP_NOTIFICATION', have_startup_notification) - cdata.set('HAVE_INTROSPECTION', have_introspection) -+cdata.set('HAVE_LIBCAPNG', have_libcapng) - cdata.set('HAVE_PROFILER', have_profiler) - - xkb_base = xkeyboard_config_dep.get_pkgconfig_variable('xkb_base') -@@ -443,6 +447,7 @@ output = [ - ' Startup notification..... ' + have_startup_notification.to_string(), - ' Introspection............ ' + have_introspection.to_string(), - ' Profiler................. ' + have_profiler.to_string(), -+ ' libcap-ng................ ' + have_libcapng.to_string(), - '', - ' Tests:', - '', -diff --git a/meson_options.txt b/meson_options.txt -index 73aa7ad..8bfaacd 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -152,3 +152,9 @@ option('xwayland_grab_default_access_rules', - value: 'gnome-boxes,remote-viewer,virt-viewer,virt-manager,vinagre,vncviewer,Xephyr', - description: 'Comma delimited list of applications ressources or class allowed to issue X11 grabs in Xwayland' - ) -+ -+option('libcapng', -+ type: 'feature', -+ value: 'auto', -+ description: 'Enable libcap-ng support' -+) -diff --git a/src/core/main.c b/src/core/main.c -index 3935f35..ecf3cb2 100644 ---- a/src/core/main.c -+++ b/src/core/main.c -@@ -66,6 +66,10 @@ - #include - #endif - -+#ifdef HAVE_LIBCAPNG -+#include -+#endif -+ - #if defined(HAVE_NATIVE_BACKEND) && defined(HAVE_WAYLAND) - #include - #endif /* HAVE_WAYLAND && HAVE_NATIVE_BACKEND */ -@@ -673,6 +677,12 @@ meta_run (void) - if (!meta_display_open ()) - meta_exit (META_EXIT_ERROR); - -+#ifdef HAVE_LIBCAPNG -+ capng_clear(CAPNG_SELECT_BOTH); -+ capng_update(CAPNG_ADD, CAPNG_EFFECTIVE|CAPNG_PERMITTED, CAP_SYS_NICE); -+ capng_apply(CAPNG_SELECT_BOTH); -+#endif -+ - g_main_loop_run (meta_main_loop); - - meta_finalize (); -diff --git a/src/meson.build b/src/meson.build -index 90d8073..a9fffa2 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -18,6 +18,7 @@ mutter_pkg_deps = [ - glib_dep, - gsettings_desktop_schemas_dep, - gtk3_dep, -+ libcapng_dep, - pango_dep, - ] - --- -git-series 0.9.1 diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/0003-Fix-glitches-in-gala.patch b/pkgs/desktops/gnome-3/core/mutter/3.34/0003-Fix-glitches-in-gala.patch deleted file mode 100644 index 9f78a324d9daf..0000000000000 --- a/pkgs/desktops/gnome-3/core/mutter/3.34/0003-Fix-glitches-in-gala.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 5d2b9a03f24b4dbc423adff52b2eeb478c4b5913 Mon Sep 17 00:00:00 2001 -Message-Id: <5d2b9a03f24b4dbc423adff52b2eeb478c4b5913.1601082838.git-series.worldofpeace@protonmail.ch> -In-Reply-To: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch> -References: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch> -From: WORLDofPEACE -Date: Sun, 5 Apr 2020 23:06:03 -0400 -Subject: [PATCH 3/7] Fix glitches in gala - -From: worldofpeace - -This fixes issues for users of mutter like in gala[0]. - -Upstream report: https://gitlab.gnome.org/GNOME/mutter/issues/536 -[0]: https://github.com/elementary/gala/issues/605 ---- - clutter/clutter/clutter-actor.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c -index ecf9a59..07b8b71 100644 ---- a/clutter/clutter/clutter-actor.c -+++ b/clutter/clutter/clutter-actor.c -@@ -17831,7 +17831,7 @@ _clutter_actor_get_paint_volume_mutable (ClutterActor *self) - if (_clutter_actor_get_paint_volume_real (self, &priv->paint_volume)) - { - priv->paint_volume_valid = TRUE; -- priv->needs_paint_volume_update = FALSE; -+ //priv->needs_paint_volume_update = FALSE; - return &priv->paint_volume; - } - else --- -git-series 0.9.1 diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/0004-profiler-track-changes-in-GLib-and-Sysprof.patch b/pkgs/desktops/gnome-3/core/mutter/3.34/0004-profiler-track-changes-in-GLib-and-Sysprof.patch deleted file mode 100644 index cd98d3950415b..0000000000000 --- a/pkgs/desktops/gnome-3/core/mutter/3.34/0004-profiler-track-changes-in-GLib-and-Sysprof.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 5a9f9fbaa1322b2ad0a52fcdd171d4f44d031918 Mon Sep 17 00:00:00 2001 -Message-Id: <5a9f9fbaa1322b2ad0a52fcdd171d4f44d031918.1601082838.git-series.worldofpeace@protonmail.ch> -In-Reply-To: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch> -References: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch> -From: WORLDofPEACE -Date: Wed, 30 Oct 2019 15:23:24 -0700 -Subject: [PATCH 4/7] profiler: track changes in GLib and Sysprof - -From: Christian Hergert - -This tracks the changes to gdbus-codegen in terms of how GUnixFDList is -done to use the UnixFD annotation. - -https://gitlab.gnome.org/GNOME/mutter/merge_requests/908 -(cherry picked from commit 605171291993460f31d470a8143d6438d0c6169c) ---- - src/backends/meta-profiler.c | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - -diff --git a/src/backends/meta-profiler.c b/src/backends/meta-profiler.c -index 10d433a..0d62701 100644 ---- a/src/backends/meta-profiler.c -+++ b/src/backends/meta-profiler.c -@@ -51,13 +51,12 @@ G_DEFINE_TYPE_WITH_CODE (MetaProfiler, - static gboolean - handle_start (MetaDBusSysprof3Profiler *dbus_profiler, - GDBusMethodInvocation *invocation, -+ GUnixFDList *fd_list, - GVariant *options, - GVariant *fd_variant) - { - MetaProfiler *profiler = META_PROFILER (dbus_profiler); - GMainContext *main_context = g_main_context_default (); -- GDBusMessage *message; -- GUnixFDList *fd_list; - const char *group_name; - int position; - int fd = -1; -@@ -73,8 +72,6 @@ handle_start (MetaDBusSysprof3Profiler *dbus_profiler, - - g_variant_get (fd_variant, "h", &position); - -- message = g_dbus_method_invocation_get_message (invocation); -- fd_list = g_dbus_message_get_unix_fd_list (message); - if (fd_list) - fd = g_unix_fd_list_get (fd_list, position, NULL); - -@@ -98,7 +95,7 @@ handle_start (MetaDBusSysprof3Profiler *dbus_profiler, - - g_debug ("Profiler running"); - -- meta_dbus_sysprof3_profiler_complete_start (dbus_profiler, invocation); -+ meta_dbus_sysprof3_profiler_complete_start (dbus_profiler, invocation, NULL); - return TRUE; - } - --- -git-series 0.9.1 diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/0005-meta-Add-missing-display.h-to-meta-workspace-manager.h.patch b/pkgs/desktops/gnome-3/core/mutter/3.34/0005-meta-Add-missing-display.h-to-meta-workspace-manager.h.patch deleted file mode 100644 index 138970ddda0ac..0000000000000 --- a/pkgs/desktops/gnome-3/core/mutter/3.34/0005-meta-Add-missing-display.h-to-meta-workspace-manager.h.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 2caa072dd8e283a8e43febeab55fe8b76dda69b7 Mon Sep 17 00:00:00 2001 -Message-Id: <2caa072dd8e283a8e43febeab55fe8b76dda69b7.1601082838.git-series.worldofpeace@protonmail.ch> -In-Reply-To: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch> -References: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch> -From: WORLDofPEACE -Date: Wed, 29 Jan 2020 11:02:33 +0100 -Subject: [PATCH 5/7] meta: Add missing display.h to meta-workspace-manager.h - -From: Corentin Noël - -This is required because MetaDisplayCorner is only defined in display.h - -https://gitlab.gnome.org/GNOME/mutter/merge_requests/1025 -(cherry picked from commit 9d390ee49fb1f6300336e82ae94cc8061c6bae12) ---- - src/meta/meta-workspace-manager.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/meta/meta-workspace-manager.h b/src/meta/meta-workspace-manager.h -index 0390c44..92cd681 100644 ---- a/src/meta/meta-workspace-manager.h -+++ b/src/meta/meta-workspace-manager.h -@@ -26,6 +26,7 @@ - #include - - #include -+#include - #include - #include - --- -git-series 0.9.1 diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/0006-build-bump-ABI-to-sysprof-capture-4.patch b/pkgs/desktops/gnome-3/core/mutter/3.34/0006-build-bump-ABI-to-sysprof-capture-4.patch deleted file mode 100644 index 6d88f0f5e7660..0000000000000 --- a/pkgs/desktops/gnome-3/core/mutter/3.34/0006-build-bump-ABI-to-sysprof-capture-4.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 0c95e5a5b31eab93f149b90982680f38e8977063 Mon Sep 17 00:00:00 2001 -Message-Id: <0c95e5a5b31eab93f149b90982680f38e8977063.1601082838.git-series.worldofpeace@protonmail.ch> -In-Reply-To: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch> -References: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch> -From: WORLDofPEACE -Date: Sat, 4 Jul 2020 12:01:28 -0700 -Subject: [PATCH 6/7] build: bump ABI to sysprof-capture-4 - -From: Christian Hergert - -GLib will now be linking against sysprof-capture-4.a. To support that, -sysprof had to remove the GLib dependency from sysprof-capture-4 which -had the side-effect of breaking ABi. - -This bumps the dependency and includes a fallback to compile just the -libsysprof-capture-4.a using a subproject wrap. - -https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1352 -(cherry picked from commit 2c08eb6d163b6758efec9eafe1d5c17fc1ab3692) ---- - meson.build | 20 ++++++++++++++++++-- - src/meson.build | 8 ++++++-- - subprojects/sysprof.wrap | 4 ++++ - 3 files changed, 28 insertions(+), 4 deletions(-) - create mode 100644 subprojects/sysprof.wrap - -diff --git a/meson.build b/meson.build -index 86970df..3dc0098 100644 ---- a/meson.build -+++ b/meson.build -@@ -1,6 +1,6 @@ - project('mutter', 'c', - version: '3.34.6', -- meson_version: '>= 0.50.0', -+ meson_version: '>= 0.51.0', - license: 'GPLv2+' - ) - -@@ -52,6 +52,9 @@ gbm_req = '>= 10.3' - # screen cast version requirements - libpipewire_req = '>= 0.2.5' - -+# profiler requirements -+sysprof_req = '>= 3.37.2' -+ - gnome = import('gnome') - pkg = import('pkgconfig') - i18n = import('i18n') -@@ -275,7 +278,20 @@ endif - - have_profiler = get_option('profiler') - if have_profiler -- sysprof_dep = dependency('sysprof-capture-3') -+ # libsysprof-capture support -+ sysprof_dep = dependency('sysprof-capture-4', -+ required: true, -+ default_options: [ -+ 'enable_examples=false', -+ 'enable_gtk=false', -+ 'enable_tests=false', -+ 'enable_tools=false', -+ 'libsysprof=false', -+ 'with_sysprofd=none', -+ 'help=false', -+ ], -+ fallback: ['sysprof', 'libsysprof_capture_dep'], -+ ) - endif - - required_functions = [ -diff --git a/src/meson.build b/src/meson.build -index a9fffa2..a91baa1 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -711,9 +711,13 @@ if have_profiler - 'backends/meta-profiler.h', - ] - -- dbus_interfaces_dir = join_paths(datadir, 'dbus-1', 'interfaces') -- sysprof3_dbus_file = join_paths(dbus_interfaces_dir, 'org.gnome.Sysprof3.Profiler.xml') -+ if sysprof_dep.type_name() == 'pkgconfig' -+ sysprof_dbus_interfaces_dir = join_paths(sysprof_dep.get_pkgconfig_variable('datadir'), 'dbus-1', 'interfaces') -+ else -+ sysprof_dbus_interfaces_dir = join_paths(meson.source_root(), 'subprojects', 'sysprof', 'src') -+ endif - -+ sysprof3_dbus_file = join_paths(sysprof_dbus_interfaces_dir, 'org.gnome.Sysprof3.Profiler.xml') - dbus_sysprof3_profiler_built_sources = gnome.gdbus_codegen('meta-dbus-sysprof3-profiler', - sysprof3_dbus_file, - interface_prefix: 'org.gnome.', -diff --git a/subprojects/sysprof.wrap b/subprojects/sysprof.wrap -new file mode 100644 -index 0000000..c8f5883 ---- /dev/null -+++ b/subprojects/sysprof.wrap -@@ -0,0 +1,4 @@ -+[wrap-git] -+directory=sysprof -+url=https://gitlab.gnome.org/GNOME/sysprof.git -+revision=cae28263ff5dd4a510d82f3dc2e3a3b3d9b386fb --- -git-series 0.9.1 diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/0007-fix-paths.patch b/pkgs/desktops/gnome-3/core/mutter/3.34/0007-fix-paths.patch deleted file mode 100644 index 8376fc649b5f0..0000000000000 --- a/pkgs/desktops/gnome-3/core/mutter/3.34/0007-fix-paths.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 7bbbf082599ec786f64f2135c9acc0b4fe2ecbf4 Mon Sep 17 00:00:00 2001 -Message-Id: <7bbbf082599ec786f64f2135c9acc0b4fe2ecbf4.1601082838.git-series.worldofpeace@protonmail.ch> -In-Reply-To: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch> -References: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch> -From: WORLDofPEACE -Date: Fri, 25 Sep 2020 20:48:33 -0400 -Subject: [PATCH 7/7] fix paths - ---- - src/core/util.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/core/util.c b/src/core/util.c -index 79bcfdc..87ce549 100644 ---- a/src/core/util.c -+++ b/src/core/util.c -@@ -623,7 +623,7 @@ meta_show_dialog (const char *type, - - args = g_ptr_array_new (); - -- append_argument (args, "zenity"); -+ append_argument (args, "@zenity@/bin/zenity"); - append_argument (args, type); - - if (display) --- -git-series 0.9.1 diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix b/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix deleted file mode 100644 index 1f4ca5d3213d8..0000000000000 --- a/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix +++ /dev/null @@ -1,134 +0,0 @@ -{ fetchurl -, fetchpatch -, substituteAll -, lib, stdenv -, pkg-config -, gnome3 -, pantheon -, gettext -, gobject-introspection -, upower -, cairo -, pango -, cogl -, json-glib -, libstartup_notification -, zenity -, libcanberra-gtk3 -, ninja -, xkeyboard_config -, libxkbfile -, libxkbcommon -, libXtst -, libinput -, gsettings-desktop-schemas -, glib -, gtk3 -, gnome-desktop -, geocode-glib -, pipewire_0_2 -, libgudev -, libwacom -, xwayland -, meson -, gnome-settings-daemon -, xorgserver -, python3 -, wrapGAppsHook -, sysprof -, desktop-file-utils -, libcap_ng -, egl-wayland -}: - -stdenv.mkDerivation rec { - pname = "mutter"; - version = "3.34.6"; - - outputs = [ "out" "dev" "man" ]; - - src = fetchurl { - url = "mirror://gnome/sources/mutter/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-I73ofTO4mBNYgxzsiRW7X/Hq+cHedMkM0WYLG5WINSY="; - }; - - mesonFlags = [ - "-Degl_device=true" - "-Dinstalled_tests=false" # TODO: enable these - "-Dwayland_eglstream=true" - ]; - - propagatedBuildInputs = [ - # required for pkg-config to detect mutter-clutter - json-glib - libXtst - libcap_ng - ]; - - nativeBuildInputs = [ - desktop-file-utils - gettext - meson - ninja - pkg-config - python3 - wrapGAppsHook - xorgserver # for cvt command - ]; - - buildInputs = [ - cairo - cogl - egl-wayland - geocode-glib - glib - gnome-desktop - gnome-settings-daemon - gobject-introspection - gsettings-desktop-schemas - gtk3 - libcanberra-gtk3 - libgudev - libinput - libstartup_notification - libwacom - libxkbcommon - libxkbfile - pango - pipewire_0_2 # TODO: backport pipewire 0.3 support - sysprof - upower - xkeyboard_config - xwayland - zenity - ]; - - patches = [ - ./0001-EGL-Include-EGL-eglmesaext.h.patch - ./0002-drop-inheritable.patch - ./0003-Fix-glitches-in-gala.patch - ./0004-profiler-track-changes-in-GLib-and-Sysprof.patch - ./0005-meta-Add-missing-display.h-to-meta-workspace-manager.h.patch - ./0006-build-bump-ABI-to-sysprof-capture-4.patch - (substituteAll { - src = ./0007-fix-paths.patch; - inherit zenity; - }) - ]; - - postPatch = '' - patchShebangs src/backends/native/gen-default-modes.py - ''; - - postInstall = '' - ${glib.dev}/bin/glib-compile-schemas "$out/share/glib-2.0/schemas" - ''; - - meta = with lib; { - description = "A window manager for GNOME"; - homepage = "https://gitlab.gnome.org/GNOME/mutter"; - license = licenses.gpl2; - maintainers = pantheon.maintainers; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix deleted file mode 100644 index 2dda38bb4e7da..0000000000000 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ /dev/null @@ -1,170 +0,0 @@ -{ fetchurl -, fetchpatch -, substituteAll -, runCommand -, lib, stdenv -, pkg-config -, gnome3 -, gettext -, gobject-introspection -, cairo -, pango -, json-glib -, libstartup_notification -, zenity -, libcanberra -, ninja -, xkeyboard_config -, libxkbfile -, libXdamage -, libxkbcommon -, libXtst -, libinput -, libdrm -, gsettings-desktop-schemas -, glib -, gtk3 -, gnome-desktop -, pipewire -, libgudev -, libwacom -, xwayland -, mesa -, meson -, gnome-settings-daemon -, xorgserver -, python3 -, wrapGAppsHook -, sysprof -, desktop-file-utils -, libcap_ng -, egl-wayland -, graphene -, wayland-protocols -}: - -let self = stdenv.mkDerivation rec { - pname = "mutter"; - version = "40.0"; - - outputs = [ "out" "dev" "man" ]; - - src = fetchurl { - url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-enGzEuWmZ8U3SJUYilBqP2tnF2i8s2K2jv3FYnc9GY4="; - }; - - patches = [ - # Drop inheritable cap_sys_nice, to prevent the ambient set from leaking - # from mutter/gnome-shell, see https://github.com/NixOS/nixpkgs/issues/71381 - # ./drop-inheritable.patch - - (substituteAll { - src = ./fix-paths.patch; - inherit zenity; - }) - - # Fix non-deterministic build failure: - # https://gitlab.gnome.org/GNOME/mutter/-/issues/1682 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/mutter/commit/91117bb052ed0d69c8ea4159c1df15c814d90627.patch"; - sha256 = "ek8hEoPP4S2TGOm6SGGOhUVIp4OT68nz0SQzZrceFUU="; - }) - ]; - - mesonFlags = [ - "-Degl_device=true" - "-Dinstalled_tests=false" # TODO: enable these - "-Dwayland_eglstream=true" - "-Dprofiler=true" - "-Dxwayland_path=${xwayland}/bin/Xwayland" - # This should be auto detected, but it looks like it manages a false - # positive. - "-Dxwayland_initfd=disabled" - ]; - - propagatedBuildInputs = [ - # required for pkg-config to detect mutter-clutter - json-glib - libXtst - libcap_ng - graphene - ]; - - nativeBuildInputs = [ - desktop-file-utils - gettext - mesa # needed for gbm - meson - ninja - pkg-config - python3 - wrapGAppsHook - xorgserver # for cvt command - ]; - - buildInputs = [ - cairo - egl-wayland - glib - gnome-desktop - gnome-settings-daemon - gobject-introspection - gsettings-desktop-schemas - gtk3 - libcanberra - libdrm - libgudev - libinput - libstartup_notification - libwacom - libxkbcommon - libxkbfile - libXdamage - pango - pipewire - sysprof - xkeyboard_config - xwayland - wayland-protocols - ]; - - postPatch = '' - patchShebangs src/backends/native/gen-default-modes.py - ''; - - postInstall = '' - ${glib.dev}/bin/glib-compile-schemas "$out/share/glib-2.0/schemas" - ''; - - # Install udev files into our own tree. - PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; - - passthru = { - libdir = "${self}/lib/mutter-7"; - - tests = { - libdirExists = runCommand "mutter-libdir-exists" {} '' - if [[ ! -d ${self.libdir} ]]; then - echo "passthru.libdir should contain a directory, “${self.libdir}” is not one." - exit 1 - fi - touch $out - ''; - }; - - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - meta = with lib; { - description = "A window manager for GNOME"; - homepage = "https://gitlab.gnome.org/GNOME/mutter"; - license = licenses.gpl2Plus; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -}; -in self diff --git a/pkgs/desktops/gnome-3/core/mutter/drop-inheritable.patch b/pkgs/desktops/gnome-3/core/mutter/drop-inheritable.patch deleted file mode 100644 index 7374e1b86935e..0000000000000 --- a/pkgs/desktops/gnome-3/core/mutter/drop-inheritable.patch +++ /dev/null @@ -1,132 +0,0 @@ -From e9c772e265b2293af031c79f4bbc99b5847dfe3c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= -Date: Sat, 19 Oct 2019 13:26:05 +0200 -Subject: [PATCH] drop inheritable - -Adapted from https://gitlab.gnome.org/GNOME/mutter/commit/c53c47ae123b03cc66044d2b846342123ecb3a01 - -We only want to drop inheritable though, to prevent the ambient set leaking further than gnome-shell. - ---- - config.h.meson | 3 +++ - meson.build | 5 +++++ - meson_options.txt | 6 ++++++ - src/core/main.c | 11 +++++++++++ - src/meson.build | 1 + - 5 files changed, 26 insertions(+) - -diff --git a/config.h.meson b/config.h.meson -index 0bab71848..202fb7ed1 100644 ---- a/config.h.meson -+++ b/config.h.meson -@@ -58,6 +58,9 @@ - /* Xwayland applications allowed to issue keyboard grabs */ - #mesondefine XWAYLAND_GRAB_DEFAULT_ACCESS_RULES - -+/* Defined if libcap-ng is available */ -+#mesondefine HAVE_LIBCAPNG -+ - /* XKB base prefix */ - #mesondefine XKB_BASE - -diff --git a/meson.build b/meson.build -index 3322bd3b1..01c8020fa 100644 ---- a/meson.build -+++ b/meson.build -@@ -35,6 +35,7 @@ libstartup_notification_req = '>= 0.7' - libcanberra_req = '>= 0.26' - libwacom_req = '>= 0.13' - atk_req = '>= 2.5.3' -+libcapng_req = '>= 0.7.9' - - # optional version requirements - udev_req = '>= 228' -@@ -131,6 +131,7 @@ ice_dep = dependency('ice') - atk_dep = dependency('atk', version: atk_req) - libcanberra_dep = dependency('libcanberra', version: libcanberra_req) - dbus_dep = dependency('dbus-1') -+libcapng_dep = dependency('libcap-ng', required: get_option('libcapng')) - - # For now always require X11 support - have_x11 = true -@@ -256,6 +258,7 @@ have_core_tests = false - have_cogl_tests = false - have_clutter_tests = false - have_installed_tests = false -+have_libcapng = libcapng_dep.found() - - if have_tests - have_core_tests = get_option('core_tests') -@@ -361,6 +364,7 @@ cdata.set('HAVE_LIBWACOM', have_libwacom) - cdata.set('HAVE_SM', have_sm) - cdata.set('HAVE_STARTUP_NOTIFICATION', have_startup_notification) - cdata.set('HAVE_INTROSPECTION', have_introspection) -+cdata.set('HAVE_LIBCAPNG', have_libcapng) - cdata.set('HAVE_PROFILER', have_profiler) - - xkb_base = xkeyboard_config_dep.get_pkgconfig_variable('xkb_base') -@@ -465,6 +465,7 @@ output = [ - ' Introspection............ ' + have_introspection.to_string(), - ' Profiler................. ' + have_profiler.to_string(), - ' Xwayland initfd.......... ' + have_xwayland_initfd.to_string(), -+ ' libcap-ng................ ' + have_libcapng.to_string(), - '', - ' Tests:', - '', -diff --git a/meson_options.txt b/meson_options.txt -index 73aa7adde..8bfaacd9a 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -152,3 +152,9 @@ option('xwayland_grab_default_access_rules', - value: 'gnome-boxes,remote-viewer,virt-viewer,virt-manager,vinagre,vncviewer,Xephyr', - description: 'Comma delimited list of applications ressources or class allowed to issue X11 grabs in Xwayland' - ) -+ -+option('libcapng', -+ type: 'feature', -+ value: 'auto', -+ description: 'Enable libcap-ng support' -+) -diff --git a/src/core/main.c b/src/core/main.c -index 7f4f666d2..b27968f13 100644 ---- a/src/core/main.c -+++ b/src/core/main.c -@@ -66,6 +66,10 @@ - #include - #endif - -+#ifdef HAVE_LIBCAPNG -+#include -+#endif -+ - #if defined(HAVE_NATIVE_BACKEND) && defined(HAVE_WAYLAND) - #include - #endif /* HAVE_WAYLAND && HAVE_NATIVE_BACKEND */ -@@ -670,5 +674,12 @@ int - meta_run (void) - { - meta_start (); -+ -+#ifdef HAVE_LIBCAPNG -+ capng_clear(CAPNG_SELECT_BOTH); -+ capng_update(CAPNG_ADD, CAPNG_EFFECTIVE|CAPNG_PERMITTED, CAP_SYS_NICE); -+ capng_apply(CAPNG_SELECT_BOTH); -+#endif -+ - meta_run_main_loop (); - meta_finalize (); -diff --git a/src/meson.build b/src/meson.build -index 90d80734f..a9fffa2c2 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -18,6 +18,7 @@ mutter_pkg_deps = [ - glib_dep, - gsettings_desktop_schemas_dep, - gtk3_dep, -+ libcapng_dep, - pango_dep, - ] - --- -2.23.0 - diff --git a/pkgs/desktops/gnome-3/core/mutter/fix-paths.patch b/pkgs/desktops/gnome-3/core/mutter/fix-paths.patch deleted file mode 100644 index 6ac0a431f61ff..0000000000000 --- a/pkgs/desktops/gnome-3/core/mutter/fix-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/core/util.c b/src/core/util.c -index 57b73747d..f424cc81c 100644 ---- a/src/core/util.c -+++ b/src/core/util.c -@@ -636,7 +636,7 @@ meta_show_dialog (const char *type, - - args = g_ptr_array_new (); - -- append_argument (args, "zenity"); -+ append_argument (args, "@zenity@/bin/zenity"); - append_argument (args, type); - - if (display) diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix deleted file mode 100644 index 29c44ecd6e901..0000000000000 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ /dev/null @@ -1,118 +0,0 @@ -{ lib, stdenv -, fetchurl -, meson -, ninja -, pkg-config -, gettext -, libxml2 -, desktop-file-utils -, python3 -, wrapGAppsHook -, gtk3 -, libhandy -, libportal -, gnome3 -, gnome-autoar -, glib-networking -, shared-mime-info -, libnotify -, libexif -, libseccomp -, exempi -, librsvg -, tracker -, tracker-miners -, gexiv2 -, libselinux -, gdk-pixbuf -, substituteAll -, gnome-desktop -, gst_all_1 -, gsettings-desktop-schemas -, gobject-introspection -}: - -stdenv.mkDerivation rec { - pname = "nautilus"; - version = "40.1"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0cwxr7bfa19dvzra81s9wfshzv0zv7ycpfffn4amigd0fh0vkkwf"; - }; - - patches = [ - # Allow changing extension directory using environment variable. - ./extension_dir.patch - - # Hardcode required paths. - (substituteAll { - src = ./fix-paths.patch; - inherit tracker; - }) - ]; - - nativeBuildInputs = [ - desktop-file-utils - gettext - gobject-introspection - libxml2 - meson - ninja - pkg-config - python3 - wrapGAppsHook - ]; - - buildInputs = [ - exempi - gexiv2 - glib-networking - gnome-desktop - gnome3.adwaita-icon-theme - gsettings-desktop-schemas - gst_all_1.gst-plugins-base - gtk3 - libhandy - libportal - libexif - libnotify - libseccomp - libselinux - shared-mime-info - tracker - tracker-miners - ]; - - propagatedBuildInputs = [ - gnome-autoar - ]; - - preFixup = '' - gappsWrapperArgs+=( - # Thumbnailers - --prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share" - --prefix XDG_DATA_DIRS : "${librsvg}/share" - --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" - ) - ''; - - postPatch = '' - patchShebangs build-aux/meson/postinstall.py - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - meta = with lib; { - description = "The file manager for GNOME"; - homepage = "https://wiki.gnome.org/Apps/Files"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.gnome.members; - }; -} diff --git a/pkgs/desktops/gnome-3/core/nautilus/extension_dir.patch b/pkgs/desktops/gnome-3/core/nautilus/extension_dir.patch deleted file mode 100644 index e1313999675d0..0000000000000 --- a/pkgs/desktops/gnome-3/core/nautilus/extension_dir.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/nautilus-module.c b/src/nautilus-module.c -index 6273a76..4adcc8a 100644 ---- a/src/nautilus-module.c -+++ b/src/nautilus-module.c -@@ -242,11 +242,17 @@ void - nautilus_module_setup (void) - { - static gboolean initialized = FALSE; -+ const gchar* extensiondir = NULL; - - if (!initialized) - { - initialized = TRUE; - -- load_module_dir (NAUTILUS_EXTENSIONDIR); -+ extensiondir = g_getenv ("NAUTILUS_EXTENSION_DIR"); -+ if (extensiondir == NULL) { -+ extensiondir = NAUTILUS_EXTENSIONDIR; -+ } -+ -+ load_module_dir (extensiondir); - - eel_debug_call_at_shutdown (free_module_objects); - } diff --git a/pkgs/desktops/gnome-3/core/nautilus/fix-paths.patch b/pkgs/desktops/gnome-3/core/nautilus/fix-paths.patch deleted file mode 100644 index dc9874359b233..0000000000000 --- a/pkgs/desktops/gnome-3/core/nautilus/fix-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/nautilus-tag-manager.c b/src/nautilus-tag-manager.c -index 28b96c996..0b1fad9ab 100644 ---- a/src/nautilus-tag-manager.c -+++ b/src/nautilus-tag-manager.c -@@ -962,7 +962,7 @@ child_watch_cb (GPid pid, - static void - export_tracker2_data (NautilusTagManager *self) - { -- gchar *argv[] = {"tracker3", "export", "--2to3", "files-starred", "--keyfile", NULL}; -+ gchar *argv[] = {"@tracker@/bin/tracker3", "export", "--2to3", "files-starred", "--keyfile", NULL}; - gint stdout_fd; - GPid child_pid; - g_autoptr (GError) error = NULL; diff --git a/pkgs/desktops/gnome-3/core/rygel/add-option-for-installation-sysconfdir.patch b/pkgs/desktops/gnome-3/core/rygel/add-option-for-installation-sysconfdir.patch deleted file mode 100644 index 6fe651b9cbb47..0000000000000 --- a/pkgs/desktops/gnome-3/core/rygel/add-option-for-installation-sysconfdir.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/meson.build b/meson.build -index 4aa683d6..a930d533 100644 ---- a/meson.build -+++ b/meson.build -@@ -20,7 +20,11 @@ if not get_option('uninstalled') - rygel_datadir = join_paths(get_option('prefix'), get_option('datadir'), 'rygel') - rygel_libexecdir = join_paths(get_option('prefix'), get_option('libexecdir'), - 'rygel') -- rygel_sysconfdir = join_paths(get_option('prefix'), get_option('sysconfdir')) -+ if get_option('sysconfdir_install') != '' -+ rygel_sysconfdir = join_paths(get_option('prefix'), get_option('sysconfdir_install')) -+ else -+ rygel_sysconfdir = join_paths(get_option('prefix'), get_option('sysconfdir')) -+ endif - rygel_plugindir = join_paths(rygel_libdir, 'rygel-2.6', 'plugins') - rygel_enginedir = join_paths(rygel_libdir, 'rygel-2.6', 'engines') - rygel_presetdir = join_paths(rygel_datadir, 'presets') -@@ -55,7 +59,7 @@ conf.set_quoted('DATA_DIR', rygel_datadir) - conf.set_quoted('PLUGIN_DIR', rygel_plugindir) - conf.set_quoted('BIG_ICON_DIR', rygel_bigicondir) - conf.set_quoted('SMALL_ICON_DIR', rygel_smallicondir) --conf.set_quoted('SYS_CONFIG_DIR', rygel_sysconfdir) -+conf.set_quoted('SYS_CONFIG_DIR', get_option('sysconfdir')) - conf.set_quoted('LOCALEDIR', join_paths(get_option('prefix'), get_option('localedir'))) - conf.set_quoted('MX_EXTRACT_PATH', join_paths(rygel_libexecdir, 'mx-extract')) - conf.set_quoted('DESKTOP_DIR', join_paths(get_option('prefix'), get_option('datadir'), 'applications')) -diff --git a/meson_options.txt b/meson_options.txt -index cb604c4e..1b049b77 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -1,6 +1,7 @@ - option('uninstalled', type: 'boolean', value: 'false', description: 'Run Rygel from build directory only') - option('api-docs', type: 'boolean', value: 'false', description: 'Build the API documentation') - option('systemd-user-units-dir', type : 'string', value : 'auto', description : 'Where to install the systemd user unit (use special values "auto" or "none", or pass a path') -+option('sysconfdir_install', type: 'string', value: '', description: 'sysconfdir to use during installation') - option('plugins', type : 'array', choices : ['external', 'gst-launch', 'lms', 'media-export', 'mpris', 'playbin', 'ruih', 'tracker', 'tracker3']) - option('engines', type : 'array', choices : ['simple', 'gstreamer']) - option('examples', type : 'boolean', value : 'true') diff --git a/pkgs/desktops/gnome-3/core/rygel/default.nix b/pkgs/desktops/gnome-3/core/rygel/default.nix deleted file mode 100644 index da82d30214ee3..0000000000000 --- a/pkgs/desktops/gnome-3/core/rygel/default.nix +++ /dev/null @@ -1,110 +0,0 @@ -{ lib, stdenv -, fetchurl -, meson -, ninja -, pkg-config -, vala -, gettext -, libxml2 -, gobject-introspection -, wrapGAppsHook -, python3 -, glib -, gssdp -, gupnp -, gupnp-av -, gupnp-dlna -, gst_all_1 -, libgee -, libsoup -, gtk3 -, libmediaart -, sqlite -, systemd -, tracker -, shared-mime-info -, gnome3 -}: - -stdenv.mkDerivation rec { - pname = "rygel"; - version = "0.40.1"; - - # TODO: split out lib - outputs = [ "out" "dev" ]; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "QkDXd1mcjNCeZ9pEzLOV0KbceEedgJzWIZgixbVooy0="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - vala - gettext - libxml2 - gobject-introspection - wrapGAppsHook - python3 - ]; - - buildInputs = [ - glib - gssdp - gupnp - gupnp-av - gupnp-dlna - libgee - libsoup - gtk3 - libmediaart - sqlite - systemd - tracker - shared-mime-info - ] ++ (with gst_all_1; [ - gstreamer - gst-editing-services - gst-plugins-base - gst-plugins-good - gst-plugins-bad - gst-plugins-ugly - ]); - - mesonFlags = [ - "-Dsystemd-user-units-dir=${placeholder "out"}/lib/systemd/user" - "-Dapi-docs=false" - "--sysconfdir=/etc" - "-Dsysconfdir_install=${placeholder "out"}/etc" - # Build all plug-ins except for tracker 2 - "-Dplugins=external,gst-launch,lms,media-export,mpris,playbin,ruih,tracker3" - ]; - - doCheck = true; - - patches = [ - ./add-option-for-installation-sysconfdir.patch - ]; - - postPatch = '' - patchShebangs data/xml/process-xml.py - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - versionPolicy = "odd-unstable"; - }; - }; - - meta = with lib; { - description = "A home media solution (UPnP AV MediaServer) that allows you to easily share audio, video and pictures to other devices"; - homepage = "https://wiki.gnome.org/Projects/Rygel"; - license = licenses.lgpl21Plus; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix deleted file mode 100644 index 59d61febc06ac..0000000000000 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ lib, stdenv -, fetchurl -, meson -, ninja -, pkg-config -, gettext -, itstool -, python3 -, wrapGAppsHook -, cairo -, gdk-pixbuf -, colord -, glib -, gtk3 -, gusb -, packagekit -, libhandy -, libwebp -, libxml2 -, sane-backends -, vala -, gnome3 -, gobject-introspection -}: - -stdenv.mkDerivation rec { - pname = "simple-scan"; - version = "40.0"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-E4EbsqhhnmOkP8Lva3E1ny1cQITG1cizqtYXJLIHUa8="; - }; - - nativeBuildInputs = [ - meson - ninja - gettext - itstool - pkg-config - python3 - wrapGAppsHook - libxml2 - gobject-introspection # For setup hook - ]; - - buildInputs = [ - cairo - gdk-pixbuf - colord - glib - gnome3.adwaita-icon-theme - gusb - gtk3 - libhandy - libwebp - packagekit - sane-backends - vala - ]; - - postPatch = '' - patchShebangs data/meson_compile_gschema.py - ''; - - doCheck = true; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "simple-scan"; - }; - }; - - meta = with lib; { - description = "Simple scanning utility"; - longDescription = '' - A really easy way to scan both documents and photos. You can crop out the - bad parts of a photo and rotate it if it is the wrong way round. You can - print your scans, export them to pdf, or save them in a range of image - formats. Basically a frontend for SANE - which is the same backend as - XSANE uses. This means that all existing scanners will work and the - interface is well tested. - ''; - homepage = "https://gitlab.gnome.org/GNOME/simple-scan"; - license = licenses.gpl3Plus; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix deleted file mode 100644 index 73097f99e516c..0000000000000 --- a/pkgs/desktops/gnome-3/core/sushi/default.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ lib, stdenv -, fetchurl -, pkg-config -, meson -, gettext -, gobject-introspection -, glib -, gnome3 -, gtksourceview4 -, gjs -, webkitgtk -, libmusicbrainz5 -, icu -, wrapGAppsHook -, gst_all_1 -, gdk-pixbuf -, librsvg -, gtk3 -, harfbuzz -, ninja -, epoxy -}: - -stdenv.mkDerivation rec { - pname = "sushi"; - version = "3.38.0"; - - src = fetchurl { - url = "mirror://gnome/sources/sushi/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0vlqqk916dymv4asbyvalp1m096a5hh99nx23i4xavzvgygh4h2h"; - }; - - nativeBuildInputs = [ - pkg-config - meson - ninja - gettext - gobject-introspection - wrapGAppsHook - ]; - - buildInputs = [ - glib - gtk3 - gnome3.evince - icu - harfbuzz - gjs - gtksourceview4 - gdk-pixbuf - librsvg - libmusicbrainz5 - webkitgtk - epoxy - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - ]; - - # See https://github.com/NixOS/nixpkgs/issues/31168 - postInstall = '' - for file in $out/libexec/org.gnome.NautilusPreviewer - do - sed -e $"2iimports.package._findEffectiveEntryPointName = () => \'$(basename $file)\' " \ - -i $file - done - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "sushi"; - attrPath = "gnome3.sushi"; - }; - }; - - meta = with lib; { - homepage = "https://en.wikipedia.org/wiki/Sushi_(software)"; - description = "A quick previewer for Nautilus"; - maintainers = teams.gnome.members; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix deleted file mode 100644 index a98265ff508b5..0000000000000 --- a/pkgs/desktops/gnome-3/core/totem/default.nix +++ /dev/null @@ -1,123 +0,0 @@ -{ lib, stdenv -, fetchurl -, meson -, ninja -, gettext -, gst_all_1 -, clutter-gtk -, clutter-gst -, python3Packages -, shared-mime-info -, pkg-config -, gtk3 -, glib -, gobject-introspection -, totem-pl-parser -, wrapGAppsHook -, itstool -, libxml2 -, vala -, gnome3 -, grilo -, grilo-plugins -, libpeas -, adwaita-icon-theme -, gnome-desktop -, gsettings-desktop-schemas -, gdk-pixbuf -, xvfb_run -}: - -stdenv.mkDerivation rec { - pname = "totem"; - version = "3.38.0"; - - src = fetchurl { - url = "mirror://gnome/sources/totem/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0bs33ijvxbr2prb9yj4dxglsszslsn9k258n311sld84masz4ad8"; - }; - - nativeBuildInputs = [ - meson - ninja - vala - pkg-config - gettext - python3Packages.python - itstool - gobject-introspection - wrapGAppsHook - ]; - - buildInputs = [ - gtk3 - glib - grilo - clutter-gtk - clutter-gst - totem-pl-parser - grilo-plugins - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - gst_all_1.gst-plugins-bad - gst_all_1.gst-plugins-ugly - gst_all_1.gst-libav - libpeas - shared-mime-info - gdk-pixbuf - libxml2 - adwaita-icon-theme - gnome-desktop - gsettings-desktop-schemas - # for plug-ins - python3Packages.pygobject3 - python3Packages.dbus-python - ]; - - checkInputs = [ - xvfb_run - ]; - - mesonFlags = [ - # TODO: https://github.com/NixOS/nixpkgs/issues/36468 - "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" - ]; - - # Tests do not work with GStreamer 1.18. - # https://gitlab.gnome.org/GNOME/totem/-/issues/450 - doCheck = false; - - postPatch = '' - chmod +x meson_compile_python.py meson_post_install.py # patchShebangs requires executable file - patchShebangs \ - ./meson_compile_python.py \ - ./meson_post_install.py - ''; - - checkPhase = '' - runHook preCheck - - xvfb-run -s '-screen 0 800x600x24' \ - ninja test - - runHook postCheck - ''; - - wrapPrefixVariables = [ "PYTHONPATH" ]; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "totem"; - attrPath = "gnome3.totem"; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Videos"; - description = "Movie player for the GNOME desktop based on GStreamer"; - maintainers = teams.gnome.members; - license = licenses.gpl2Plus; # with exception to allow use of non-GPL compatible plug-ins - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix deleted file mode 100644 index c5e859954fff4..0000000000000 --- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib, stdenv -, gettext -, fetchurl -, pkg-config -, itstool -, libxml2 -, libxslt -, gnome3 -}: - -stdenv.mkDerivation rec { - pname = "yelp-xsl"; - version = "40.0"; - - src = fetchurl { - url = "mirror://gnome/sources/yelp-xsl/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Nh7NTTP8zbO7CKaH9g5cPpCdLp47Ai2ETgSYINDPYrA="; - }; - - nativeBuildInputs = [ - pkg-config - gettext - itstool - libxml2 - libxslt - ]; - - doCheck = true; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Yelp"; - description = "Yelp's universal stylesheets for Mallard and DocBook"; - maintainers = teams.gnome.members; - license = with licenses; [ - # See https://gitlab.gnome.org/GNOME/yelp-xsl/blob/master/COPYING - # Stylesheets - lgpl2Plus - # Icons, unclear: https://gitlab.gnome.org/GNOME/yelp-xsl/issues/25 - gpl2 - # highlight.js - bsd3 - ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix deleted file mode 100644 index 1e1d679f852ed..0000000000000 --- a/pkgs/desktops/gnome-3/core/yelp/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, gettext, fetchurl, webkitgtk, pkg-config, gtk3, glib -, gnome3, sqlite -, itstool, libxml2, libxslt, gst_all_1 -, wrapGAppsHook }: - -stdenv.mkDerivation rec { - pname = "yelp"; - version = "40.0"; - - src = fetchurl { - url = "mirror://gnome/sources/yelp/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-B3dfoGzSg2Xs2Cm7FqhaaCiXqyHYzONFlrvvXNRVquA="; - }; - - nativeBuildInputs = [ pkg-config gettext itstool wrapGAppsHook ]; - buildInputs = [ - gtk3 glib webkitgtk sqlite - libxml2 libxslt gnome3.yelp-xsl - gnome3.adwaita-icon-theme - gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - ]; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "yelp"; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Yelp"; - description = "The help viewer in Gnome"; - maintainers = teams.gnome.members; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/zenity/default.nix b/pkgs/desktops/gnome-3/core/zenity/default.nix deleted file mode 100644 index d02cb581cb8cc..0000000000000 --- a/pkgs/desktops/gnome-3/core/zenity/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib, stdenv -, fetchurl -, pkg-config -, libxml2 -, gnome3 -, gtk3 -, yelp-tools -, gettext -, libX11 -, itstool -, wrapGAppsHook -}: - -stdenv.mkDerivation rec { - pname = "zenity"; - version = "3.32.0"; - - src = fetchurl { - url = "mirror://gnome/sources/zenity/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "15fdh8xfdhnwcynyh4byx3mrjxbyprqnwxzi7qn3g5wwaqryg1p7"; - }; - - nativeBuildInputs = [ - pkg-config - gettext - yelp-tools - itstool - libxml2 - wrapGAppsHook - ]; - - buildInputs = [ - gtk3 - libX11 - ]; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "zenity"; - attrPath = "gnome3.zenity"; - }; - }; - - meta = with lib; { - description = "Tool to display dialogs from the commandline and shell scripts"; - homepage = "https://wiki.gnome.org/Projects/Zenity"; - platforms = platforms.linux; - maintainers = teams.gnome.members; - }; -} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix deleted file mode 100644 index 7d72e16c326d9..0000000000000 --- a/pkgs/desktops/gnome-3/default.nix +++ /dev/null @@ -1,364 +0,0 @@ -{ config, pkgs, lib }: - -lib.makeScope pkgs.newScope (self: with self; { - updateScript = callPackage ./update.nix { }; - - /* Remove packages of packagesToRemove from packages, based on their names - - Type: - removePackagesByName :: [package] -> [package] -> [package] - - Example: - removePackagesByName [ nautilus file-roller ] [ file-roller totem ] - => [ nautilus ] - */ - removePackagesByName = packages: packagesToRemove: - let - namesToRemove = map lib.getName packagesToRemove; - in - lib.filter (x: !(builtins.elem (lib.getName x) namesToRemove)) packages; - - libsoup = pkgs.libsoup.override { gnomeSupport = true; }; - libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; - gnome3 = self // { recurseForDerivations = false; }; - -# ISO installer -# installerIso = callPackage ./installer.nix {}; - -#### Core (http://ftp.acc.umu.se/pub/GNOME/core/) - - adwaita-icon-theme = callPackage ./core/adwaita-icon-theme { }; - - baobab = callPackage ./core/baobab { }; - - caribou = callPackage ./core/caribou { }; - - dconf-editor = callPackage ./core/dconf-editor { }; - - empathy = callPackage ./core/empathy { }; - - epiphany = callPackage ./core/epiphany { }; - - evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests - - evolution-data-server = callPackage ./core/evolution-data-server { }; - - gdm = callPackage ./core/gdm { }; - - gnome-backgrounds = callPackage ./core/gnome-backgrounds { }; - - gnome-bluetooth = callPackage ./core/gnome-bluetooth { }; - - gnome-color-manager = callPackage ./core/gnome-color-manager { }; - - gnome-contacts = callPackage ./core/gnome-contacts { }; - - gnome-control-center = callPackage ./core/gnome-control-center { }; - - gnome-calculator = callPackage ./core/gnome-calculator { }; - - gnome-common = callPackage ./core/gnome-common { }; - - gnome-desktop = callPackage ./core/gnome-desktop { }; - - gnome-dictionary = callPackage ./core/gnome-dictionary { }; - - gnome-disk-utility = callPackage ./core/gnome-disk-utility { }; - - gnome-font-viewer = callPackage ./core/gnome-font-viewer { }; - - gnome-keyring = callPackage ./core/gnome-keyring { }; - - libgnome-keyring = callPackage ./core/libgnome-keyring { }; - - gnome-initial-setup = callPackage ./core/gnome-initial-setup { }; - - gnome-online-miners = callPackage ./core/gnome-online-miners { }; - - gnome-remote-desktop = callPackage ./core/gnome-remote-desktop { }; - - gnome-session = callPackage ./core/gnome-session { }; - - gnome-session-ctl = callPackage ./core/gnome-session/ctl.nix { }; - - gnome-shell = callPackage ./core/gnome-shell { }; - - gnome-shell-extensions = callPackage ./core/gnome-shell-extensions { }; - - gnome-screenshot = callPackage ./core/gnome-screenshot { }; - - gnome-settings-daemon = callPackage ./core/gnome-settings-daemon { }; - - gnome-software = callPackage ./core/gnome-software { }; - - gnome-system-monitor = callPackage ./core/gnome-system-monitor { }; - - gnome-terminal = callPackage ./core/gnome-terminal { }; - - gnome-themes-extra = callPackage ./core/gnome-themes-extra { }; - - gnome-user-share = callPackage ./core/gnome-user-share { }; - - gucharmap = callPackage ./core/gucharmap { }; - - gvfs = pkgs.gvfs.override { gnomeSupport = true; }; - - eog = callPackage ./core/eog { }; - - mutter = callPackage ./core/mutter { }; - - # Needed for elementary's gala and greeter until 3.36 support has more bugfixes - # https://github.com/elementary/gala/issues/763 - mutter334 = callPackage ./core/mutter/3.34 { }; - - nautilus = callPackage ./core/nautilus { }; - - networkmanager-openvpn = pkgs.networkmanager-openvpn.override { - withGnome = true; - }; - - networkmanager-vpnc = pkgs.networkmanager-vpnc.override { - withGnome = true; - }; - - networkmanager-openconnect = pkgs.networkmanager-openconnect.override { - withGnome = true; - }; - - networkmanager-fortisslvpn = pkgs.networkmanager-fortisslvpn.override { - withGnome = true; - }; - - networkmanager-l2tp = pkgs.networkmanager-l2tp.override { - withGnome = true; - }; - - networkmanager-iodine = pkgs.networkmanager-iodine.override { - withGnome = true; - }; - - rygel = callPackage ./core/rygel { }; - - simple-scan = callPackage ./core/simple-scan { }; - - sushi = callPackage ./core/sushi { }; - - totem = callPackage ./core/totem { }; - - yelp = callPackage ./core/yelp { }; - - yelp-xsl = callPackage ./core/yelp-xsl { }; - - zenity = callPackage ./core/zenity { }; - - -#### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/) - - accerciser = callPackage ./apps/accerciser { }; - - cheese = callPackage ./apps/cheese { }; - - file-roller = callPackage ./apps/file-roller { }; - - gedit = callPackage ./apps/gedit { }; - - ghex = callPackage ./apps/ghex { }; - - gnome-books = callPackage ./apps/gnome-books { }; - - gnome-boxes = callPackage ./apps/gnome-boxes { }; - - gnome-calendar = callPackage ./apps/gnome-calendar { }; - - gnome-characters = callPackage ./apps/gnome-characters { }; - - gnome-clocks = callPackage ./apps/gnome-clocks { }; - - gnome-documents = callPackage ./apps/gnome-documents { }; - - gnome-logs = callPackage ./apps/gnome-logs { }; - - gnome-maps = callPackage ./apps/gnome-maps { }; - - gnome-music = callPackage ./apps/gnome-music { }; - - gnome-nettool = callPackage ./apps/gnome-nettool { }; - - gnome-notes = callPackage ./apps/gnome-notes { }; - - gnome-power-manager = callPackage ./apps/gnome-power-manager { }; - - gnome-sound-recorder = callPackage ./apps/gnome-sound-recorder { }; - - gnome-todo = callPackage ./apps/gnome-todo {}; - - gnome-weather = callPackage ./apps/gnome-weather { }; - - polari = callPackage ./apps/polari { }; - - seahorse = callPackage ./apps/seahorse { }; - - vinagre = callPackage ./apps/vinagre { }; - -#### Dev http://ftp.gnome.org/pub/GNOME/devtools/ - - anjuta = callPackage ./devtools/anjuta { }; - - devhelp = callPackage ./devtools/devhelp { }; - - gnome-devel-docs = callPackage ./devtools/gnome-devel-docs { }; - -#### Games - - aisleriot = callPackage ./games/aisleriot { }; - - atomix = callPackage ./games/atomix { }; - - five-or-more = callPackage ./games/five-or-more { }; - - four-in-a-row = callPackage ./games/four-in-a-row { }; - - gnome-chess = callPackage ./games/gnome-chess { }; - - gnome-klotski = callPackage ./games/gnome-klotski { }; - - gnome-mahjongg = callPackage ./games/gnome-mahjongg { }; - - gnome-mines = callPackage ./games/gnome-mines { }; - - gnome-nibbles = callPackage ./games/gnome-nibbles { }; - - gnome-robots = callPackage ./games/gnome-robots { }; - - gnome-sudoku = callPackage ./games/gnome-sudoku { }; - - gnome-taquin = callPackage ./games/gnome-taquin { }; - - gnome-tetravex = callPackage ./games/gnome-tetravex { }; - - hitori = callPackage ./games/hitori { }; - - iagno = callPackage ./games/iagno { }; - - lightsoff = callPackage ./games/lightsoff { }; - - swell-foop = callPackage ./games/swell-foop { }; - - tali = callPackage ./games/tali { }; - - quadrapassel = callPackage ./games/quadrapassel { }; - -#### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/ - - geary = callPackage ./misc/geary { }; - - gitg = callPackage ./misc/gitg { }; - - libgnome-games-support = callPackage ./misc/libgnome-games-support { }; - - gnome-applets = callPackage ./misc/gnome-applets { }; - - gnome-flashback = callPackage ./misc/gnome-flashback { }; - - gnome-panel = callPackage ./misc/gnome-panel { - autoreconfHook = pkgs.autoreconfHook269; - }; - - gnome-tweaks = callPackage ./misc/gnome-tweaks { }; - - gpaste = callPackage ./misc/gpaste { }; - - metacity = callPackage ./misc/metacity { }; - - nautilus-python = callPackage ./misc/nautilus-python { }; - - gtkhtml = callPackage ./misc/gtkhtml { enchant = pkgs.enchant1; }; - - pomodoro = callPackage ./misc/pomodoro { }; - - gnome-autoar = callPackage ./misc/gnome-autoar { }; - - gnome-packagekit = callPackage ./misc/gnome-packagekit { }; -} // lib.optionalAttrs (config.allowAliases or true) { -#### Legacy aliases - - bijiben = gnome-notes; # added 2018-09-26 - evolution_data_server = evolution-data-server; # added 2018-02-25 - geocode_glib = pkgs.geocode-glib; # added 2018-02-25 - glib_networking = pkgs.glib-networking; # added 2018-02-25 - gnome_common = gnome-common; # added 2018-02-25 - gnome_control_center = gnome-control-center; # added 2018-02-25 - gnome_desktop = gnome-desktop; # added 2018-02-25 - gnome_keyring = gnome-keyring; # added 2018-02-25 - gnome_online_accounts = gnome-online-accounts; # added 2018-02-25 - gnome_session = gnome-session; # added 2018-02-25 - gnome_settings_daemon = gnome-settings-daemon; # added 2018-02-25 - gnome_shell = gnome-shell; # added 2018-02-25 - gnome_terminal = gnome-terminal; # added 2018-02-25 - gnome-themes-standard = gnome-themes-extra; # added 2018-03-14 - gnome_themes_standard = gnome-themes-standard; # added 2018-02-25 - gnome-tweak-tool = gnome-tweaks; # added 2018-03-21 - gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25 - libgames-support = libgnome-games-support; # added 2018-03-14 - libgnome_keyring = libgnome-keyring; # added 2018-02-25 - inherit (pkgs) rarian; # added 2018-04-25 - networkmanager_fortisslvpn = networkmanager-fortisslvpn; # added 2018-02-25 - networkmanager_iodine = networkmanager-iodine; # added 2018-02-25 - networkmanager_l2tp = networkmanager-l2tp; # added 2018-02-25 - networkmanager_openconnect = networkmanager-openconnect; # added 2018-02-25 - networkmanager_openvpn = networkmanager-openvpn; # added 2018-02-25 - networkmanager_vpnc = networkmanager-vpnc; # added 2018-02-25 - yelp_xsl = yelp-xsl; # added 2018-02-25 - yelp_tools = yelp-tools; # added 2018-02-25 - - # added 2019-02-08 - inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3 - libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4 - easytag meld orca rhythmbox shotwell gnome-usage - clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 gnome-menus gdl; - inherit (pkgs) gsettings-desktop-schemas; # added 2019-04-16 - inherit (pkgs) gnome-video-effects; # added 2019-08-19 - inherit (pkgs) gnome-online-accounts grilo grilo-plugins tracker tracker-miners gnome-photos; # added 2019-08-23 - inherit (pkgs) glib-networking; # added 2019-09-02 - inherit (pkgs) nemiver; # added 2019-09-09 - - defaultIconTheme = adwaita-icon-theme; - gtk = gtk3; - gtkmm = gtkmm3; - rest = librest; - - pidgin-im-gnome-shell-extension = pkgs.gnomeExtensions.pidgin-im-integration; # added 2019-08-01 - - # added 2019-08-25 - corePackages = throw "gnome3.corePackages is removed since 2019-08-25: please use `services.gnome3.core-shell.enable`"; - optionalPackages = throw "gnome3.optionalPackages is removed since 2019-08-25: please use `services.gnome3.core-utilities.enable`"; - gamesPackages = throw "gnome3.gamesPackages is removed since 2019-08-25: please use `services.gnome3.games.enable`"; - - nautilus-sendto = throw "nautilus-sendto is removed since 2019-09-17: abandoned upstream"; - - inherit (pkgs) vala; # added 2019-10-10 - - inherit (pkgs) gnome-user-docs; # added 2019-11-20 - - inherit (pkgs) gegl_0_4; # added 2019-10-31 - - inherit (pkgs) gjs; # added 2019-01-05 - - inherit (pkgs) yelp-tools; # added 2019-11-20 - - inherit (pkgs) dconf; # added 2019-11-30 - - inherit (pkgs) networkmanagerapplet; # added 2019-12-12 - - inherit (pkgs) glade; # added 2020-05-15 - - vino = throw "vino is deprecated, use gnome-remote-desktop instead."; # added 2020-03-13 - - gnome-screensaver = throw "gnome-screensaver is deprecated. If you are using GNOME Flashback, it now has a built-in lock screen. If you are using it elsewhere, you can try xscreenlock or other alternatives."; # added 2020-03-19 - - maintainers = lib.teams.gnome.members; - - mutter328 = throw "Removed as Pantheon is upgraded to mutter334."; - - gnome-getting-started-docs = throw "Removed in favour of gnome-tour."; -}) diff --git a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix deleted file mode 100644 index 4802287cb1221..0000000000000 --- a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, gjs, flex, bison, libxml2, intltool, - gdl, libgda, gtksourceview, gsettings-desktop-schemas, - itstool, python3, ncurses, makeWrapper }: - -stdenv.mkDerivation rec { - pname = "anjuta"; - version = "3.34.0"; - - src = fetchurl { - url = "mirror://gnome/sources/anjuta/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "13ql7axw6zz387s7pa1m7wmh7qps3x7fk53h9832vq1yxlq33aa2"; - }; - - passthru = { - updateScript = gnome3.updateScript { packageName = "anjuta"; attrPath = "gnome3.anjuta"; }; - }; - - enableParallelBuilding = true; - - nativeBuildInputs = [ - pkg-config intltool itstool python3 makeWrapper - # Required by python3 - ncurses - ]; - buildInputs = [ - flex bison gtk3 libxml2 gjs gdl - libgda gtksourceview - gsettings-desktop-schemas - ]; - - preFixup = '' - wrapProgram $out/bin/anjuta \ - --prefix XDG_DATA_DIRS : \ - "$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with lib; { - description = "Software development studio"; - homepage = "http://anjuta.org/"; - license = licenses.gpl2; - maintainers = with maintainers; []; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix deleted file mode 100644 index 9a68f151b4ad5..0000000000000 --- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ lib, stdenv -, fetchurl -, meson -, ninja -, pkg-config -, gnome3 -, gtk3 -, wrapGAppsHook -, glib -, amtk -, appstream-glib -, gobject-introspection -, python3 -, webkitgtk -, gettext -, itstool -, gsettings-desktop-schemas -, shared-mime-info -}: - -stdenv.mkDerivation rec { - pname = "devhelp"; - version = "40.0"; - - src = fetchurl { - url = "mirror://gnome/sources/devhelp/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0zr64qp5c6jcc3x5hmfp7jhzpi96qwr6xplyfkmz4kjzvr9xidjd"; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gettext - itstool - wrapGAppsHook - appstream-glib - gobject-introspection - python3 - ]; - - buildInputs = [ - glib - gtk3 - webkitgtk - amtk - gnome3.adwaita-icon-theme - gsettings-desktop-schemas - ]; - - doCheck = true; - - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - ''; - - preFixup = '' - gappsWrapperArgs+=( - # Fix pages being blank - # https://gitlab.gnome.org/GNOME/devhelp/issues/14 - --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" - ) - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "devhelp"; - attrPath = "gnome3.devhelp"; - }; - }; - - meta = with lib; { - description = "API documentation browser for GNOME"; - homepage = "https://wiki.gnome.org/Apps/Devhelp"; - license = licenses.gpl3Plus; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix deleted file mode 100644 index 6349a318456c7..0000000000000 --- a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }: - -stdenv.mkDerivation rec { - pname = "gnome-devel-docs"; - version = "40.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-devel-docs/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0zqp01ks8m3s6jn5xqd05rw4fwbvxy5qvcfg9g50b2ar2j7v1ar8"; - }; - - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-devel-docs"; attrPath = "gnome3.gnome-devel-docs"; }; - }; - - buildInputs = [ intltool itstool libxml2 ]; - - meta = with lib; { - homepage = "https://github.com/GNOME/gnome-devel-docs"; - description = "Developer documentation for GNOME"; - maintainers = teams.gnome.members; - license = licenses.fdl12; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/extensions/EasyScreenCast/default.nix b/pkgs/desktops/gnome-3/extensions/EasyScreenCast/default.nix deleted file mode 100644 index fa1d89173fdd6..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/EasyScreenCast/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, glib, gnome3, gettext }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-EasyScreenCast"; - version = "unstable-2020-11-25"; - - src = fetchFromGitHub { - # To make it work with gnome 3.38, using effectively: https://github.com/EasyScreenCast/EasyScreenCast/pull/276 - owner = "Ian2020"; - repo = "EasyScreenCast"; - rev = "b1ab4a999bc7110ecbf68b5fe42c37fa67d7cb0d"; - sha256 = "s9b0ITKUzgG6XOd1bK7i3mGxfc+T+UHrTZhBp0Ff8zQ="; - }; - - patches = [ - (substituteAll { - src = ./fix-gi-path.patch; - gnomeShell = gnome3.gnome-shell; - }) - ]; - - nativeBuildInputs = [ - glib gettext - ]; - - makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ]; - - uuid = "EasyScreenCast@iacopodeenosee.gmail.com"; - - meta = with lib; { - description = "Simplifies the use of the video recording function integrated in gnome shell"; - homepage = "https://github.com/EasyScreenCast/EasyScreenCast"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ doronbehar ]; - platforms = platforms.linux; - }; -} - diff --git a/pkgs/desktops/gnome-3/extensions/EasyScreenCast/fix-gi-path.patch b/pkgs/desktops/gnome-3/extensions/EasyScreenCast/fix-gi-path.patch deleted file mode 100644 index 2d32021b6c665..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/EasyScreenCast/fix-gi-path.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git i/utilaudio.js w/utilaudio.js -index 983b29c..7a94de8 100644 ---- i/utilaudio.js -+++ w/utilaudio.js -@@ -11,10 +11,7 @@ - */ - - const GIRepository = imports.gi.GIRepository; --GIRepository.Repository.prepend_search_path("/usr/lib/gnome-shell"); --GIRepository.Repository.prepend_library_path("/usr/lib/gnome-shell"); --GIRepository.Repository.prepend_search_path("/usr/lib64/gnome-shell"); --GIRepository.Repository.prepend_library_path("/usr/lib64/gnome-shell"); -+GIRepository.Repository.prepend_search_path("@gnomeShell@/lib/gnome-shell"); - const Gvc = imports.gi.Gvc; - const Lang = imports.lang; - diff --git a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix deleted file mode 100644 index aaf8c92c672db..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, gnome3 }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-appindicator"; - version = "36"; - - src = fetchFromGitHub { - owner = "Ubuntu"; - repo = "gnome-shell-extension-appindicator"; - rev = "v${version}"; - sha256 = "1nx1lgrrp3w5z5hymb91frjdvdkk7x677my5v4jjd330ihqa02dq"; - }; - - # This package has a Makefile, but it's used for building a zip for - # publication to extensions.gnome.org. Disable the build phase so - # installing doesn't build an unnecessary release. - dontBuild = true; - - uuid = "appindicatorsupport@rgcjonas.gmail.com"; - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions/${uuid} - cp *.js $out/share/gnome-shell/extensions/${uuid} - cp -r interfaces-xml $out/share/gnome-shell/extensions/${uuid} - cp metadata.json $out/share/gnome-shell/extensions/${uuid} - runHook postInstall - ''; - - meta = with lib; { - description = "AppIndicator/KStatusNotifierItem support for GNOME Shell"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ jonafato ]; - platforms = gnome3.gnome-shell.meta.platforms; - homepage = "https://github.com/Ubuntu/gnome-shell-extension-appindicator"; - }; -} diff --git a/pkgs/desktops/gnome-3/extensions/arcmenu/default.nix b/pkgs/desktops/gnome-3/extensions/arcmenu/default.nix deleted file mode 100644 index 851a816c61c73..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/arcmenu/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchFromGitLab, glib, gettext, substituteAll, gnome-menus }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-arcmenu"; - version = "5"; - - src = fetchFromGitLab { - owner = "arcmenu"; - repo = "ArcMenu"; - rev = "v${version}"; - sha256 = "1w4avvnp08l7lkf76vc7wvfn1cd81l4r4dhz8qnai49rvrjgqcg3"; - }; - - patches = [ - (substituteAll { - src = ./fix_gmenu.patch; - gmenu_path = "${gnome-menus}/lib/girepository-1.0"; - }) - ]; - - buildInputs = [ - glib gettext - ]; - - makeFlags = [ "INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions" ]; - - uuid = "arcmenu@arcmenu.com"; - - meta = with lib; { - description = "Application menu for GNOME Shell, designed to provide a more traditional user experience and workflow"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ dkabot ]; - homepage = "https://gitlab.com/arcmenu/ArcMenu"; - }; -} diff --git a/pkgs/desktops/gnome-3/extensions/arcmenu/fix_gmenu.patch b/pkgs/desktops/gnome-3/extensions/arcmenu/fix_gmenu.patch deleted file mode 100644 index 5d8584f52a6aa..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/arcmenu/fix_gmenu.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/extension.js -+++ b/extension.js -@@ -23,6 +23,8 @@ - - const Me = imports.misc.extensionUtils.getCurrentExtension(); - -+imports.gi.GIRepository.Repository.prepend_search_path('@gmenu_path@'); -+ - const {GLib, Gio, St} = imports.gi; - const Constants = Me.imports.constants; - const Controller = Me.imports.controller; diff --git a/pkgs/desktops/gnome-3/extensions/caffeine/default.nix b/pkgs/desktops/gnome-3/extensions/caffeine/default.nix deleted file mode 100644 index 41155391f89c5..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/caffeine/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, glib, gettext, bash, gnome3 }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-caffeine"; - version = "37"; - - src = fetchFromGitHub { - owner = "eonpatapon"; - repo = "gnome-shell-extension-caffeine"; - rev = "v${version}"; - sha256 = "1mpa0fbpmv3pblb20dxj8iykn4ayvx89qffpcs67bzlq597zsbkb"; - }; - - uuid = "caffeine@patapon.info"; - - nativeBuildInputs = [ - glib gettext - ]; - - buildPhase = '' - runHook preBuild - ${bash}/bin/bash ./update-locale.sh - glib-compile-schemas --strict --targetdir=caffeine@patapon.info/schemas/ caffeine@patapon.info/schemas - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions - cp -r ${uuid} $out/share/gnome-shell/extensions - runHook postInstall - ''; - - meta = with lib; { - description = "Fill the cup to inhibit auto suspend and screensaver"; - license = licenses.gpl2; - maintainers = with maintainers; [ eperuffo ]; - homepage = "https://github.com/eonpatapon/gnome-shell-extension-caffeine"; - }; -} diff --git a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix deleted file mode 100644 index f6adf85de4d00..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ lib, stdenv -, fetchurl -, cmake -, ninja -, jq -, python3 -, gnome3 -, wrapGAppsHook -, gobject-introspection -}: - -let - inherit (python3.pkgs) python pygobject3 requests; -in -stdenv.mkDerivation rec { - pname = "chrome-gnome-shell"; - version = "10.1"; - - src = fetchurl { - url = "mirror://gnome/sources/chrome-gnome-shell/${version}/${pname}-${version}.tar.xz"; - sha256 = "0f54xyamm383ypbh0ndkza0pif6ljddg2f947p265fkqj3p4zban"; - }; - - nativeBuildInputs = [ - cmake - ninja - jq - wrapGAppsHook - gobject-introspection # for setup-hook - ]; - - buildInputs = [ - gnome3.gnome-shell - python - pygobject3 - requests - gobject-introspection # for Gio typelib - ]; - - cmakeFlags = [ - "-DBUILD_EXTENSION=OFF" - ]; - - wrapPrefixVariables = [ - "PYTHONPATH" - ]; - - # cmake setup hook changes /etc/opt into /var/empty - dontFixCmake = true; - - preConfigure = '' - substituteInPlace CMakeLists.txt --replace "/etc" "$out/etc" - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "chrome-gnome-shell"; - }; - }; - - meta = with lib; { - description = "GNOME Shell integration for Chrome"; - homepage = "https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome"; - longDescription = '' - To use the integration, install the browser extension, and then set to true. - ''; - license = licenses.gpl3; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix b/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix deleted file mode 100644 index ee64fc5113d05..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-clipboard-indicator"; - version = "37"; - - src = fetchFromGitHub { - owner = "Tudmotu"; - repo = "gnome-shell-extension-clipboard-indicator"; - rev = "v${version}"; - sha256 = "0npxhaam2ra2b9zh2gk2q0n5snlhx6glz86m3jf8hz037w920k41"; - }; - - uuid = "clipboard-indicator@tudmotu.com"; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions/${uuid} - cp -r * $out/share/gnome-shell/extensions/${uuid} - runHook postInstall - ''; - - meta = with lib; { - description = "Adds a clipboard indicator to the top panel and saves clipboard history"; - license = licenses.mit; - maintainers = with maintainers; [ jonafato ]; - platforms = platforms.linux; - homepage = "https://github.com/Tudmotu/gnome-shell-extension-clipboard-indicator"; - }; -} diff --git a/pkgs/desktops/gnome-3/extensions/clock-override/default.nix b/pkgs/desktops/gnome-3/extensions/clock-override/default.nix deleted file mode 100644 index 6d3a752c886f3..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/clock-override/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchzip, gnome3, gettext, glib }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-clock-override"; - version = "12"; - - src = fetchzip { - url = "https://extensions.gnome.org/extension-data/clock-overridegnomeshell.kryogenix.org.v${version}.shell-extension.zip"; - sha256 = "1cyaszks6bwnbgacqsl1pmr24mbj05mad59d4253la9am8ibb4m6"; - stripRoot = false; - }; - - uuid = "clock-override@gnomeshell.kryogenix.org"; - - nativeBuildInputs = [ gettext glib ]; - - buildPhase = '' - runHook preBuild - glib-compile-schemas --strict --targetdir=schemas schemas - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions/${uuid} - cp -r {convenience.js,extension.js,format.js,locale,metadata.json,prefs.js,schemas} $out/share/gnome-shell/extensions/${uuid} - runHook postInstall - ''; - - meta = with lib; { - description = "Customize the date and time format displayed in clock in the top bar in GNOME Shell"; - license = licenses.mit; - maintainers = with maintainers; [ rhoriguchi ]; - homepage = "https://github.com/stuartlangridge/gnome-shell-clock-override"; - broken = versionOlder gnome3.gnome-shell.version "3.18"; - }; -} diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix deleted file mode 100644 index 45233e52f8932..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, glib -, gettext -}: - -stdenv.mkDerivation rec { - pname = "gnome-shell-dash-to-dock"; - version = "69"; - - src = fetchFromGitHub { - owner = "micheleg"; - repo = "dash-to-dock"; - rev = "extensions.gnome.org-v" + version; - hash = "sha256-YuLtC7E8dK57JSuFdbDQe5Ml+KQfl9qSdrHdVhFaNiE="; - }; - - nativeBuildInputs = [ - glib - gettext - ]; - - makeFlags = [ - "INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions" - ]; - - uuid = "dash-to-dock@micxgx.gmail.com"; - - meta = with lib; { - description = "A dock for the Gnome Shell"; - homepage = "https://micheleg.github.io/dash-to-dock/"; - license = licenses.gpl2; - maintainers = with maintainers; [ eperuffo jtojnar ]; - }; -} diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix deleted file mode 100644 index 7a9dc066cc77e..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, glib, gettext }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-dash-to-panel"; - version = "40"; - - src = fetchFromGitHub { - owner = "home-sweet-gnome"; - repo = "dash-to-panel"; - rev = "v${version}"; - sha256 = "07jq8d16nn62ikis896nyfn3q02f5srj754fmiblhz472q4ljc3p"; - }; - - buildInputs = [ - glib gettext - ]; - - makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ]; - - uuid = "dash-to-panel@jderose9.github.com"; - - meta = with lib; { - description = "An icon taskbar for Gnome Shell"; - license = licenses.gpl2; - maintainers = with maintainers; [ mounium ]; - homepage = "https://github.com/jderose9/dash-to-panel"; - }; -} diff --git a/pkgs/desktops/gnome-3/extensions/disable-unredirect/default.nix b/pkgs/desktops/gnome-3/extensions/disable-unredirect/default.nix deleted file mode 100644 index 0a9145de3db35..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/disable-unredirect/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-disable-unredirect"; - version = "unstable-2021-01-17"; - - src = fetchFromGitHub { - owner = "kazysmaster"; - repo = "gnome-shell-extension-disable-unredirect"; - rev = "2ecb2f489ea3316b77d04f03a0c885f322c67e79"; - sha256 = "1rjyrg8qya0asndxr7189a9npww0rcxk02wkxrxjy7fdp5m89p7y"; - }; - - uuid = "unredirect@vaina.lt"; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/gnome-shell/extensions - cp -R ${uuid} $out/share/gnome-shell/extensions/${uuid} - - runHook postInstall - ''; - - meta = with lib; { - description = "Disables unredirect fullscreen windows in gnome-shell to avoid tearing"; - license = licenses.gpl3Only; - homepage = "https://github.com/kazysmaster/gnome-shell-extension-disable-unredirect"; - maintainers = with maintainers; [ eduardosm ]; - }; -} diff --git a/pkgs/desktops/gnome-3/extensions/draw-on-your-screen/default.nix b/pkgs/desktops/gnome-3/extensions/draw-on-your-screen/default.nix deleted file mode 100644 index 0e0dab64be165..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/draw-on-your-screen/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchgit, gettext, gnome3 }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-draw-on-your-screen"; - version = "10"; - - src = fetchgit { - url = "https://framagit.org/abakkk/DrawOnYourScreen/"; - rev = "v${version}"; - sha256 = "07adzg3mf6k0pmd9lc358w0w3l4pr3p6374day1qhmci2p4zxq6p"; - }; - - uuid = "drawOnYourScreen@abakkk.framagit.org"; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions/${uuid} - cp -r . $out/share/gnome-shell/extensions/${uuid} - runHook postInstall - ''; - - meta = with lib; { - description = "A drawing extension for GNOME Shell"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ ericdallo ahuzik ]; - platforms = gnome3.gnome-shell.meta.platforms; - homepage = "https://framagit.org/abakkk/DrawOnYourScreen"; - }; -} diff --git a/pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix b/pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix deleted file mode 100644 index 8cd567a590dbd..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, gjs, vte, gnome3 }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-drop-down-terminal"; - version = "unstable-2020-03-25"; - - src = fetchFromGitHub { - owner = "zzrough"; - repo = "gs-extensions-drop-down-terminal"; - rev = "a59669afdb395b3315619f62c1f740f8b2f0690d"; - sha256 = "0igfxgrjdqq6z6xg4rsawxn261pk25g5dw2pm3bhwz5sqsy4bq3i"; - }; - - uuid = "drop-down-terminal@gs-extensions.zzrough.org"; - - patches = [ - (substituteAll { - src = ./fix_vte_and_gjs.patch; - inherit gjs vte; - }) - ]; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions - cp -r ${uuid} $out/share/gnome-shell/extensions/ - runHook postInstall - ''; - - meta = with lib; { - description = "Configurable drop down terminal shell"; - license = licenses.gpl3; - maintainers = with maintainers; [ ericdallo ]; - homepage = "https://github.com/zzrough/gs-extensions-drop-down-terminal"; - }; -} diff --git a/pkgs/desktops/gnome-3/extensions/drop-down-terminal/fix_vte_and_gjs.patch b/pkgs/desktops/gnome-3/extensions/drop-down-terminal/fix_vte_and_gjs.patch deleted file mode 100644 index 3544c91ee8958..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/drop-down-terminal/fix_vte_and_gjs.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/drop-down-terminal@gs-extensions.zzrough.org/extension.js -+++ b/drop-down-terminal@gs-extensions.zzrough.org/extension.js -@@ -15,6 +15,8 @@ - - // Author: Stéphane Démurget - -+imports.gi.GIRepository.Repository.prepend_search_path('@vte@/lib/girepository-1.0') -+ - const Lang = imports.lang; - const Gettext = imports.gettext.domain("drop-down-terminal"); - const Mainloop = imports.mainloop; -@@ -653,7 +655,7 @@ const DropDownTerminalExtension = new Lang.Class({ - this._killingChild = false; - - // finds the forking arguments -- let args = ["gjs", GLib.build_filenamev([Me.path, "terminal.js"]), Me.path]; -+ let args = ["@gjs@/bin/gjs", GLib.build_filenamev([Me.path, "terminal.js"]), Me.path]; - - // forks the process - debug("forking '" + args.join(" ") + "'"); ---- a/drop-down-terminal@gs-extensions.zzrough.org/terminal.js -+++ b/drop-down-terminal@gs-extensions.zzrough.org/terminal.js -@@ -14,6 +14,9 @@ - // along with this program. If not, see . - - // Author: Stéphane Démurget -+ -+imports.gi.GIRepository.Repository.prepend_search_path('@vte@/lib/girepository-1.0') -+ - const Lang = imports.lang; - - const Pango = imports.gi.Pango; diff --git a/pkgs/desktops/gnome-3/extensions/dynamic-panel-transparency/default.nix b/pkgs/desktops/gnome-3/extensions/dynamic-panel-transparency/default.nix deleted file mode 100644 index bf637ecab1830..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/dynamic-panel-transparency/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, gnome3, glib }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-dynamic-panel-transparency"; - version = "35"; - - src = fetchFromGitHub { - owner = "ewlsh"; - repo = "dynamic-panel-transparency"; - rev = "0800c0a921bb25f51f6a5ca2e6981b1669a69aec"; - sha256 = "0200mx861mlsi9lf7h108yam02jfqqw55r521chkgmk4fy6z99pq"; - }; - - uuid = "dynamic-panel-transparency@rockon999.github.io"; - - nativeBuildInputs = [ glib ]; - - buildPhase = '' - runHook preBuild - glib-compile-schemas --strict --targetdir=${uuid}/schemas/ ${uuid}/schemas - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions/${uuid} - cp -r ${uuid} $out/share/gnome-shell/extensions - runHook postInstall - ''; - - meta = with lib; { - description = "This extension fades your top panel to nothingness when there are no maximized windows present"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ rhoriguchi ]; - homepage = "https://github.com/ewlsh/dynamic-panel-transparency"; - broken = versionOlder gnome3.gnome-shell.version "3.36"; - }; -} diff --git a/pkgs/desktops/gnome-3/extensions/emoji-selector/default.nix b/pkgs/desktops/gnome-3/extensions/emoji-selector/default.nix deleted file mode 100644 index 5470dc996be01..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/emoji-selector/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, glib, gettext }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-emoji-selector"; - version = "19"; - - src = fetchFromGitHub { - owner = "maoschanz"; - repo = "emoji-selector-for-gnome"; - rev = version; - sha256 = "0x60pg5nl5d73av494dg29hyfml7fbf2d03wm053vx1q8a3pxbyb"; - }; - - uuid = "emoji-selector@maestroschan.fr"; - - nativeBuildInputs = [ glib ]; - - buildPhase = '' - runHook preBuild - glib-compile-schemas ./${uuid}/schemas - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions - cp -r ${uuid} $out/share/gnome-shell/extensions - runHook postInstall - ''; - - meta = with lib; { - description = - "GNOME Shell extension providing a searchable popup menu displaying most emojis"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ rawkode ]; - homepage = "https://github.com/maoschanz/emoji-selector-for-gnome"; - }; -} diff --git a/pkgs/desktops/gnome-3/extensions/freon/default.nix b/pkgs/desktops/gnome-3/extensions/freon/default.nix deleted file mode 100644 index f30e2f6f8a250..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/freon/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, glib }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-freon"; - version = "40"; - - uuid = "freon@UshakovVasilii_Github.yahoo.com"; - - src = fetchFromGitHub { - owner = "UshakovVasilii"; - repo = "gnome-shell-extension-freon"; - rev = "EGO-${version}"; - sha256 = "0ak6f5dds9kk3kqww681gs3l1mj3vf22icrvb5m257s299rq8yzl"; - }; - - nativeBuildInputs = [ glib ]; - - buildPhase = '' - runHook preBuild - glib-compile-schemas --strict --targetdir=${uuid}/schemas ${uuid}/schemas - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions - cp -r ${uuid} $out/share/gnome-shell/extensions - runHook postInstall - ''; - - meta = with lib; { - description = "GNOME Shell extension for displaying CPU, GPU, disk temperatures, voltage and fan RPM in the top panel"; - license = licenses.gpl2; - maintainers = with maintainers; [ justinas ]; - homepage = "https://github.com/UshakovVasilii/gnome-shell-extension-freon"; - }; -} diff --git a/pkgs/desktops/gnome-3/extensions/fuzzy-app-search/default.nix b/pkgs/desktops/gnome-3/extensions/fuzzy-app-search/default.nix deleted file mode 100755 index f8a8803435baa..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/fuzzy-app-search/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchFromGitLab, gnome3, glib }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-fuzzy-app-search"; - version = "4"; - - src = fetchFromGitLab { - owner = "Czarlie"; - repo = "gnome-fuzzy-app-search"; - rev = "da9c15d39958d9c3b38df3b616fd40b85aed24e5"; - sha256 = "1r3qha530s97x818znn1wi76f4x9bhlgi7jlxfwjnrwys62cv5fn"; - }; - - uuid = "gnome-fuzzy-app-search@gnome-shell-extensions.Czarlie.gitlab.com"; - - nativeBuildInputs = [ glib ]; - - patches = [ ./fix-desktop-file-paths.patch ]; - - makeFlags = [ "INSTALL_PATH=$(out)/share/gnome-shell/extensions" ]; - - meta = with lib; { - description = "Fuzzy application search results for Gnome Search"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ rhoriguchi ]; - homepage = "https://gitlab.com/Czarlie/gnome-fuzzy-app-search"; - broken = versionOlder gnome3.gnome-shell.version "3.18"; - }; -} diff --git a/pkgs/desktops/gnome-3/extensions/fuzzy-app-search/fix-desktop-file-paths.patch b/pkgs/desktops/gnome-3/extensions/fuzzy-app-search/fix-desktop-file-paths.patch deleted file mode 100755 index 1795f998c9bde..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/fuzzy-app-search/fix-desktop-file-paths.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git a/applicationsUtils.js b/applicationsUtils.js -index 728223b..aa9f291 100644 ---- a/applicationsUtils.js -+++ b/applicationsUtils.js -@@ -44,27 +44,24 @@ var Search = new Lang.Class({ - * @return {Void} - */ - _init: function () { -- let dir = [ -- "/usr/share/applications", -- GLib.get_home_dir() + "/.local/share/applications", -- ]; -- -- // listen object - file/monitor list -- this._listen = dir.map((path) => { -- let file = Gio.File.new_for_path(path); -- let monitor = file.monitor(Gio.FileMonitorFlags.NONE, null); -- -- // refresh on each directory change -- monitor.connect( -- "changed", -- Lang.bind(this, this._handleMonitorChanged) -- ); -- -- return { -- file: file, -- monitor: monitor, -- }; -- }); -+ this._listen = [...new Set(GLib.get_system_data_dirs())] -+ .filter((path) => path.endsWith("/share")) -+ .map((path) => Gio.File.new_for_path(path + "/applications")) -+ .filter((file) => file.query_exists(null)) -+ .map((file) => { -+ let monitor = file.monitor(Gio.FileMonitorFlags.NONE, null); -+ -+ // refresh on each directory change -+ monitor.connect( -+ "changed", -+ Lang.bind(this, this._handleMonitorChanged) -+ ); -+ -+ return { -+ file: file, -+ monitor: monitor, -+ }; -+ }); - this._interval = null; - this._data = {}; - \ No newline at end of file diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix deleted file mode 100644 index d432043d380bf..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix +++ /dev/null @@ -1,116 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, substituteAll -, openssl -, gsound -, meson -, ninja -, pkg-config -, gobject-introspection -, wrapGAppsHook -, glib -, glib-networking -, gtk3 -, openssh -, gnome3 -, gjs -, nixosTests -}: - -stdenv.mkDerivation rec { - pname = "gnome-shell-gsconnect"; - version = "46"; - - outputs = [ "out" "installedTests" ]; - - src = fetchFromGitHub { - owner = "andyholmes"; - repo = "gnome-shell-extension-gsconnect"; - rev = "v${version}"; - sha256 = "161379kipr6z6gbhchb5b17djrkg5fbvblyyabzkc2gv05r3h6fw"; - }; - - patches = [ - # Make typelibs available in the extension - (substituteAll { - src = ./fix-paths.patch; - gapplication = "${glib.bin}/bin/gapplication"; - }) - - # Allow installing installed tests to a separate output - ./installed-tests-path.patch - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gobject-introspection # for locating typelibs - wrapGAppsHook # for wrapping daemons - ]; - - buildInputs = [ - glib # libgobject - glib-networking - gtk3 - gsound - gjs # for running daemon - gnome3.evolution-data-server # for libebook-contacts typelib - ]; - - mesonFlags = [ - "-Dgnome_shell_libdir=${gnome3.gnome-shell}/lib" - "-Dgsettings_schemadir=${glib.makeSchemaPath (placeholder "out") "${pname}-${version}"}" - "-Dchrome_nmhdir=${placeholder "out"}/etc/opt/chrome/native-messaging-hosts" - "-Dchromium_nmhdir=${placeholder "out"}/etc/chromium/native-messaging-hosts" - "-Dopenssl_path=${openssl}/bin/openssl" - "-Dsshadd_path=${openssh}/bin/ssh-add" - "-Dsshkeygen_path=${openssh}/bin/ssh-keygen" - "-Dsession_bus_services_dir=${placeholder "out"}/share/dbus-1/services" - "-Dpost_install=true" - "-Dinstalled_test_prefix=${placeholder "installedTests"}" - ]; - - postPatch = '' - patchShebangs meson/nmh.sh - patchShebangs meson/post-install.sh - patchShebangs installed-tests/prepare-tests.sh - - # TODO: do not include every typelib everywhere - # for example, we definitely do not need nautilus - for file in src/extension.js src/prefs.js; do - substituteInPlace "$file" \ - --subst-var-by typelibPath "$GI_TYPELIB_PATH" - done - ''; - - postFixup = '' - # Let’s wrap the daemons - for file in $out/share/gnome-shell/extensions/gsconnect@andyholmes.github.io/service/{daemon,nativeMessagingHost}.js; do - echo "Wrapping program $file" - wrapGApp "$file" - done - - # Wrap jasmine runner for tests - for file in $installedTests/libexec/installed-tests/gsconnect/minijasmine; do - echo "Wrapping program $file" - wrapGApp "$file" - done - ''; - - uuid = "gsconnect@andyholmes.github.io"; - - passthru = { - tests = { - installedTests = nixosTests.installed-tests.gsconnect; - }; - }; - - meta = with lib; { - description = "KDE Connect implementation for Gnome Shell"; - homepage = "https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ etu ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch b/pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch deleted file mode 100644 index 58c02a92eb2ef..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git i/data/org.gnome.Shell.Extensions.GSConnect.desktop.in w/data/org.gnome.Shell.Extensions.GSConnect.desktop.in -index ffb23342..b405c73b 100644 ---- i/data/org.gnome.Shell.Extensions.GSConnect.desktop.in -+++ w/data/org.gnome.Shell.Extensions.GSConnect.desktop.in -@@ -1,7 +1,7 @@ - [Desktop Entry] - Type=Application - Name=GSConnect --Exec=gapplication launch org.gnome.Shell.Extensions.GSConnect %U -+Exec=@gapplication@ launch org.gnome.Shell.Extensions.GSConnect %U - Terminal=false - NoDisplay=true - Icon=org.gnome.Shell.Extensions.GSConnect -diff --git i/src/extension.js w/src/extension.js -index 5f32aa68..872c0c61 100644 ---- i/src/extension.js -+++ w/src/extension.js -@@ -1,5 +1,7 @@ - 'use strict'; - -+'@typelibPath@'.split(':').forEach(path => imports.gi.GIRepository.Repository.prepend_search_path(path)); -+ - const Gio = imports.gi.Gio; - const GObject = imports.gi.GObject; - const Gtk = imports.gi.Gtk; -diff --git i/src/prefs.js w/src/prefs.js -index 07e93099..1c166710 100644 ---- i/src/prefs.js -+++ w/src/prefs.js -@@ -1,5 +1,7 @@ - 'use strict'; - -+'@typelibPath@'.split(':').forEach(path => imports.gi.GIRepository.Repository.prepend_search_path(path)); -+ - const Gio = imports.gi.Gio; - const GLib = imports.gi.GLib; - const Gtk = imports.gi.Gtk; diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/installed-tests-path.patch b/pkgs/desktops/gnome-3/extensions/gsconnect/installed-tests-path.patch deleted file mode 100644 index 78e1ad96d74c3..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/gsconnect/installed-tests-path.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/installed-tests/meson.build b/installed-tests/meson.build -index c7eff2fb..ef4f6052 100644 ---- a/installed-tests/meson.build -+++ b/installed-tests/meson.build -@@ -1,5 +1,5 @@ --installed_tests_execdir = join_paths(libexecdir, 'installed-tests', meson.project_name()) --installed_tests_metadir = join_paths(datadir, 'installed-tests', meson.project_name()) -+installed_tests_execdir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', meson.project_name()) -+installed_tests_metadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', meson.project_name()) - - installed_tests_srcdir = meson.current_source_dir() - installed_tests_builddir = meson.current_build_dir() -diff --git a/meson_options.txt b/meson_options.txt -index 8912e052..ca6ee5eb 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -116,6 +116,13 @@ option( - description: 'Native Messaging Host directory for Mozilla' - ) - -+option( -+ 'installed_test_prefix', -+ type: 'string', -+ value: '', -+ description: 'Prefix for installed tests' -+) -+ - option( - 'installed_tests', - type: 'boolean', diff --git a/pkgs/desktops/gnome-3/extensions/hot-edge/default.nix b/pkgs/desktops/gnome-3/extensions/hot-edge/default.nix deleted file mode 100644 index aaa5870996aba..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/hot-edge/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -}: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-hot-edge"; - version = "jdoda"; - - src = fetchFromGitHub { - owner = "jdoda"; - repo = "hotedge"; - rev = "bb7f651becea5287241caf7cda246a68ab07dac8"; - sha256 = "oeTs0kRan6b5relxzhK1IKbV0Yv2d5YdvvUPJ3fM9ik="; - }; - - dontBuild = true; - - uuid = "hotedge@jonathan.jdoda.ca"; - - installPhase = '' - runHook preInstall - install -Dt $out/share/gnome-shell/extensions/${uuid} extension.js metadata.json stylesheet.css - runHook postInstall - ''; - - meta = with lib; { - description = "Replace the top-left hot corner with a bottom hot edge"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ jtojnar ]; - homepage = "https://github.com/jdoda/hotedge"; - }; -} diff --git a/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix b/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix deleted file mode 100644 index 00c67421e54a5..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, gnome3 }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-icon-hider"; - version = "23"; - - src = fetchFromGitHub { - owner = "ikalnytskyi"; - repo = "gnome-shell-extension-icon-hider"; - rev = "v${version}"; - sha256 = "18c8zkdrmdbghqqz7b450vhgpykgz25mgigwn2nggcb2lxmvm9ks"; - }; - - uuid = "icon-hider@kalnitsky.org"; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions - cp -r ${uuid} $out/share/gnome-shell/extensions - runHook postInstall - ''; - - meta = with lib; { - description = "Icon Hider is a GNOME Shell extension for managing status area items"; - license = licenses.bsd3; - maintainers = with maintainers; [ jonafato ]; - platforms = gnome3.gnome-shell.meta.platforms; - homepage = "https://github.com/ikalnytskyi/gnome-shell-extension-icon-hider"; - broken = versionAtLeast gnome3.gnome-shell.version "3.32"; # Doesn't support 3.34 - }; -} diff --git a/pkgs/desktops/gnome-3/extensions/impatience/default.nix b/pkgs/desktops/gnome-3/extensions/impatience/default.nix deleted file mode 100644 index 82551efef3c78..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/impatience/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, glib }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-impatience"; - version = "unstable-2019-09-23"; - - src = fetchFromGitHub { - owner = "timbertson"; - repo = "gnome-shell-impatience"; - rev = "43e4e0a1e0eeb334a2da5224ce3ab4fdddf4f1b2"; - sha256 = "0kvdhlz41fjyqdgcfw6mrr9nali6wg2qwji3dvykzfi0aypljzpx"; - }; - - buildInputs = [ - glib - ]; - - buildPhase = '' - runHook preBuild - make schemas - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions - cp -r impatience $out/share/gnome-shell/extensions/${uuid} - runHook postInstall - ''; - - uuid = "impatience@gfxmonk.net"; - - meta = with lib; { - description = "Speed up builtin gnome-shell animations"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ timbertson tiramiseb ]; - homepage = "http://gfxmonk.net/dist/0install/gnome-shell-impatience.xml"; - }; -} diff --git a/pkgs/desktops/gnome-3/extensions/material-shell/default.nix b/pkgs/desktops/gnome-3/extensions/material-shell/default.nix deleted file mode 100644 index 87b9a3c1507c4..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/material-shell/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, gnome3 }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-material-shell"; - version = "12"; - - src = fetchFromGitHub { - owner = "material-shell"; - repo = "material-shell"; - rev = version; - sha256 = "0ikrh70drwr0pqjcdz7l1ky8xllpnk7myprjd4s61nqkx9j2iz44"; - }; - - # This package has a Makefile, but it's used for building a zip for - # publication to extensions.gnome.org. Disable the build phase so - # installing doesn't build an unnecessary release. - dontBuild = true; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions/${uuid} - cp -r * $out/share/gnome-shell/extensions/${uuid}/ - runHook postInstall - ''; - - uuid = "material-shell@papyelgringo"; - - meta = with lib; { - description = "A modern desktop interface for Linux"; - license = licenses.mit; - maintainers = with maintainers; [ benley ]; - homepage = "https://github.com/material-shell/material-shell"; - platforms = gnome3.gnome-shell.meta.platforms; - }; -} diff --git a/pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix b/pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix deleted file mode 100644 index 9ab2168d2dcac..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, nix-update-script -, gnome3 -}: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-mpris-indicator-button-unstable"; - version = "2020-03-21"; - - src = fetchFromGitHub { - owner = "JasonLG1979"; - repo = "gnome-shell-extension-mpris-indicator-button"; - rev = "de54160e7d905b8c48c0fe30a437f7c51efc1aa3"; - sha256 = "0n5qlx51fxjq1nn10zhdwfy905j20sv7pwh2jc6fns757ac4pwwk"; - }; - - uuid = "mprisindicatorbutton@JasonLG1979.github.io"; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions - cp -r ${uuid} $out/share/gnome-shell/extensions - runHook postInstall - ''; - - passthru = { - updateScript = nix-update-script { - attrPath = "gnomeExtensions.${pname}"; - }; - }; - - - meta = with lib; { - description = "A simple MPRIS indicator button for GNOME Shell"; - license = licenses.gpl3; - maintainers = with maintainers; [ worldofpeace ]; - platforms = gnome3.gnome-shell.meta.platforms; - homepage = "https://github.com/JasonLG1979/gnome-shell-extension-mpris-indicator-button"; - broken = versionOlder gnome3.gnome-shell.version "3.34"; - }; -} diff --git a/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix b/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix deleted file mode 100644 index f663aa8977b1c..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchFromGitLab, glib, gnome3, unzip }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-night-theme-switcher"; - version = "40"; - - src = fetchFromGitLab { - owner = "rmnvgr"; - repo = "nightthemeswitcher-gnome-shell-extension"; - rev = "v${version}"; - sha256 = "0z11y18bgdc0y41hrrzzgi4lagm2cg06x12jgdnary1ycng7xja0"; - }; - - nativeBuildInputs = [ unzip ]; - buildInputs = [ glib gnome3.gnome-shell ]; - - uuid = "nightthemeswitcher@romainvigier.fr"; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions/ - unzip build/${uuid}.shell-extension.zip -d $out/share/gnome-shell/extensions/${uuid} - runHook postInstall - ''; - - meta = with lib; { - description = "Automatically change the GTK theme to dark variant when Night Light activates"; - license = licenses.gpl3; - maintainers = with maintainers; [ jonafato ]; - homepage = "https://gitlab.com/rmnvgr/nightthemeswitcher-gnome-shell-extension/"; - }; -} diff --git a/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix b/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix deleted file mode 100644 index ad588be18ce9e..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, glib, gettext, xorg }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-no-title-bar"; - version = "11"; - - src = fetchFromGitHub { - owner = "poehlerj"; - repo = "no-title-bar"; - rev = "V_${version}"; - sha256 = "07ddw47binlsbyvgy4xkdjvd40zyp7nwd17r6k7w54d50vmnwhvb"; - }; - - nativeBuildInputs = [ glib gettext ]; - - patches = [ - (substituteAll { - src = ./fix-paths.patch; - xprop = "${xorg.xprop}/bin/xprop"; - xwininfo = "${xorg.xwininfo}/bin/xwininfo"; - }) - ]; - - makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ]; - - uuid = "no-title-bar@jonaspoehler.de"; - - meta = with lib; { - description = "Integrates maximized windows with the top panel"; - homepage = "https://github.com/poehlerj/no-title-bar"; - license = licenses.gpl2; - maintainers = with maintainers; [ jonafato svsdep maxeaubrey ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/extensions/no-title-bar/fix-paths.patch b/pkgs/desktops/gnome-3/extensions/no-title-bar/fix-paths.patch deleted file mode 100644 index fb2d3d57e51d3..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/no-title-bar/fix-paths.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/decoration.js b/decoration.js -index d1ff3dd..ff4193f 100644 ---- a/decoration.js -+++ b/decoration.js -@@ -223,7 +223,7 @@ var Decoration = class { - - let winId = this._guessWindowXID(win); - -- let xprops = GLib.spawn_command_line_sync(`xprop -id ${winId}`); -+ let xprops = GLib.spawn_command_line_sync(`@xprop@ -id ${winId}`); - if (!xprops[0]) { - Utils.log_debug(`Unable to determine windows '${win.get_title()}' original state`); - return win._noTitleBarOriginalState = WindowState.UNKNOWN; -@@ -237,7 +237,7 @@ var Decoration = class { - let prop = '_MOTIF_WM_HINTS'; - let value = '0x2, 0x0, %s, 0x0, 0x0'.format(hide ? '0x2' : '0x1'); - -- GLib.spawn_command_line_sync(`xprop -id ${windId} -f ${prop} 32c -set ${prop} "${value}"`); -+ GLib.spawn_command_line_sync(`@xprop@ -id ${windId} -f ${prop} 32c -set ${prop} "${value}"`); - if (!hide && !win.titlebar_is_onscreen()) { - Utils.log_debug(`Shoving titlebar onscreen for window '${win.get_title()}'`); - win.shove_titlebar_onscreen(); -@@ -354,7 +354,7 @@ var Decoration = class { - let act = win.get_compositor_private(); - let xwindow = act && act['x-window']; - if (xwindow) { -- let xwininfo = GLib.spawn_command_line_sync('xwininfo -children -id 0x%x'.format(xwindow)); -+ let xwininfo = GLib.spawn_command_line_sync('@xwininfo@ -children -id 0x%x'.format(xwindow)); - if (xwininfo[0]) { - let str = ByteArray.toString(xwininfo[1]); - -@@ -384,7 +384,7 @@ var Decoration = class { - // Try enumerating all available windows and match the title. Note that this - // may be necessary if the title contains special characters and `x-window` - // is not available. -- let result = GLib.spawn_command_line_sync('xprop -root _NET_CLIENT_LIST'); -+ let result = GLib.spawn_command_line_sync('@xprop@ -root _NET_CLIENT_LIST'); - if (result[0]) { - let str = ByteArray.toString(result[1]); - -@@ -395,7 +395,7 @@ var Decoration = class { - - // For each window ID, check if the title matches the desired title. - for (var i = 0; i < windowList.length; ++i) { -- let cmd = 'xprop -id "' + windowList[i] + '" _NET_WM_NAME _NO_TITLE_BAR_ORIGINAL_STATE'; -+ let cmd = '@xprop@ -id "' + windowList[i] + '" _NET_WM_NAME _NO_TITLE_BAR_ORIGINAL_STATE'; - let result = GLib.spawn_command_line_sync(cmd); - - if (result[0]) { -@@ -455,4 +455,4 @@ var Decoration = class { - let styleContent = this._updateUserStyles(); - GLib.file_set_contents(this._userStylesPath, styleContent); - } --} -\ No newline at end of file -+} diff --git a/pkgs/desktops/gnome-3/extensions/noannoyance/default.nix b/pkgs/desktops/gnome-3/extensions/noannoyance/default.nix deleted file mode 100644 index 4763d90575517..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/noannoyance/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "noannoyance"; - version = "unstable-2021-01-17"; - - src = fetchFromGitHub { - owner = "BjoernDaase"; - repo = "noannoyance"; - rev = "f6e76916336aee2f7c4141796f3c40c870d2b347"; - sha256 = "1iy3nif8rjjcwf83fg9ds93fi7vmhliynmlwqnx036s3msmxvgs3"; - }; - - uuid = "noannoyance@daase.net"; - - dontBuild = true; - - installPhase = '' - mkdir -p $out/share/gnome-shell/extensions/${uuid} - cp metadata.json extension.js $out/share/gnome-shell/extensions/${uuid} - ''; - - meta = with lib; { - description = "Removes the 'Window is ready' notification and puts the window into focus"; - homepage = "https://github.com/BjoernDaase/noannoyance"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ tu-maurice ]; - }; -} diff --git a/pkgs/desktops/gnome-3/extensions/paperwm/default.nix b/pkgs/desktops/gnome-3/extensions/paperwm/default.nix deleted file mode 100644 index 201628b4b424e..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/paperwm/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-paperwm"; - version = "38.1"; - - src = fetchFromGitHub { - owner = "paperwm"; - repo = "PaperWM"; - rev = version; - sha256 = "1jq15qrq3khqpjsjbcc17amdr1k53jkvambdacdf56xbqkycvlgs"; - }; - - uuid = "paperwm@hedning:matrix.org"; - - dontBuild = true; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions/${uuid} - cp -r . $out/share/gnome-shell/extensions/${uuid} - runHook postInstall - ''; - - meta = with lib; { - description = "Tiled scrollable window management for Gnome Shell"; - homepage = "https://github.com/paperwm/PaperWM"; - license = licenses.gpl3; - maintainers = with maintainers; [ hedning ]; - }; -} diff --git a/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix b/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix deleted file mode 100644 index d16477403474b..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, glib, gnome3 }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-pidgin-im-integration"; - version = "32"; - - src = fetchFromGitHub { - owner = "muffinmad"; - repo = "pidgin-im-gnome-shell-extension"; - rev = "v${version}"; - sha256 = "1jyg8r0s1v83sgg6y0jbsj2v37mglh8rvd8vi27fxnjq9xmg8kpc"; - }; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - share_dir="$prefix/share" - extensions_dir="$share_dir/gnome-shell/extensions/pidgin@muffinmad" - mkdir -p "$extensions_dir" - mv *.js metadata.json dbus.xml schemas locale "$extensions_dir" - runHook postInstall - ''; - - uuid = "pidgin@muffinmad"; - - meta = with lib; { - homepage = "https://github.com/muffinmad/pidgin-im-gnome-shell-extension"; - description = "Make Pidgin IM conversations appear in the Gnome Shell message tray"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ ]; - broken = versionAtLeast gnome3.gnome-shell.version "3.32"; # Doesn't support 3.34 - }; -} diff --git a/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix b/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix deleted file mode 100644 index e310f5dcf10c5..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-remove-dropdown-arrows"; - version = "13"; - - src = fetchFromGitHub { - owner = "mpdeimos"; - repo = "gnome-shell-remove-dropdown-arrows"; - rev = "version/${version}"; - sha256 = "09b2hnfbqym20pb1sfc8xiz7gs2kbs6b1s7xl8swc8dydhsbambk"; - }; - - # This package has a Makefile, but it's used for publishing and linting, not - # for building. Disable the build phase so installing doesn't attempt to - # publish the extension. - dontBuild = true; - - uuid = "remove-dropdown-arrows@mpdeimos.com"; - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions/${uuid} - cp extension.js $out/share/gnome-shell/extensions/${uuid} - cp metadata.json $out/share/gnome-shell/extensions/${uuid} - runHook postInstall - ''; - - meta = with lib; { - description = "Remove dropdown arrows from GNOME Shell Menus"; - license = licenses.gpl3; - maintainers = with maintainers; [ jonafato ]; - homepage = "https://github.com/mpdeimos/gnome-shell-remove-dropdown-arrows"; - }; -} diff --git a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix b/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix deleted file mode 100644 index e58d8ce6e42f7..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, stdenv -, substituteAll -, fetchFromGitHub -, libpulseaudio -, python3 -}: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-sound-output-device-chooser"; - version = "35"; - - src = fetchFromGitHub { - owner = "kgshank"; - repo = "gse-sound-output-device-chooser"; - rev = version; - sha256 = "sha256-Yl5ut6kJAkAAdCBiNFpwDgshXCLMmFH3/zhnFGpyKqs="; - }; - - patches = [ - # Fix paths to libpulse and python - (substituteAll { - src = ./fix-paths.patch; - libpulse = "${libpulseaudio}/lib/libpulse.so"; - python = python3.interpreter; - }) - ]; - - dontBuild = true; - - uuid = "sound-output-device-chooser@kgshank.net"; - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions - cp -r ${uuid} $out/share/gnome-shell/extensions - runHook postInstall - ''; - - meta = with lib; { - description = "GNOME Shell extension adding audio device chooser to panel"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ jtojnar ]; - homepage = "https://github.com/kgshank/gse-sound-output-device-chooser"; - }; -} diff --git a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch b/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch deleted file mode 100644 index 1971bf1e5e745..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/sound-output-device-chooser@kgshank.net/convenience.js b/sound-output-device-chooser@kgshank.net/convenience.js -index 54ad06f..0860531 100644 ---- a/sound-output-device-chooser@kgshank.net/convenience.js -+++ b/sound-output-device-chooser@kgshank.net/convenience.js -@@ -142,7 +142,7 @@ function refreshCards() { - if (newProfLogic) { - _log("New logic"); - let pyLocation = Me.dir.get_child("utils/pa_helper.py").get_path(); -- let pythonExec = ["python", "python3", "python2"].find(cmd => isCmdFound(cmd)); -+ let pythonExec = '@python@'; - if (!pythonExec) { - _log("ERROR: Python not found. fallback to default mode"); - _settings.set_boolean(Prefs.NEW_PROFILE_ID, false); -diff --git a/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py b/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py -index c4d2484..262608d 100644 ---- a/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py -+++ b/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py -@@ -82,7 +82,7 @@ else: - - _libraries = {} - --libpulse_library_name = find_library('pulse') -+libpulse_library_name = '@libpulse@' - if libpulse_library_name is None: - raise Exception('No libpulse.so library found!') - diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix deleted file mode 100644 index 3935150c57e54..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib, stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop, gnome3 }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-system-monitor"; - version = "unstable-2021-04-08"; - - src = fetchFromGitHub { - owner = "paradoxxxzero"; - repo = "gnome-shell-system-monitor-applet"; - rev = "942603da39de12f50b1f86efbde92d7526d1290e"; - sha256 = "0lzb7064bigw2xsqkzr8qfhp9wfmxyi3823j2782v99jpcz423aw"; - }; - - buildInputs = [ - glib - glib-networking - libgtop - ]; - - patches = [ - (substituteAll { - src = ./paths_and_nonexisting_dirs.patch; - clutter_path = gnome3.mutter.libdir; # this should not be used in settings but 🤷‍♀️ - gtop_path = "${libgtop}/lib/girepository-1.0"; - glib_net_path = "${glib-networking}/lib/girepository-1.0"; - }) - ]; - - buildPhase = '' - runHook preBuild - glib-compile-schemas --targetdir=${uuid}/schemas ${uuid}/schemas - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions - cp -r ${uuid} $out/share/gnome-shell/extensions - runHook postInstall - ''; - - uuid = "system-monitor@paradoxxx.zero.gmail.com"; - - meta = with lib; { - description = "Display system informations in gnome shell status bar"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ tiramiseb ]; - homepage = "https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet"; - }; -} diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/paths_and_nonexisting_dirs.patch b/pkgs/desktops/gnome-3/extensions/system-monitor/paths_and_nonexisting_dirs.patch deleted file mode 100644 index 280af965af3f6..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/system-monitor/paths_and_nonexisting_dirs.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/system-monitor@paradoxxx.zero.gmail.com/extension.js b/system-monitor@paradoxxx.zero.gmail.com/extension.js -index de5e3d7..2d7824d 100644 ---- a/system-monitor@paradoxxx.zero.gmail.com/extension.js -+++ b/system-monitor@paradoxxx.zero.gmail.com/extension.js -@@ -18,6 +18,9 @@ - - // Author: Florian Mounier aka paradoxxxzero - -+imports.gi.GIRepository.Repository.prepend_search_path('@gtop_path@'); -+imports.gi.GIRepository.Repository.prepend_search_path('@glib_net_path@'); -+ - /* Ugly. This is here so that we don't crash old libnm-glib based shells unnecessarily - * by loading the new libnm.so. Should go away eventually */ - -@@ -407,7 +410,7 @@ const smMountsMonitor = class SystemMonitor_smMountsMonitor { - this.connected = false; - - this._volumeMonitor = Gio.VolumeMonitor.get(); -- let sys_mounts = ['/home', '/tmp', '/boot', '/usr', '/usr/local']; -+ let sys_mounts = ['/home', '/tmp', '/boot']; - this.base_mounts = ['/']; - sys_mounts.forEach((sMount) => { - if (this.is_sys_mount(sMount + '/')) { -diff --git a/system-monitor@paradoxxx.zero.gmail.com/prefs.js b/system-monitor@paradoxxx.zero.gmail.com/prefs.js -index 81d667c..0da4809 100644 ---- a/system-monitor@paradoxxx.zero.gmail.com/prefs.js -+++ b/system-monitor@paradoxxx.zero.gmail.com/prefs.js -@@ -1,3 +1,5 @@ -+imports.gi.GIRepository.Repository.prepend_search_path('@clutter_path@'); -+ - const Gtk = imports.gi.Gtk; - const Gio = imports.gi.Gio; - const Gdk = imports.gi.Gdk; diff --git a/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix b/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix deleted file mode 100644 index 68d07e2d1429a..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib, stdenv, substituteAll, fetchFromGitHub, taskwarrior, gettext, runtimeShell }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-taskwhisperer"; - version = "16"; - - src = fetchFromGitHub { - owner = "cinatic"; - repo = "taskwhisperer"; - rev = "v${version}"; - sha256 = "05w2dfpr5vrydb7ij4nd2gb7c31nxix3j48rb798r4jzl1rakyah"; - }; - - nativeBuildInputs = [ - gettext - ]; - - buildInputs = [ - taskwarrior - ]; - - uuid = "taskwhisperer-extension@infinicode.de"; - - makeFlags = [ - "INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions" - ]; - - patches = [ - (substituteAll { - src = ./fix-paths.patch; - task = "${taskwarrior}/bin/task"; - shell = runtimeShell; - }) - ]; - - meta = with lib; { - description = "GNOME Shell TaskWarrior GUI"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ jonafato ]; - homepage = "https://github.com/cinatic/taskwhisperer"; - }; -} diff --git a/pkgs/desktops/gnome-3/extensions/taskwhisperer/fix-paths.patch b/pkgs/desktops/gnome-3/extensions/taskwhisperer/fix-paths.patch deleted file mode 100644 index 2ea54f4b0897d..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/taskwhisperer/fix-paths.patch +++ /dev/null @@ -1,99 +0,0 @@ -diff --git a/taskwhisperer-extension@infinicode.de/extra/create.sh b/taskwhisperer-extension@infinicode.de/extra/create.sh -index a69e369..35d5ea1 100755 ---- a/taskwhisperer-extension@infinicode.de/extra/create.sh -+++ b/taskwhisperer-extension@infinicode.de/extra/create.sh -@@ -1 +1 @@ --bash -c "task add $1" -+bash -c "@task@ add $1" -diff --git a/taskwhisperer-extension@infinicode.de/extra/modify.sh b/taskwhisperer-extension@infinicode.de/extra/modify.sh -index 7964a26..8edd21b 100755 ---- a/taskwhisperer-extension@infinicode.de/extra/modify.sh -+++ b/taskwhisperer-extension@infinicode.de/extra/modify.sh -@@ -1 +1 @@ --bash -c "task $1 modify $2" -+bash -c "@task@ $1 modify $2" -diff --git a/taskwhisperer-extension@infinicode.de/taskService.js b/taskwhisperer-extension@infinicode.de/taskService.js -index ead7a12..aa36db4 100644 ---- a/taskwhisperer-extension@infinicode.de/taskService.js -+++ b/taskwhisperer-extension@infinicode.de/taskService.js -@@ -182,7 +182,7 @@ const TaskService = class TaskService { - - let project = projectName ? "project:" + projectName : ""; - -- let command = ['task', 'rc.json.array=on', status, project, 'export']; -+ let command = ['@task@', 'rc.json.array=on', status, project, 'export']; - let reader = new SpawnReader.SpawnReader(); - - let buffer = ""; -@@ -220,7 +220,7 @@ const TaskService = class TaskService { - break; - } - -- let shellProc = Gio.Subprocess.new(['task', status, 'projects'], Gio.SubprocessFlags.STDOUT_PIPE); -+ let shellProc = Gio.Subprocess.new(['@task@', status, 'projects'], Gio.SubprocessFlags.STDOUT_PIPE); - - shellProc.wait_async(null, function (obj, result) { - let shellProcExited = true; -@@ -261,7 +261,7 @@ const TaskService = class TaskService { - return; - } - -- let shellProc = Gio.Subprocess.new(['task', taskID.toString(), 'done'], Gio.SubprocessFlags.STDOUT_PIPE); -+ let shellProc = Gio.Subprocess.new(['@task@', taskID.toString(), 'done'], Gio.SubprocessFlags.STDOUT_PIPE); - - shellProc.wait_async(null, function (obj, result) { - let shellProcExited = true; -@@ -290,7 +290,7 @@ const TaskService = class TaskService { - return; - } - -- let shellProc = Gio.Subprocess.new(['task', 'modify', taskID.toString(), 'status:pending'], Gio.SubprocessFlags.STDOUT_PIPE); -+ let shellProc = Gio.Subprocess.new(['@task@', 'modify', taskID.toString(), 'status:pending'], Gio.SubprocessFlags.STDOUT_PIPE); - - shellProc.wait_async(null, function (obj, result) { - let shellProcExited = true; -@@ -318,7 +318,7 @@ const TaskService = class TaskService { - if (!taskID) { - return; - } -- let shellProc = Gio.Subprocess.new(['task', taskID.toString(), 'start'], Gio.SubprocessFlags.STDOUT_PIPE); -+ let shellProc = Gio.Subprocess.new(['@task@', taskID.toString(), 'start'], Gio.SubprocessFlags.STDOUT_PIPE); - shellProc.wait_async(null, function (obj, result) { - let shellProcExited = true; - shellProc.wait_finish(result); -@@ -344,7 +344,7 @@ const TaskService = class TaskService { - if (!taskID) { - return; - } -- let shellProc = Gio.Subprocess.new(['task', taskID.toString(), 'stop'], Gio.SubprocessFlags.STDOUT_PIPE); -+ let shellProc = Gio.Subprocess.new(['@task@', taskID.toString(), 'stop'], Gio.SubprocessFlags.STDOUT_PIPE); - shellProc.wait_async(null, function (obj, result) { - let shellProcExited = true; - shellProc.wait_finish(result); -@@ -374,7 +374,7 @@ const TaskService = class TaskService { - // FIXME: Gio.Subprocess: due to only passing string vector is allowed, it's not possible to directly pass the - // input of the user to subprocess (why & how, if you can answer then please send msg to fh@infinicode.de) - // bypassing problem with own shell script -- let shellProc = Gio.Subprocess.new(['/bin/sh', EXTENSIONDIR + '/extra/modify.sh', taskID.toString(), params], Gio.SubprocessFlags.STDOUT_PIPE + Gio.SubprocessFlags.STDERR_MERGE); -+ let shellProc = Gio.Subprocess.new(['@shell@', EXTENSIONDIR + '/extra/modify.sh', taskID.toString(), params], Gio.SubprocessFlags.STDOUT_PIPE + Gio.SubprocessFlags.STDERR_MERGE); - - shellProc.wait_async(null, function (obj, result) { - let shellProcExited = true; -@@ -403,7 +403,7 @@ const TaskService = class TaskService { - // FIXME: Gio.Subprocess: due to only passing string vector is allowed, it's not possible to directly pass the - // input of the user to subprocess (why & how, if you can answer then please send msg to fh@infinicode.de) - // bypassing problem with own shell script -- let shellProc = Gio.Subprocess.new(['/bin/sh', EXTENSIONDIR + '/extra/create.sh', params], Gio.SubprocessFlags.STDOUT_PIPE + Gio.SubprocessFlags.STDERR_MERGE); -+ let shellProc = Gio.Subprocess.new(['@shell@', EXTENSIONDIR + '/extra/create.sh', params], Gio.SubprocessFlags.STDOUT_PIPE + Gio.SubprocessFlags.STDERR_MERGE); - - shellProc.wait_async(null, function (obj, result) { - let shellProcExited = true; -@@ -432,7 +432,7 @@ const TaskService = class TaskService { - let shellProc; - - try { -- shellProc = Gio.Subprocess.new(['task', 'sync'], Gio.SubprocessFlags.STDOUT_PIPE); -+ shellProc = Gio.Subprocess.new(['@task@', 'sync'], Gio.SubprocessFlags.STDOUT_PIPE); - } catch (err) { - onError(err); - return; diff --git a/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix b/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix deleted file mode 100644 index dcea4c69ff82e..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, glib, gnome3 }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-tilingnome-unstable"; - version = "unstable-2019-09-19"; - - src = fetchFromGitHub { - owner = "rliang"; - repo = "gnome-shell-extension-tilingnome"; - rev = "f401c20c9721d85e6b3e30d1e822a200db370407"; - sha256 = "1hq9g9bxqpzqrdj9zm0irld8r6q4w1m4b00jya7wsny8rzb1s0y2"; - }; - - nativeBuildInputs = [ glib ]; - - buildPhase = '' - runHook preBuild - glib-compile-schemas . - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions/${uuid} - cp -r * $out/share/gnome-shell/extensions/${uuid}/ - runHook postInstall - ''; - - uuid = "tilingnome@rliang.github.com"; - - meta = with lib; { - description = "Tiling window management for GNOME Shell"; - license = licenses.gpl2; - maintainers = with maintainers; [ benley ]; - homepage = "https://github.com/rliang/gnome-shell-extension-tilingnome"; - platforms = gnome3.gnome-shell.meta.platforms; - }; -} diff --git a/pkgs/desktops/gnome-3/extensions/timepp/default.nix b/pkgs/desktops/gnome-3/extensions/timepp/default.nix deleted file mode 100644 index 94b8540c1bf32..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/timepp/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, gnome3 }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-timepp"; - version = "unstable-2020-03-15"; - - src = fetchFromGitHub { - owner = "zagortenay333"; - repo = "timepp__gnome"; - rev = "34ae477a51267cc1e85992a80cf85a1a7b7005c1"; - sha256 = "1v0xbrp0x5dwizscxh7h984pax4n92bj8iyw3qvjk27ynpxq8ag1"; - }; - - uuid = "timepp@zagortenay333"; - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions/${uuid} - cp -r . $out/share/gnome-shell/extensions/${uuid} - runHook postInstall - ''; - - meta = with lib; { - description = "A todo.txt manager, time tracker, timer, stopwatch, pomodoro, and alarms gnome-shell extension."; - homepage = "https://github.com/zagortenay333/timepp__gnome"; - license = licenses.gpl3; - maintainers = with maintainers; [ svsdep ]; - }; -} diff --git a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix b/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix deleted file mode 100644 index 084548e1a1053..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, glib, gettext }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-topicons-plus"; - version = "27"; - - src = fetchFromGitHub { - owner = "phocean"; - repo = "TopIcons-plus"; - rev = version; - sha256 = "1p3jlvs4zgnrvy8am7myivv4rnnshjp49kg87rd22qqyvcz51ykr"; - }; - - buildInputs = [ glib ]; - - nativeBuildInputs = [ gettext ]; - - makeFlags = [ "INSTALL_PATH=$(out)/share/gnome-shell/extensions" ]; - - uuid = "TopIcons@phocean.net"; - - meta = with lib; { - description = "Brings all icons back to the top panel, so that it's easier to keep track of apps running in the backround"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ eperuffo ]; - homepage = "https://github.com/phocean/TopIcons-plus"; - }; -} diff --git a/pkgs/desktops/gnome-3/extensions/unite/default.nix b/pkgs/desktops/gnome-3/extensions/unite/default.nix deleted file mode 100644 index 79d7a335239b7..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/unite/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, gnome3, fetchFromGitHub, xprop, glib }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-unite"; - version = "53"; - - src = fetchFromGitHub { - owner = "hardpixel"; - repo = "unite-shell"; - rev = "v${version}"; - sha256 = "0fw9wqf362h2yd67fhgbhqx0b2fwcl25wxmb92dqwigxjcj0dnw6"; - }; - - uuid = "unite@hardpixel.eu"; - - nativeBuildInputs = [ glib ]; - - buildInputs = [ xprop ]; - - buildPhase = '' - runHook preBuild - glib-compile-schemas --strict --targetdir=${uuid}/schemas/ ${uuid}/schemas - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions - cp -r ${uuid} $out/share/gnome-shell/extensions - runHook postInstall - ''; - - meta = with lib; { - description = "Unite is a GNOME Shell extension which makes a few layout tweaks to the top panel and removes window decorations to make it look like Ubuntu Unity Shell"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ rhoriguchi ]; - homepage = "https://github.com/hardpixel/unite-shell"; - broken = versionOlder gnome3.gnome-shell.version "3.32"; - }; -} diff --git a/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix b/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix deleted file mode 100644 index 42f226e96777c..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, gnome3 }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-window-corner-preview"; - version = "unstable-2019-04-03"; - - src = fetchFromGitHub { - owner = "medenagan"; - repo = "window-corner-preview"; - rev = "a95bb1389d94474efab7509aac592fb58fff6006"; - sha256 = "03v18j9l0fb64xrg3swf1vcgl0kpgwjlp8ddn068bpvghrsvgfah"; - }; - - dontBuild = true; - - uuid = "window-corner-preview@fabiomereu.it"; - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions - cp -r ${uuid} $out/share/gnome-shell/extensions - runHook postInstall - ''; - - meta = with lib; { - description = "GNOME Shell extension showing a video preview on the corner of the screen"; - license = licenses.mit; - maintainers = with maintainers; [ jtojnar ]; - homepage = "https://github.com/medenagan/window-corner-preview"; - broken = lib.versionAtLeast gnome3.gnome-shell.version "3.32"; # Doesn't support 3.34 - }; -} diff --git a/pkgs/desktops/gnome-3/extensions/window-is-ready-remover/default.nix b/pkgs/desktops/gnome-3/extensions/window-is-ready-remover/default.nix deleted file mode 100644 index 3f0e9e71b571b..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/window-is-ready-remover/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-window-is-ready-remover"; - version = "1.02"; - - src = fetchFromGitHub { - owner = "nunofarruca"; - repo = "WindowIsReady_Remover"; - rev = "v${version}"; - sha256 = "1xaf95gn0if44avvkjxyf8fl29y28idn9shnrks0m9k67jcwv8ns"; - }; - - uuid = "windowIsReady_Remover@nunofarruca@gmail.com"; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions/ - cp -r ${uuid} $out/share/gnome-shell/extensions/${uuid} - runHook postInstall - ''; - - meta = with lib; { - description = "GNOME Shell extension removing window is ready notification"; - homepage = "https://github.com/nunofarruca/WindowIsReady_Remover"; - license = licenses.asl20; - }; -} diff --git a/pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix b/pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix deleted file mode 100644 index eb1d6e7e319c6..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, findutils, glib }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-workspace-matrix"; - version = "4.0.2"; - - src = fetchFromGitHub { - owner = "mzur"; - repo = "gnome-shell-wsmatrix"; - rev = "v${version}"; - sha256 = "0dbn6b3fdd7yblk0mhsmaiqs3mwgcf3khkx1dsnlqn5hcs0a3myd"; - }; - - uuid = "wsmatrix@martin.zurowietz.de"; - - nativeBuildInputs = [ - findutils - glib - ]; - - buildFlags = "schemas"; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions - cp -r ${uuid} $out/share/gnome-shell/extensions - runHook postInstall - ''; - - meta = with lib; { - description = "Arrange workspaces in a two dimensional grid with workspace thumbnails"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ chkno ]; - homepage = "https://github.com/mzur/gnome-shell-wsmatrix"; - }; -} diff --git a/pkgs/desktops/gnome-3/find-latest-version.py b/pkgs/desktops/gnome-3/find-latest-version.py deleted file mode 100644 index 3078999e3e5bf..0000000000000 --- a/pkgs/desktops/gnome-3/find-latest-version.py +++ /dev/null @@ -1,89 +0,0 @@ -import argparse -import math -import json -import requests -import sys -from libversion import Version -from typing import Optional - - -def version_to_list(version): - return list(map(int, version.split("."))) - - -def odd_unstable(version: Version, selected): - try: - version = version_to_list(version.value) - except: - # Failing to parse as a list of numbers likely means the version contains a string tag like “beta”, therefore it is not a stable release. - return selected != "stable" - - if len(version) < 2: - return True - - even = version[1] % 2 == 0 - prerelease = (version[1] >= 90 and version[1] < 100) or (version[1] >= 900 and version[1] < 1000) - stable = even and not prerelease - if selected == "stable": - return stable - else: - return True - - -def tagged(version: Version, selected): - if selected == "stable": - return not ("alpha" in version.value or "beta" in version.value or "rc" in version.value) - else: - return True - - -def no_policy(version: Version, selected): - return True - - -version_policies = { - "odd-unstable": odd_unstable, - "tagged": tagged, - "none": no_policy, -} - - -def make_version_policy(version_predicate, selected, upper_bound: Optional[Version]): - if not upper_bound: - return lambda version: version_predicate(version, selected) - else: - return lambda version: version_predicate(version, selected) and version < upper_bound - - -parser = argparse.ArgumentParser(description="Find latest version for a GNOME package by crawling their release server.") -parser.add_argument("package-name", help="Name of the directory in https://ftp.gnome.org/pub/GNOME/sources/ containing the package.") -parser.add_argument("version-policy", help="Policy determining which versions are considered stable. GNOME packages usually denote stability by alpha/beta/rc tag in the version. For older packages, odd minor versions are unstable but there are exceptions.", choices=version_policies.keys(), nargs="?", default="tagged") -parser.add_argument("requested-release", help="Most of the time, we will want to update to stable version but sometimes it is useful to test.", choices=["stable", "unstable"], nargs="?", default="stable") -parser.add_argument("--upper-bound", dest="upper-bound", help="Only look for versions older than this one (useful for pinning dependencies).") - - -if __name__ == "__main__": - args = parser.parse_args() - - package_name = getattr(args, "package-name") - requested_release = getattr(args, "requested-release") - upper_bound = getattr(args, "upper-bound") - if upper_bound: - upper_bound = Version(upper_bound) - version_predicate = version_policies[getattr(args, "version-policy")] - version_policy = make_version_policy(version_predicate, requested_release, upper_bound) - - # The structure of cache.json: https://gitlab.gnome.org/Infrastructure/sysadmin-bin/blob/master/ftpadmin#L762 - cache = json.loads(requests.get(f"https://ftp.gnome.org/pub/GNOME/sources/{package_name}/cache.json").text) - if type(cache) != list or cache[0] != 4: - print("Unknown format of cache.json file.", file=sys.stderr) - sys.exit(1) - - versions = map(Version, cache[2][package_name]) - versions = sorted(filter(version_policy, versions)) - - if len(versions) == 0: - print("No versions matched.", file=sys.stderr) - sys.exit(1) - - print(versions[-1].value) diff --git a/pkgs/desktops/gnome-3/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/games/aisleriot/default.nix deleted file mode 100644 index bb513df4c7a90..0000000000000 --- a/pkgs/desktops/gnome-3/games/aisleriot/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ lib, stdenv -, fetchFromGitLab -, pkg-config -, gnome3 -, itstool -, gtk3 -, wrapGAppsHook -, meson -, librsvg -, libxml2 -, desktop-file-utils -, pysolfc -, guile -, libcanberra-gtk3 -, ninja -, appstream-glib -, yelp-tools -}: - -stdenv.mkDerivation rec { - pname = "aisleriot"; - version = "3.22.13"; - - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "GNOME"; - repo = pname; - rev = version; - sha256 = "05k84bbgrrxchxg08l1jjcz384kpjdmxd24g0wnf731aa9zcnp5k"; - }; - - nativeBuildInputs = [ - wrapGAppsHook - meson - ninja - appstream-glib - pkg-config - itstool - libxml2 - desktop-file-utils - yelp-tools - ]; - - buildInputs = [ - gtk3 - librsvg - guile - libcanberra-gtk3 - pysolfc - ]; - - prePatch = '' - patchShebangs cards/meson_svgz.sh - patchShebangs data/meson_desktopfile.py - patchShebangs data/icons/meson_updateiconcache.py - patchShebangs src/lib/meson_compileschemas.py - ''; - - mesonFlags = [ - "-Dtheme_kde=false" - ]; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Aisleriot"; - description = "A collection of patience games written in guile scheme"; - maintainers = teams.gnome.members; - license = licenses.gpl3Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/games/atomix/default.nix b/pkgs/desktops/gnome-3/games/atomix/default.nix deleted file mode 100644 index 802d92bf19a0a..0000000000000 --- a/pkgs/desktops/gnome-3/games/atomix/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, wrapGAppsHook, python3 -, gettext, gnome3, glib, gtk3, libgnome-games-support, gdk-pixbuf }: - -let - pname = "atomix"; - version = "3.34.0"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0h909a4mccf160hi0aimyicqhq2b0gk1dmqp7qwf87qghfrw6m00"; - }; - - nativeBuildInputs = [ meson ninja pkg-config gettext wrapGAppsHook python3 ]; - buildInputs = [ glib gtk3 gdk-pixbuf libgnome-games-support gnome3.adwaita-icon-theme ]; - - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - meta = with lib; { - description = "Puzzle game where you move atoms to build a molecule"; - homepage = "https://wiki.gnome.org/Apps/Atomix"; - license = licenses.gpl2Plus; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/games/five-or-more/default.nix deleted file mode 100644 index 9f6ea6aac04c4..0000000000000 --- a/pkgs/desktops/gnome-3/games/five-or-more/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gnome3, gtk3, wrapGAppsHook -, librsvg, libgnome-games-support, gettext, itstool, libxml2, python3, vala }: - -stdenv.mkDerivation rec { - pname = "five-or-more"; - version = "3.32.2"; - - src = fetchurl { - url = "mirror://gnome/sources/five-or-more/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "19pf8wzbf3ciqf2k4bj9sddvyhckfd62x86pnqr6s8h4vn9jc6ii"; - }; - - nativeBuildInputs = [ - meson ninja pkg-config gettext itstool libxml2 python3 wrapGAppsHook - vala - ]; - buildInputs = [ - gtk3 librsvg libgnome-games-support gnome3.adwaita-icon-theme - ]; - - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "five-or-more"; - attrPath = "gnome3.five-or-more"; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Five_or_more"; - description = "Remove colored balls from the board by forming lines"; - maintainers = teams.gnome.members; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix deleted file mode 100644 index 17dc8fe7c2c7a..0000000000000 --- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook -, gettext, meson, gsound, librsvg, itstool, vala -, python3, ninja, desktop-file-utils }: - -stdenv.mkDerivation rec { - pname = "four-in-a-row"; - version = "3.38.1"; - - src = fetchurl { - url = "mirror://gnome/sources/four-in-a-row/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "10ji60bdfdzb6wk5dkwjc3yww7hqi3yjcx1k1z7x2521h2dpdli1"; - }; - - nativeBuildInputs = [ - pkg-config wrapGAppsHook gettext meson itstool vala - ninja python3 desktop-file-utils - ]; - buildInputs = [ gtk3 gsound librsvg gnome3.adwaita-icon-theme ]; - - postPatch = '' - chmod +x build-aux/meson_post_install.py - patchShebangs build-aux/meson_post_install.py - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "four-in-a-row"; - attrPath = "gnome3.four-in-a-row"; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Four-in-a-row"; - description = "Make lines of the same color to win"; - maintainers = teams.gnome.members; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix deleted file mode 100644 index c8bea5a98d2db..0000000000000 --- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ lib -, stdenv -, fetchurl -, meson -, ninja -, vala -, pkg-config -, wrapGAppsHook4 -, gobject-introspection -, gettext -, itstool -, libxml2 -, python3 -, gnome3 -, glib -, gtk4 -, librsvg -}: - -stdenv.mkDerivation rec { - pname = "gnome-chess"; - version = "40.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-chess/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "132nc96z0bryyi9d5gljsbwsa71rl8wm5w57jbhpwiv4fyjhgybk"; - }; - - nativeBuildInputs = [ - meson - ninja - vala - pkg-config - gettext - itstool - libxml2 - python3 - wrapGAppsHook4 - gobject-introspection - ]; - - buildInputs = [ - glib - gtk4 - librsvg - gnome3.adwaita-icon-theme - ]; - - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "gnome-chess"; - attrPath = "gnome3.gnome-chess"; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Chess"; - description = "Play the classic two-player boardgame of chess"; - maintainers = teams.gnome.members; - license = licenses.gpl3Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix deleted file mode 100644 index 4bafc3b4a8d69..0000000000000 --- a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, vala, gnome3, gtk3, wrapGAppsHook, appstream-glib, desktop-file-utils -, glib, librsvg, libxml2, gettext, itstool, libgee, libgnome-games-support -, meson, ninja, python3 -}: - -let - pname = "gnome-klotski"; - version = "3.38.2"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1qm01hdd5yp8chig62bj10912vclbdvywwczs84sfg4zci2phqwi"; - }; - - nativeBuildInputs = [ - pkg-config vala meson ninja python3 wrapGAppsHook - gettext itstool libxml2 appstream-glib desktop-file-utils - gnome3.adwaita-icon-theme - ]; - buildInputs = [ glib gtk3 librsvg libgee libgnome-games-support ]; - - postPatch = '' - chmod +x build-aux/meson_post_install.py - patchShebangs build-aux/meson_post_install.py - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Klotski"; - description = "Slide blocks to solve the puzzle"; - maintainers = teams.gnome.members; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix deleted file mode 100644 index d5d2de53e47cc..0000000000000 --- a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook -, librsvg, gettext, itstool, libxml2 -, meson, ninja, glib, vala, desktop-file-utils -}: - -stdenv.mkDerivation rec { - pname = "gnome-mahjongg"; - version = "3.38.3"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-mahjongg/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "144ia3zn9rhwa1xbdkvsz6m0dsysl6mxvqw9bnrlh845hmyy9cfj"; - }; - - nativeBuildInputs = [ - meson ninja vala desktop-file-utils - pkg-config gnome3.adwaita-icon-theme - libxml2 itstool gettext wrapGAppsHook - glib # for glib-compile-schemas - ]; - buildInputs = [ - glib - gtk3 - librsvg - ]; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Mahjongg"; - description = "Disassemble a pile of tiles by removing matching pairs"; - maintainers = teams.gnome.members; - license = licenses.gpl3Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix deleted file mode 100644 index f074fb08daa90..0000000000000 --- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchurl, meson, ninja, vala, gobject-introspection, pkg-config, gnome3, gtk3, wrapGAppsHook -, librsvg, gettext, itstool, python3, libxml2, libgnome-games-support, libgee, desktop-file-utils }: - -stdenv.mkDerivation rec { - pname = "gnome-mines"; - version = "40.0"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0sf6kdvhr4pr3hddnj6ql9larz2wy108sri31id6x9g459nbly8z"; - }; - - # gobject-introspection for finding vapi files - nativeBuildInputs = [ - meson ninja vala gobject-introspection pkg-config gettext itstool python3 - libxml2 wrapGAppsHook desktop-file-utils - ]; - buildInputs = [ gtk3 librsvg gnome3.adwaita-icon-theme libgnome-games-support libgee ]; - - postPatch = '' - chmod +x build-aux/meson_post_install.py - patchShebangs build-aux/meson_post_install.py - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "gnome-mines"; - attrPath = "gnome3.gnome-mines"; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Mines"; - description = "Clear hidden mines from a minefield"; - maintainers = teams.gnome.members; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix deleted file mode 100644 index c3d9fb19725a1..0000000000000 --- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchpatch -, pkg-config -, gnome3 -, gtk3 -, wrapGAppsHook -, librsvg -, gsound -, clutter-gtk -, gettext -, itstool -, vala -, python3 -, libxml2 -, libgee -, libgnome-games-support -, meson -, ninja -, desktop-file-utils -, hicolor-icon-theme -}: - -stdenv.mkDerivation rec { - pname = "gnome-nibbles"; - version = "3.38.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-nibbles/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1naknfbciydbym79a0jq039xf0033z8gyln48c0qsbcfr2qn8yj5"; - }; - - patches = [ - # Fix build with recent Vala. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-nibbles/-/commit/62964e9256fcac616109af874dbb2bd8342a9853.patch"; - sha256 = "4VijELRxycS8rwi1HU9U3h9K/VtdQjJntfdtMN9Uz34="; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-nibbles/-/commit/1b48446068608aff9b5edf1fdbd4b8c0d9f0be94.patch"; - sha256 = "X0+Go5ae4F06WTPDYc2HIIax8X4RDgUGO6A6Qp8UifQ="; - }) - ]; - - nativeBuildInputs = [ - meson - ninja - vala - python3 - pkg-config - wrapGAppsHook - gettext - itstool - libxml2 - desktop-file-utils - hicolor-icon-theme - ]; - - buildInputs = [ - gtk3 - librsvg - gsound - clutter-gtk - gnome3.adwaita-icon-theme - libgee - libgnome-games-support - ]; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "gnome-nibbles"; - attrPath = "gnome3.gnome-nibbles"; - }; - }; - - meta = with lib; { - description = "Guide a worm around a maze"; - homepage = "https://wiki.gnome.org/Apps/Nibbles"; - license = licenses.gpl2; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix deleted file mode 100644 index 1a49ee387609d..0000000000000 --- a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ lib -, stdenv -, fetchurl -, pkg-config -, gnome3 -, gtk3 -, wrapGAppsHook -, librsvg -, gsound -, gettext -, itstool -, libxml2 -, libgnome-games-support -, libgee -, meson -, ninja -, vala -, python3 -, desktop-file-utils -, adwaita-icon-theme -}: - -stdenv.mkDerivation rec { - pname = "gnome-robots"; - version = "40.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-robots/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "04fbykj576dq1h6cycgfhh8wd6yxmlsqykvj188sbwahay42zgvg"; - }; - - nativeBuildInputs = [ - pkg-config - meson - ninja - vala - python3 - libxml2 - wrapGAppsHook - gettext - itstool - desktop-file-utils - ]; - - buildInputs = [ - gtk3 - librsvg - gsound - libgnome-games-support - libgee - adwaita-icon-theme - ]; - - postPatch = '' - chmod +x build-aux/meson_post_install.py - patchShebangs build-aux/meson_post_install.py - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "gnome-robots"; - attrPath = "gnome3.gnome-robots"; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Robots"; - description = "Avoid the robots and make them crash into each other"; - maintainers = teams.gnome.members; - license = licenses.gpl3Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix deleted file mode 100644 index 101f3c4f2bd01..0000000000000 --- a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchurl, meson, ninja, vala, pkg-config, gobject-introspection, gettext, gtk3, gnome3, wrapGAppsHook -, libgee, json-glib, qqwing, itstool, libxml2, python3, desktop-file-utils }: - -stdenv.mkDerivation rec { - pname = "gnome-sudoku"; - version = "40.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "1nr1g4q1gxqbzmaz15y3zgssnj7w01cq9l422ja4rglyg0fwjhbm"; - }; - - nativeBuildInputs = [ meson ninja vala pkg-config gobject-introspection gettext itstool libxml2 python3 desktop-file-utils wrapGAppsHook ]; - buildInputs = [ gtk3 libgee json-glib qqwing ]; - - postPatch = '' - chmod +x build-aux/post_install.py - patchShebangs build-aux/post_install.py - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "gnome-sudoku"; - attrPath = "gnome3.gnome-sudoku"; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Sudoku"; - description = "Test your logic skills in this number grid puzzle"; - maintainers = teams.gnome.members; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix deleted file mode 100644 index 91bd963734461..0000000000000 --- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchpatch -, pkg-config -, gnome3 -, gtk3 -, wrapGAppsHook -, librsvg -, gsound -, gettext -, itstool -, libxml2 -, meson -, ninja -, vala -, python3 -, desktop-file-utils -}: - -stdenv.mkDerivation rec { - pname = "gnome-taquin"; - version = "3.38.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-taquin/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0kw131q0ad0rbsp6qifjc8fjlhvjxyihil8a76kj8ya9mn7kvnwn"; - }; - - patches = [ - # Fix build with recent Vala. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-taquin/-/commit/99dea5e7863e112f33f16e59898c56a4f1a547b3.patch"; - sha256 = "U7djuMhb1XJaKAPyogQjaunOkbBK24r25YD7BgH05P4="; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-taquin/-/commit/66be44dc20d114e449fc33156e3939fd05dfbb16.patch"; - sha256 = "RN41RCLHlJyXTARSH9qjsmpYi1UFeMRssoYxRsbngDQ="; - }) - ]; - - nativeBuildInputs = [ - pkg-config - wrapGAppsHook - meson - ninja - python3 - gettext - itstool - libxml2 - vala - desktop-file-utils - ]; - buildInputs = [ - gtk3 - librsvg - gsound - gnome3.adwaita-icon-theme - ]; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "gnome-taquin"; - attrPath = "gnome3.gnome-taquin"; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Taquin"; - description = "Move tiles so that they reach their places"; - maintainers = teams.gnome.members; - license = licenses.gpl3Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix deleted file mode 100644 index 9ae7377379933..0000000000000 --- a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook -, libxml2, gettext, itstool, meson, ninja, python3 -, vala, desktop-file-utils -}: - -stdenv.mkDerivation rec { - pname = "gnome-tetravex"; - version = "3.38.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-tetravex/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "06wihvqp2p52zd2dnknsc3rii69qib4a30yp15h558xrg44z3k8z"; - }; - - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-tetravex"; attrPath = "gnome3.gnome-tetravex"; }; - }; - - nativeBuildInputs = [ - wrapGAppsHook itstool libxml2 gnome3.adwaita-icon-theme - pkg-config gettext meson ninja python3 vala desktop-file-utils - ]; - buildInputs = [ - gtk3 - ]; - - postPatch = '' - chmod +x build-aux/meson_post_install.py - patchShebangs build-aux/meson_post_install.py - ''; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Tetravex"; - description = "Complete the puzzle by matching numbered tiles"; - maintainers = teams.gnome.members; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/games/hitori/default.nix b/pkgs/desktops/gnome-3/games/hitori/default.nix deleted file mode 100644 index 8369c571f5419..0000000000000 --- a/pkgs/desktops/gnome-3/games/hitori/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ lib, stdenv -, fetchurl -, meson -, ninja -, pkg-config -, gnome3 -, glib -, gtk3 -, cairo -, wrapGAppsHook -, libxml2 -, python3 -, gettext -, itstool -, desktop-file-utils -, adwaita-icon-theme -}: - -stdenv.mkDerivation rec { - pname = "hitori"; - version = "3.38.1"; - - src = fetchurl { - url = "mirror://gnome/sources/hitori/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "Ar0sQh1OIYAmVxToVL0S79PG0Vbd8h95599gAR1OQYQ="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gettext - itstool - desktop-file-utils - libxml2 - python3 - wrapGAppsHook - ]; - - buildInputs = [ - glib - gtk3 - cairo - adwaita-icon-theme - ]; - - postPatch = '' - chmod +x build-aux/meson_post_install.py - patchShebangs build-aux/meson_post_install.py - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Hitori"; - description = "GTK application to generate and let you play games of Hitori"; - maintainers = teams.gnome.members; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix deleted file mode 100644 index 443a417da5054..0000000000000 --- a/pkgs/desktops/gnome-3/games/iagno/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ lib, stdenv -, fetchurl -, fetchpatch -, pkg-config -, gtk3 -, gnome3 -, gdk-pixbuf -, librsvg -, wrapGAppsHook -, itstool -, gsound -, libxml2 -, meson -, ninja -, python3 -, vala -, desktop-file-utils -}: - -stdenv.mkDerivation rec { - pname = "iagno"; - version = "3.38.1"; - - src = fetchurl { - url = "mirror://gnome/sources/iagno/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "097dw1l92l73xah9l56ka5mi3dvx48ffpiv33ni5i5rqw0ng7fc4"; - }; - - patches = [ - # Fix build with recent Vala. - # https://gitlab.gnome.org/GNOME/dconf-editor/-/merge_requests/15 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/iagno/-/commit/e8a0aeec350ea80349582142c0e8e3cd3f1bce38.patch"; - sha256 = "OO1x0Yx56UFzHTBsPAMYAjnJHlnTjdO1Vk7q6XU8wKQ="; - }) - # https://gitlab.gnome.org/GNOME/dconf-editor/-/merge_requests/13 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/iagno/-/commit/508c0f94e5f182e50ff61be6e04f72574dee97cb.patch"; - sha256 = "U7djuMhb1XJaKAPyogQjaunOkbBK24r25YD7BgH05P4="; - }) - ]; - - nativeBuildInputs = [ - meson - ninja - python3 - vala - desktop-file-utils - pkg-config - wrapGAppsHook - itstool - libxml2 - ]; - - buildInputs = [ - gtk3 - gnome3.adwaita-icon-theme - gdk-pixbuf - librsvg - gsound - ]; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "iagno"; - attrPath = "gnome3.iagno"; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Iagno"; - description = "Computer version of the game Reversi, more popularly called Othello"; - maintainers = teams.gnome.members; - license = licenses.gpl3Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/games/lightsoff/default.nix deleted file mode 100644 index 7e43583d52982..0000000000000 --- a/pkgs/desktops/gnome-3/games/lightsoff/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchurl, vala, pkg-config, gtk3, gnome3, gdk-pixbuf, librsvg, wrapGAppsHook -, gettext, itstool, clutter, clutter-gtk, libxml2, appstream-glib -, meson, ninja, python3 }: - -stdenv.mkDerivation rec { - pname = "lightsoff"; - version = "40.0.1"; - - src = fetchurl { - url = "mirror://gnome/sources/lightsoff/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "1aziy64g15bm83zfn3ifs20z9yvscdvsxbx132xnq77i0r3qvlxc"; - }; - - nativeBuildInputs = [ - vala pkg-config wrapGAppsHook itstool gettext appstream-glib libxml2 - meson ninja python3 - ]; - buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk-pixbuf librsvg clutter clutter-gtk ]; - - postPatch = '' - chmod +x build-aux/meson_post_install.py - patchShebangs build-aux/meson_post_install.py - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "lightsoff"; - attrPath = "gnome3.lightsoff"; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Lightsoff"; - description = "Puzzle game, where the objective is to turn off all of the tiles on the board"; - maintainers = teams.gnome.members; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix deleted file mode 100644 index de3d67b58bffc..0000000000000 --- a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk3, gnome3, gdk-pixbuf -, librsvg, gsound, libmanette -, gettext, itstool, libxml2, clutter, clutter-gtk, wrapGAppsHook -, meson, ninja, python3, vala, desktop-file-utils -}: - -stdenv.mkDerivation rec { - pname = "quadrapassel"; - version = "3.38.1"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "033plabc6q3sk6qjr5nml8z6p07vcw57gxddxjk9b65wgg0rzzhr"; - }; - - nativeBuildInputs = [ - meson ninja python3 vala desktop-file-utils - pkg-config gnome3.adwaita-icon-theme - libxml2 itstool gettext wrapGAppsHook - ]; - buildInputs = [ - gtk3 gdk-pixbuf librsvg libmanette - gsound clutter libxml2 clutter-gtk - ]; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - meta = with lib; { - description = "Classic falling-block game, Tetris"; - homepage = "https://wiki.gnome.org/Apps/Quadrapassel"; - license = licenses.gpl2; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/games/swell-foop/default.nix deleted file mode 100644 index d29ac55ce280d..0000000000000 --- a/pkgs/desktops/gnome-3/games/swell-foop/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ lib -, stdenv -, fetchurl -, meson -, ninja -, pkg-config -, vala -, glib -, gtk3 -, libgnome-games-support -, gnome3 -, desktop-file-utils -, clutter -, clutter-gtk -, gettext -, itstool -, libxml2 -, wrapGAppsHook -, python3 -}: - -stdenv.mkDerivation rec { - pname = "swell-foop"; - version = "40.1"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "17r4b0g8s7z872wdd7ngk248z7fqx43vm2sym1bdqhzsi250s1y1"; - }; - - nativeBuildInputs = [ - meson - ninja - vala - pkg-config - wrapGAppsHook - python3 - itstool - gettext - libxml2 - desktop-file-utils - ]; - - buildInputs = [ - glib - gtk3 - libgnome-games-support - gnome3.adwaita-icon-theme - clutter - clutter-gtk - ]; - - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Swell%20Foop"; - description = "Puzzle game, previously known as Same GNOME"; - maintainers = teams.gnome.members; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/games/tali/default.nix b/pkgs/desktops/gnome-3/games/tali/default.nix deleted file mode 100644 index e5aad262aa9b5..0000000000000 --- a/pkgs/desktops/gnome-3/games/tali/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk3, gnome3, gdk-pixbuf -, librsvg, libgnome-games-support, gettext, itstool, libxml2, wrapGAppsHook -, meson, ninja, python3, desktop-file-utils -}: - -stdenv.mkDerivation rec { - pname = "tali"; - version = "40.0"; - - src = fetchurl { - url = "mirror://gnome/sources/tali/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "19gic6yjg3bg6jf87zvhm7ihsz1y58dz86p4x3a16xdhjyrk40q2"; - }; - - passthru = { - updateScript = gnome3.updateScript { packageName = "tali"; attrPath = "gnome3.tali"; }; - }; - - nativeBuildInputs = [ - meson ninja python3 desktop-file-utils - pkg-config gnome3.adwaita-icon-theme - libxml2 itstool gettext wrapGAppsHook - ]; - buildInputs = [ gtk3 gdk-pixbuf librsvg libgnome-games-support ]; - - postPatch = '' - chmod +x build-aux/meson_post_install.py - patchShebangs build-aux/meson_post_install.py - ''; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Tali"; - description = "Sort of poker with dice and less money"; - maintainers = teams.gnome.members; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/installer.nix b/pkgs/desktops/gnome-3/installer.nix deleted file mode 100644 index 4999e1f3343cf..0000000000000 --- a/pkgs/desktops/gnome-3/installer.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ isoBaseName ? "nixos-graphical-gnome", system ? builtins.currentSystem -, extraModules ? [] }: - -let - - module = ../../../../nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix; - - config = (import ../../../../nixos/lib/eval-config.nix { - inherit system; - modules = [ module { isoImage.isoBaseName = isoBaseName; } ] ++ extraModules; - }).config; - -in - config.system.build.isoImage - diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix deleted file mode 100644 index 3abddaedaec69..0000000000000 --- a/pkgs/desktops/gnome-3/misc/geary/default.nix +++ /dev/null @@ -1,160 +0,0 @@ -{ lib -, stdenv -, fetchurl -, pkg-config -, gtk3 -, vala -, enchant2 -, wrapGAppsHook -, meson -, ninja -, desktop-file-utils -, gnome-online-accounts -, gsettings-desktop-schemas -, adwaita-icon-theme -, libpeas -, libsecret -, gmime3 -, isocodes -, icu -, libxml2 -, gettext -, sqlite -, gcr -, json-glib -, itstool -, libgee -, gnome3 -, webkitgtk -, python3 -, gnutls -, cacert -, xvfb_run -, glibcLocales -, dbus -, shared-mime-info -, libunwind -, folks -, glib-networking -, gobject-introspection -, gspell -, appstream-glib -, libstemmer -, libytnef -, libhandy -, gsound -}: - -stdenv.mkDerivation rec { - pname = "geary"; - version = "40.0"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "1c2nd35500ng28223y5pszc7fh8g16njj34f6p5xc9594lvj0mik"; - }; - - nativeBuildInputs = [ - appstream-glib - desktop-file-utils - gettext - gobject-introspection - itstool - libxml2 - meson - ninja - pkg-config - python3 - vala - wrapGAppsHook - ]; - - buildInputs = [ - adwaita-icon-theme - enchant2 - folks - gcr - glib-networking - gmime3 - gnome-online-accounts - gsettings-desktop-schemas - gsound - gspell - gtk3 - isocodes - icu - json-glib - libgee - libhandy - libpeas - libsecret - libunwind - libstemmer - libytnef - sqlite - webkitgtk - ]; - - checkInputs = [ - dbus - gnutls # for certtool - cacert # trust store for glib-networking - xvfb_run - glibcLocales # required by Geary.ImapDb.DatabaseTest/utf8_case_insensitive_collation - ]; - - mesonFlags = [ - "-Dprofile=release" - "-Dcontractor=enabled" # install the contractor file (Pantheon specific) - ]; - - # NOTE: Remove `build-auxyaml_to_json.py` when no longer needed, see: - # https://gitlab.gnome.org/GNOME/geary/commit/f7f72143e0f00ca5e0e6a798691805c53976ae31#0cc1139e3347f573ae1feee5b73dbc8a8a21fcfa - postPatch = '' - chmod +x build-aux/post_install.py build-aux/git_version.py - - patchShebangs build-aux/post_install.py build-aux/git_version.py - - chmod +x build-aux/yaml_to_json.py - patchShebangs build-aux/yaml_to_json.py - - chmod +x desktop/geary-attach - ''; - - # Some tests time out. - doCheck = false; - - checkPhase = '' - runHook preCheck - - NO_AT_BRIDGE=1 \ - GIO_EXTRA_MODULES=$GIO_EXTRA_MODULES:${glib-networking}/lib/gio/modules \ - HOME=$TMPDIR \ - XDG_DATA_DIRS=$XDG_DATA_DIRS:${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${shared-mime-info}/share:${folks}/share/gsettings-schemas/${folks.name} \ - xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ - meson test -v --no-stdsplit - - runHook postCheck - ''; - - preFixup = '' - # Add geary to path for geary-attach - gappsWrapperArgs+=(--prefix PATH : "$out/bin") - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Geary"; - description = "Mail client for GNOME 3"; - maintainers = teams.gnome.members; - license = licenses.lgpl21Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix deleted file mode 100644 index 4920575159122..0000000000000 --- a/pkgs/desktops/gnome-3/misc/gitg/default.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ lib -, stdenv -, fetchurl -, vala -, gettext -, pkg-config -, gtk3 -, glib -, json-glib -, wrapGAppsHook -, libpeas -, bash -, gobject-introspection -, libsoup -, gtksourceview -, gsettings-desktop-schemas -, adwaita-icon-theme -, gnome3 -, gtkspell3 -, shared-mime-info -, libgee -, libgit2-glib -, libsecret -, meson -, ninja -, python3 -, libdazzle -}: - -stdenv.mkDerivation rec { - pname = "gitg"; - version = "3.32.1"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0npg4kqpwl992fgjd2cn3fh84aiwpdp9kd8z7rw2xaj2iazsm914"; - }; - - nativeBuildInputs = [ - gobject-introspection - gettext - meson - ninja - pkg-config - python3 - vala - wrapGAppsHook - ]; - - buildInputs = [ - adwaita-icon-theme - glib - gsettings-desktop-schemas - gtk3 - gtksourceview - gtkspell3 - json-glib - libdazzle - libgee - libgit2-glib - libpeas - libsecret - libsoup - ]; - - doCheck = false; # FAIL: tests-gitg gtk_style_context_add_provider_for_screen: assertion 'GDK_IS_SCREEN (screen)' failed - - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - - substituteInPlace tests/libgitg/test-commit.vala --replace "/bin/bash" "${bash}/bin/bash" - ''; - - preFixup = '' - gappsWrapperArgs+=( - # Thumbnailers - --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" - ) - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Gitg"; - description = "GNOME GUI client to view git repositories"; - maintainers = with maintainers; [ domenkozar ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix deleted file mode 100644 index 21dedba16ad00..0000000000000 --- a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ lib, stdenv -, fetchurl -, gettext -, itstool -, libxml2 -, pkg-config -, gnome-panel -, gtk3 -, glib -, libwnck3 -, libgtop -, libnotify -, upower -, wirelesstools -, linuxPackages -, adwaita-icon-theme -, libgweather -, gucharmap -, tracker -, polkit -, gnome3 -}: - -stdenv.mkDerivation rec { - pname = "gnome-applets"; - version = "3.40.0"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1k6mdkg16ia29fyg8ikf4dfs51gnrmg0f8xwpvd3192lhfsbsh19"; - }; - - nativeBuildInputs = [ - gettext - itstool - pkg-config - libxml2 - ]; - - buildInputs = [ - gnome-panel - gtk3 - glib - libxml2 - libwnck3 - libgtop - libnotify - upower - adwaita-icon-theme - libgweather - gucharmap - tracker - polkit - wirelesstools - linuxPackages.cpupower - ]; - - enableParallelBuilding = true; - - doCheck = true; - - # Don't try to install modules to gnome panel's directory, as it's read only - PKG_CONFIG_LIBGNOME_PANEL_MODULESDIR = "${placeholder "out"}/lib/gnome-panel/modules"; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - versionPolicy = "odd-unstable"; - }; - }; - - meta = with lib; { - description = "Applets for use with the GNOME panel"; - homepage = "https://wiki.gnome.org/Projects/GnomeApplets"; - license = licenses.gpl2Plus; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix deleted file mode 100644 index 8d5f07579c6df..0000000000000 --- a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, stdenv -, fetchurl -, pkg-config -, gnome3 -, gtk3 -, glib -, gobject-introspection -, libarchive -, vala -}: - -stdenv.mkDerivation rec { - pname = "gnome-autoar"; - version = "0.3.2"; - - outputs = [ "out" "dev" ]; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-autoar/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0wkwix44yg126xn1v4f2j60bv9yiyadfpzf8ifx0bvd9x5f4v354"; - }; - - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-autoar"; attrPath = "gnome3.gnome-autoar"; }; - }; - - nativeBuildInputs = [ - gobject-introspection - pkg-config - vala - ]; - - buildInputs = [ - gtk3 - ]; - - propagatedBuildInputs = [ - libarchive - glib - ]; - - meta = with lib; { - platforms = platforms.linux; - maintainers = teams.gnome.members; - license = licenses.lgpl21Plus; - description = "Library to integrate compressed files management with GNOME"; - }; -} diff --git a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix deleted file mode 100644 index 501000f204fd7..0000000000000 --- a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix +++ /dev/null @@ -1,203 +0,0 @@ -{ lib, stdenv -, autoreconfHook -, fetchurl -, gettext -, glib -, gnome-bluetooth -, gnome-desktop -, gnome-panel -, gnome-session -, gnome3 -, gsettings-desktop-schemas -, gtk3 -, ibus -, libcanberra-gtk3 -, libpulseaudio -, libxkbfile -, libxml2 -, pkg-config -, polkit -, gdm -, systemd -, upower -, pam -, wrapGAppsHook -, writeTextFile -, writeShellScriptBin -, xkeyboard_config -, xorg -, runCommand -}: -let - pname = "gnome-flashback"; - version = "3.40.0"; - - # From data/sessions/Makefile.am - requiredComponentsCommon = [ - "gnome-flashback" - "gnome-panel" - ]; - requiredComponentsGsd = [ - "org.gnome.SettingsDaemon.A11ySettings" - "org.gnome.SettingsDaemon.Color" - "org.gnome.SettingsDaemon.Datetime" - "org.gnome.SettingsDaemon.Housekeeping" - "org.gnome.SettingsDaemon.Keyboard" - "org.gnome.SettingsDaemon.MediaKeys" - "org.gnome.SettingsDaemon.Power" - "org.gnome.SettingsDaemon.PrintNotifications" - "org.gnome.SettingsDaemon.Rfkill" - "org.gnome.SettingsDaemon.ScreensaverProxy" - "org.gnome.SettingsDaemon.Sharing" - "org.gnome.SettingsDaemon.Smartcard" - "org.gnome.SettingsDaemon.Sound" - "org.gnome.SettingsDaemon.UsbProtection" - "org.gnome.SettingsDaemon.Wacom" - "org.gnome.SettingsDaemon.XSettings" - ]; - requiredComponents = wmName: "RequiredComponents=${lib.concatStringsSep ";" ([ wmName ] ++ requiredComponentsCommon ++ requiredComponentsGsd)};"; - gnome-flashback = stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0fxv13m2q9z1q3i9jbggl35cb7jlckbdrfsr5sf030hr1w836gz0"; - }; - - # make .desktop Execs absolute - postPatch = '' - patch -p0 < 1 && builtins.match "[0-9]+" minorVersion != null; - nextMinor = builtins.fromJSON minorVersion + 1; - upperBound = "${lib.versions.major packageVersion}.${builtins.toString nextMinor}"; - in lib.optionalString (freeze && minorAvailable) ''--upper-bound="${upperBound}"''; - updateScript = writeScript "gnome-update-script" '' - #!${stdenv.shell} - set -o errexit - package_name="$1" - attr_path="$2" - version_policy="$3" - PATH=${lib.makeBinPath [ common-updater-scripts python ]} - latest_tag=$(python "${./find-latest-version.py}" "$package_name" "$version_policy" "stable" ${upperBoundFlag}) - update-source-version "$attr_path" "$latest_tag" - ''; -in [ updateScript packageName attrPath versionPolicy ] diff --git a/pkgs/desktops/gnome/apps/accerciser/default.nix b/pkgs/desktops/gnome/apps/accerciser/default.nix new file mode 100644 index 0000000000000..d81b846619417 --- /dev/null +++ b/pkgs/desktops/gnome/apps/accerciser/default.nix @@ -0,0 +1,74 @@ +{ lib +, fetchurl +, pkg-config +, gnome +, gtk3 +, wrapGAppsHook +, gobject-introspection +, itstool +, libxml2 +, python3 +, at-spi2-core +, dbus +, gettext +, libwnck3 +, adwaita-icon-theme +}: + +python3.pkgs.buildPythonApplication rec { + pname = "accerciser"; + version = "3.38.0"; + + format = "other"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0fd9vv2abd2if2qj4nlfy7mpd7rc4sx18zhmxd5ijlnfhkpggbp5"; + }; + + nativeBuildInputs = [ + gettext + gobject-introspection # For setup hook + itstool + libxml2 + pkg-config + dbus + wrapGAppsHook + ]; + + buildInputs = [ + adwaita-icon-theme + at-spi2-core + gtk3 + libwnck3 + ]; + + propagatedBuildInputs = with python3.pkgs; [ + ipython + pyatspi + pycairo + pygobject3 + setuptools + xlib + ]; + + # Strict deps breaks accerciser + # and https://github.com/NixOS/nixpkgs/issues/56943 + strictDeps = false; + + passthru = { + updateScript = gnome.updateScript { + packageName = "accerciser"; + attrPath = "gnome.accerciser"; + versionPolicy = "odd-unstable"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Accerciser"; + description = "Interactive Python accessibility explorer"; + maintainers = teams.gnome.members; + license = licenses.bsd3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/apps/cheese/default.nix b/pkgs/desktops/gnome/apps/cheese/default.nix new file mode 100644 index 0000000000000..d0a9d6aaabb12 --- /dev/null +++ b/pkgs/desktops/gnome/apps/cheese/default.nix @@ -0,0 +1,121 @@ +{ lib +, stdenv +, gettext +, fetchurl +, fetchpatch +, wrapGAppsHook +, gnome-video-effects +, libcanberra-gtk3 +, pkg-config +, gtk3 +, glib +, clutter-gtk +, clutter-gst +, gst_all_1 +, itstool +, vala +, docbook_xml_dtd_43 +, docbook-xsl-nons +, appstream-glib +, libxslt +, gtk-doc +, adwaita-icon-theme +, librsvg +, totem +, gdk-pixbuf +, gnome +, gnome-desktop +, libxml2 +, meson +, ninja +, dbus +, python3 +}: + +stdenv.mkDerivation rec { + pname = "cheese"; + version = "3.38.0"; + + outputs = [ "out" "man" "devdoc" ]; + + src = fetchurl { + url = "mirror://gnome/sources/cheese/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0vyim2avlgq3a48rgdfz5g21kqk11mfb53b2l883340v88mp7ll8"; + }; + + patches = [ + # Fix build with latest Vala or GLib + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/cheese/commit/7cf6268e54620bbbe5e6e61800c50fb0cb4bea57.patch"; + sha256 = "WJgGNrpZLTahe7Sxr8HdTl+4Mf4VcmJb6DdiInlDcT4="; + }) + ]; + + nativeBuildInputs = [ + appstream-glib + docbook_xml_dtd_43 + docbook-xsl-nons + gettext + gtk-doc + itstool + libxml2 + libxslt # for xsltproc + meson + ninja + pkg-config + python3 + vala + wrapGAppsHook + glib # for glib-compile-schemas + ]; + + buildInputs = [ + adwaita-icon-theme + clutter-gst + clutter-gtk + dbus + gdk-pixbuf + glib + gnome-desktop + gnome-video-effects + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gstreamer + gtk3 + libcanberra-gtk3 + librsvg + ]; + + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; + + preFixup = '' + gappsWrapperArgs+=( + # Effects + --prefix XDG_DATA_DIRS : "${gnome-video-effects}/share" + # vp8enc preset + --prefix GST_PRESET_PATH : "${gst_all_1.gst-plugins-good}/share/gstreamer-1.0/presets" + # Thumbnailers + --prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share" + --prefix XDG_DATA_DIRS : "${totem}/share" + ) + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = "cheese"; + attrPath = "gnome.cheese"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Cheese"; + description = "Take photos and videos with your webcam, with fun graphical effects"; + maintainers = teams.gnome.members; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/apps/file-roller/default.nix b/pkgs/desktops/gnome/apps/file-roller/default.nix new file mode 100644 index 0000000000000..6af1994fb0609 --- /dev/null +++ b/pkgs/desktops/gnome/apps/file-roller/default.nix @@ -0,0 +1,48 @@ +{ lib, stdenv, fetchurl, glib, gtk3, meson, ninja, pkg-config, gnome, gettext, itstool, libxml2, libarchive +, file, json-glib, python3, wrapGAppsHook, desktop-file-utils, libnotify, nautilus, glibcLocales +, unzip, cpio }: + +stdenv.mkDerivation rec { + pname = "file-roller"; + version = "3.40.0"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "039w1dcpa5ypmv6sm634alk9vbcdkyvy595vkh5gn032jsiqca2a"; + }; + + LANG = "en_US.UTF-8"; # postinstall.py + + nativeBuildInputs = [ meson ninja gettext itstool pkg-config libxml2 python3 wrapGAppsHook glibcLocales desktop-file-utils ]; + + buildInputs = [ glib gtk3 json-glib libarchive file gnome.adwaita-icon-theme libnotify nautilus cpio ]; + + PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0"; + + postPatch = '' + chmod +x postinstall.py # patchShebangs requires executable file + patchShebangs postinstall.py + patchShebangs data/set-mime-type-entry.py + ''; + + postFixup = '' + # Workaround because of https://gitlab.gnome.org/GNOME/file-roller/issues/40 + wrapProgram "$out/bin/file-roller" \ + --prefix PATH : ${lib.makeBinPath [ unzip ]} + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = "file-roller"; + attrPath = "gnome.file-roller"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/FileRoller"; + description = "Archive manager for the GNOME desktop environment"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = teams.gnome.members; + }; +} diff --git a/pkgs/desktops/gnome/apps/gedit/default.nix b/pkgs/desktops/gnome/apps/gedit/default.nix new file mode 100644 index 0000000000000..a8479e9cdcad6 --- /dev/null +++ b/pkgs/desktops/gnome/apps/gedit/default.nix @@ -0,0 +1,81 @@ +{ lib, stdenv +, meson +, fetchurl +, python3 +, pkg-config +, gtk3 +, glib +, adwaita-icon-theme +, libpeas +, gtksourceview4 +, gsettings-desktop-schemas +, wrapGAppsHook +, ninja +, libsoup +, tepl +, gnome +, gspell +, perl +, itstool +, desktop-file-utils +, vala +}: + +stdenv.mkDerivation rec { + pname = "gedit"; + version = "40.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gedit/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "149ngl9qw6h59546lir1pa7hvw23ppsnqlj9mfqphmmn5jl99qsm"; + }; + + nativeBuildInputs = [ + desktop-file-utils + itstool + meson + ninja + perl + pkg-config + python3 + vala + wrapGAppsHook + ]; + + buildInputs = [ + adwaita-icon-theme + glib + gsettings-desktop-schemas + gspell + gtk3 + gtksourceview4 + libpeas + libsoup + tepl + ]; + + postPatch = '' + chmod +x build-aux/meson/post_install.py + chmod +x plugins/externaltools/scripts/gedit-tool-merge.pl + patchShebangs build-aux/meson/post_install.py + patchShebangs plugins/externaltools/scripts/gedit-tool-merge.pl + ''; + + # Reliably fails to generate gedit-file-browser-enum-types.h in time + enableParallelBuilding = false; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gedit"; + attrPath = "gnome.gedit"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Gedit"; + description = "Official text editor of the GNOME desktop environment"; + maintainers = teams.gnome.members; + license = licenses.gpl2; + platforms = platforms.unix; + }; +} diff --git a/pkgs/desktops/gnome/apps/ghex/default.nix b/pkgs/desktops/gnome/apps/ghex/default.nix new file mode 100644 index 0000000000000..500e60feb75c9 --- /dev/null +++ b/pkgs/desktops/gnome/apps/ghex/default.nix @@ -0,0 +1,84 @@ +{ lib, stdenv +, fetchurl +, fetchpatch +, pkg-config +, meson +, ninja +, python3 +, gnome +, desktop-file-utils +, appstream-glib +, gettext +, itstool +, libxml2 +, gtk3 +, glib +, atk +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "ghex"; + version = "3.18.4"; + + outputs = [ "out" "dev" ]; + + src = fetchurl { + url = "mirror://gnome/sources/ghex/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1h1pjrr9wynclfykizqd78dbi785wjz6b63p31k87kjvzy8w3nf2"; + }; + + nativeBuildInputs = [ + desktop-file-utils + gettext + itstool + meson + ninja + pkg-config + python3 + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + atk + glib + ]; + + checkInputs = [ + appstream-glib + desktop-file-utils + ]; + + patches = [ + # Fixes for darwin. Drop in next release. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/ghex/commit/b0af26666cd990d99076c242b2abb3efc6e98671.patch"; + sha256 = "1zwdkgr2nqrn9q3ydyvrrpn5x55cdi747fhbq6mh6blp9cbrk9b5"; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/ghex/commit/cc8ef9e67b23604c402460010dc0b5dccb85391b.patch"; + sha256 = "0j2165rfhlbrlzhmcnirqd5m89ljpz0n3nz20sxbwlc8h42zv36s"; + }) + ]; + + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = "ghex"; + attrPath = "gnome.${pname}"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Ghex"; + description = "Hex editor for GNOME desktop environment"; + platforms = platforms.unix; + license = licenses.gpl2Plus; + maintainers = teams.gnome.members; + }; +} diff --git a/pkgs/desktops/gnome/apps/gnome-books/default.nix b/pkgs/desktops/gnome/apps/gnome-books/default.nix new file mode 100644 index 0000000000000..0e8b322cf5ed7 --- /dev/null +++ b/pkgs/desktops/gnome/apps/gnome-books/default.nix @@ -0,0 +1,86 @@ +{ lib, stdenv +, meson +, ninja +, gettext +, fetchurl +, evince +, gjs +, pkg-config +, gtk3 +, glib +, tracker +, tracker-miners +, libxslt +, webkitgtk +, gnome-desktop +, libgepub +, gnome +, gdk-pixbuf +, gsettings-desktop-schemas +, adwaita-icon-theme +, docbook-xsl-nons +, docbook_xml_dtd_42 +, desktop-file-utils +, python3 +, gobject-introspection +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "gnome-books"; + version = "40.0"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0c41l8m2di8h39bmk2fnhpwglwp6qhljmwqqbihzp4ay9976zrc5"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + libxslt + desktop-file-utils + docbook-xsl-nons + docbook_xml_dtd_42 + wrapGAppsHook + python3 + ]; + + buildInputs = [ + gtk3 + glib + gsettings-desktop-schemas + gdk-pixbuf + adwaita-icon-theme + evince + webkitgtk + gjs + gobject-introspection + tracker + tracker-miners + gnome-desktop + libgepub + ]; + + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-books"; + attrPath = "gnome.gnome-books"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Books"; + description = "An e-book manager application for GNOME"; + maintainers = teams.gnome.members; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix new file mode 100644 index 0000000000000..605275be7ded7 --- /dev/null +++ b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix @@ -0,0 +1,145 @@ +{ lib, stdenv +, fetchurl +, meson +, ninja +, wrapGAppsHook +, pkg-config +, gettext +, itstool +, libvirt-glib +, glib +, gobject-introspection +, libxml2 +, gtk3 +, gtksourceview4 +, gtk-vnc +, freerdp +, libvirt +, spice-gtk +, python3 +, appstream-glib +, spice-protocol +, libhandy +, libsoup +, libosinfo +, systemd +, tracker +, tracker-miners +, vala +, libcap +, yajl +, gmp +, gdbm +, cyrus_sasl +, gnome +, librsvg +, desktop-file-utils +, mtools +, cdrkit +, libcdio +, libusb1 +, libarchive +, acl +, libgudev +, libsecret +, libcap_ng +, numactl +, libapparmor +, json-glib +, webkitgtk +, vte +, glib-networking +}: + +stdenv.mkDerivation rec { + pname = "gnome-boxes"; + version = "40.1"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "seKPLH+3a/T7uGLQ1S6BG5TL6f8W8GdAiWRWhpCILvg="; + }; + + doCheck = true; + + nativeBuildInputs = [ + appstream-glib # for appstream-util + desktop-file-utils + gettext + gobject-introspection + itstool + meson + ninja + pkg-config + python3 + vala + wrapGAppsHook + ]; + + # Required for USB redirection PolicyKit rules file + propagatedUserEnvPkgs = [ + spice-gtk + ]; + + buildInputs = [ + acl + cyrus_sasl + freerdp + gdbm + glib + glib-networking + gmp + gnome.adwaita-icon-theme + gtk-vnc + gtk3 + gtksourceview4 + json-glib + libapparmor + libarchive + libcap + libcap_ng + libgudev + libhandy + libosinfo + librsvg + libsecret + libsoup + libusb1 + libvirt + libvirt-glib + libxml2 + numactl + spice-gtk + spice-protocol + systemd + tracker + tracker-miners + vte + webkitgtk + yajl + ]; + + preFixup = '' + gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ mtools cdrkit libcdio ]}") + ''; + + postPatch = '' + chmod +x build-aux/post_install.py # patchShebangs requires executable file + patchShebangs build-aux/post_install.py + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + }; + }; + + meta = with lib; { + description = "Simple GNOME 3 application to access remote or virtual systems"; + homepage = "https://wiki.gnome.org/Apps/Boxes"; + license = licenses.lgpl2Plus; + platforms = platforms.linux; + maintainers = teams.gnome.members; + }; +} diff --git a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix new file mode 100644 index 0000000000000..3e80575a33db2 --- /dev/null +++ b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix @@ -0,0 +1,84 @@ +{ lib, stdenv +, fetchurl +, meson +, ninja +, pkg-config +, wrapGAppsHook +, libdazzle +, libgweather +, geoclue2 +, geocode-glib +, python3 +, gettext +, libxml2 +, gnome +, gtk3 +, evolution-data-server +, libsoup +, glib +, gnome-online-accounts +, gsettings-desktop-schemas +, libhandy +, adwaita-icon-theme +}: + +stdenv.mkDerivation rec { + pname = "gnome-calendar"; + version = "40.0"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0d74hng9jdmwdcjgj4xfrcink2gwkbp1k1mad4wanaf7q31c6f38"; + }; + + patches = [ + # https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/84 + # A refactor has caused the PR patch to drift enough to need rebasing + ./gtk_image_reset_crash.patch + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + }; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + libxml2 + wrapGAppsHook + python3 + ]; + + buildInputs = [ + gtk3 + evolution-data-server + libsoup + glib + gnome-online-accounts + libdazzle + libgweather + geoclue2 + geocode-glib + gsettings-desktop-schemas + adwaita-icon-theme + libhandy + ]; + + postPatch = '' + chmod +x build-aux/meson/meson_post_install.py # patchShebangs requires executable file + patchShebangs build-aux/meson/meson_post_install.py + ''; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Calendar"; + description = "Simple and beautiful calendar application for GNOME"; + maintainers = teams.gnome.members; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/apps/gnome-calendar/gtk_image_reset_crash.patch b/pkgs/desktops/gnome/apps/gnome-calendar/gtk_image_reset_crash.patch new file mode 100644 index 0000000000000..5065295b57b77 --- /dev/null +++ b/pkgs/desktops/gnome/apps/gnome-calendar/gtk_image_reset_crash.patch @@ -0,0 +1,17 @@ +diff --git a/src/gui/views/gcal-year-view.c b/src/gui/views/gcal-year-view.c +index ac32a8f9..532425c1 100644 +--- a/src/gui/views/gcal-year-view.c ++++ b/src/gui/views/gcal-year-view.c +@@ -2158,7 +2158,11 @@ update_weather (GcalYearView *self) + if (!updated) + { + gtk_label_set_text (self->temp_label, ""); +- gtk_image_clear (self->weather_icon); ++ /* FIXME: This should never be NULL, but it somehow is. ++ * https://gitlab.gnome.org/GNOME/gnome-calendar/issues/299 ++ */ ++ if (self->weather_icon != NULL) ++ gtk_image_clear (self->weather_icon); + } + } + diff --git a/pkgs/desktops/gnome/apps/gnome-characters/default.nix b/pkgs/desktops/gnome/apps/gnome-characters/default.nix new file mode 100644 index 0000000000000..5cbd58d602a9b --- /dev/null +++ b/pkgs/desktops/gnome/apps/gnome-characters/default.nix @@ -0,0 +1,88 @@ +{ lib +, stdenv +, fetchurl +, meson +, ninja +, pkg-config +, gettext +, gnome +, glib +, gtk3 +, pango +, wrapGAppsHook +, python3 +, gobject-introspection +, gjs +, libunistring +, libhandy +, gsettings-desktop-schemas +, adwaita-icon-theme +, gnome-desktop +}: + +stdenv.mkDerivation rec { + pname = "gnome-characters"; + version = "40.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-characters/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0z2xa4w921bzpzj6gv88pvbrijcnnwni6jxynwz0ybaravyzaqha"; + }; + + nativeBuildInputs = [ + gettext + gobject-introspection + meson + ninja + pkg-config + python3 + wrapGAppsHook + ]; + + + buildInputs = [ + adwaita-icon-theme + gjs + glib + gnome-desktop # for typelib + gsettings-desktop-schemas + gtk3 + libunistring + libhandy + pango + ]; + + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + ''; + + dontWrapGApps = true; + + # Fixes https://github.com/NixOS/nixpkgs/issues/31168 + postFixup = '' + for file in $out/share/org.gnome.Characters/org.gnome.Characters \ + $out/share/org.gnome.Characters/org.gnome.Characters.BackgroundService + do + sed -e $"2iimports.package._findEffectiveEntryPointName = () => \'$(basename $file)\' " \ + -i $file + + wrapGApp "$file" + done + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Characters"; + description = "Simple utility application to find and insert unusual characters"; + maintainers = teams.gnome.members; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome/apps/gnome-clocks/default.nix new file mode 100644 index 0000000000000..d9a749a24b093 --- /dev/null +++ b/pkgs/desktops/gnome/apps/gnome-clocks/default.nix @@ -0,0 +1,87 @@ +{ lib, stdenv +, fetchurl +, meson +, ninja +, gettext +, pkg-config +, wrapGAppsHook +, itstool +, desktop-file-utils +, vala +, gobject-introspection +, libxml2 +, gtk3 +, glib +, gsound +, sound-theme-freedesktop +, gsettings-desktop-schemas +, adwaita-icon-theme +, gnome-desktop +, geocode-glib +, gnome +, gdk-pixbuf +, geoclue2 +, libgweather +, libhandy +}: + +stdenv.mkDerivation rec { + pname = "gnome-clocks"; + version = "40.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-clocks/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "02d3jg46sn8d9gd4dsaly22gg5vkbz2gpq4pmwpvncb4rsqk7sn2"; + }; + + nativeBuildInputs = [ + vala + meson + ninja + pkg-config + gettext + itstool + wrapGAppsHook + desktop-file-utils + libxml2 + gobject-introspection # for finding vapi files + ]; + + buildInputs = [ + gtk3 + glib + gsettings-desktop-schemas + gdk-pixbuf + adwaita-icon-theme + gnome-desktop + geocode-glib + geoclue2 + libgweather + gsound + libhandy + ]; + + preFixup = '' + gappsWrapperArgs+=( + # Fallback sound theme + --prefix XDG_DATA_DIRS : "${sound-theme-freedesktop}/share" + ) + ''; + + doCheck = true; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-clocks"; + attrPath = "gnome.gnome-clocks"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Clocks"; + description = "Clock application designed for GNOME 3"; + maintainers = teams.gnome.members; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/apps/gnome-connections/default.nix b/pkgs/desktops/gnome/apps/gnome-connections/default.nix new file mode 100644 index 0000000000000..abdf751baeb1d --- /dev/null +++ b/pkgs/desktops/gnome/apps/gnome-connections/default.nix @@ -0,0 +1,75 @@ +{ lib, stdenv +, fetchurl +, gnome +, meson +, ninja +, vala +, pkg-config +, glib +, gtk3 +, python3 +, libxml2 +, gtk-vnc +, gettext +, desktop-file-utils +, appstream-glib +, gobject-introspection +, freerdp +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "gnome-connections"; + version = "3.38.1"; + + src = fetchurl { + url = "mirror://gnome/sources/connections/${lib.versions.majorMinor version}/connections-${version}.tar.xz"; + hash = "sha256-5c7uBFkh9Vsw6bWWUDjNTMDrrFqI5JEgYlsWpfyuTpA="; + }; + + nativeBuildInputs = [ + desktop-file-utils + gettext + glib # glib-compile-resources + meson + appstream-glib + ninja + pkg-config + python3 + vala + wrapGAppsHook + + # for gtk-frdp subproject + gobject-introspection + ]; + + buildInputs = [ + glib + gtk-vnc + gtk3 + libxml2 + + # for gtk-frdp subproject + freerdp + ]; + + postPatch = '' + chmod +x build-aux/meson/postinstall.py + patchShebangs build-aux/meson/postinstall.py + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = "connections"; + attrPath = "gnome-connections"; + }; + }; + + meta = with lib; { + homepage = "https://gitlab.gnome.org/GNOME/connections"; + description = "A remote desktop client for the GNOME desktop environment"; + maintainers = teams.gnome.members; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/apps/gnome-documents/default.nix b/pkgs/desktops/gnome/apps/gnome-documents/default.nix new file mode 100644 index 0000000000000..3f7ac34696bfe --- /dev/null +++ b/pkgs/desktops/gnome/apps/gnome-documents/default.nix @@ -0,0 +1,127 @@ +{ lib, stdenv +, meson +, ninja +, gettext +, fetchurl +, fetchpatch +, evince +, gjs +, pkg-config +, gtk3 +, glib +, tracker +, tracker-miners +, itstool +, libxslt +, webkitgtk +, libgdata +, gnome-desktop +, libzapojit +, libgepub +, gnome +, gdk-pixbuf +, libsoup +, docbook_xsl +, docbook_xml_dtd_42 +, gobject-introspection +, inkscape +, poppler_utils +, desktop-file-utils +, wrapGAppsHook +, python3 +, appstream-glib +, gsettings-desktop-schemas +}: + +stdenv.mkDerivation rec { + pname = "gnome-documents"; + version = "3.34.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-documents/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1qph567mapg3s1a26k7b8y57g9bklhj2mh8xm758z9zkms20xafq"; + }; + + patches = [ + # Fix inkscape 1.0 usage + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-documents/commit/0f55a18c40a61e6ae4ec4652604775f139892350.diff"; + sha256 = "1yrisq69dl1dn7639drlbza20a5ic6xg04ksr9iq4sxdx3xj3d8s"; + }) + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + itstool + libxslt + desktop-file-utils + docbook_xsl + docbook_xml_dtd_42 + wrapGAppsHook + python3 + appstream-glib + + # building getting started + inkscape + poppler_utils + ]; + + buildInputs = [ + gtk3 + glib + gsettings-desktop-schemas + gdk-pixbuf + gnome.adwaita-icon-theme + evince + libsoup + webkitgtk + gjs + gobject-introspection + tracker + tracker-miners + libgdata + gnome-desktop + libzapojit + libgepub + ]; + + doCheck = true; + + mesonFlags = [ + "-Dgetting_started=true" + ]; + + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + ''; + + preFixup = '' + substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib.bin}/bin/gapplication" + ''; + + preConfigure = + # To silence inkscape warnings regarding profile directory + '' + export INKSCAPE_PROFILE_DIR="$(mktemp -d)" + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + }; + }; + + meta = with lib; { + broken = true; # Tracker 3 not supported and it cannot start Tracker 2. + homepage = "https://wiki.gnome.org/Apps/Documents"; + description = "Document manager application designed to work with GNOME 3"; + maintainers = teams.gnome.members; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/apps/gnome-logs/default.nix b/pkgs/desktops/gnome/apps/gnome-logs/default.nix new file mode 100644 index 0000000000000..da06eb4404c11 --- /dev/null +++ b/pkgs/desktops/gnome/apps/gnome-logs/default.nix @@ -0,0 +1,86 @@ +{ lib, stdenv +, fetchurl +, fetchpatch +, meson +, ninja +, pkg-config +, gnome +, glib +, gtk3 +, wrapGAppsHook +, gettext +, itstool +, libxml2 +, libxslt +, docbook_xsl +, docbook_xml_dtd_43 +, systemd +, python3 +, gsettings-desktop-schemas +}: + +stdenv.mkDerivation rec { + pname = "gnome-logs"; + version = "3.36.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-logs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0w1nfdxbv3f0wnhmdy21ydvr4swfc108hypda561p7l9lrhnnxj4"; + }; + + patches = [ + # https://gitlab.gnome.org/GNOME/gnome-logs/-/issues/52 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-logs/-/commit/b42defceefc775220b525f665a3b662ab9593b81.patch"; + sha256 = "1s0zscmhwy7r0xff17wh8ik8x9xw1vrkipw5vl5i770bxnljps8n"; + }) + ]; + + nativeBuildInputs = [ + python3 + meson + ninja + pkg-config + wrapGAppsHook + gettext + itstool + libxml2 + libxslt + docbook_xsl + docbook_xml_dtd_43 + ]; + + buildInputs = [ + glib + gtk3 + systemd + gsettings-desktop-schemas + gnome.adwaita-icon-theme + ]; + + mesonFlags = [ + "-Dman=true" + ]; + + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; + + doCheck = true; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-logs"; + attrPath = "gnome.gnome-logs"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Logs"; + description = "A log viewer for the systemd journal"; + maintainers = teams.gnome.members; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/apps/gnome-maps/default.nix b/pkgs/desktops/gnome/apps/gnome-maps/default.nix new file mode 100644 index 0000000000000..2818215a4ff9c --- /dev/null +++ b/pkgs/desktops/gnome/apps/gnome-maps/default.nix @@ -0,0 +1,104 @@ +{ lib, stdenv +, fetchurl +, meson +, ninja +, gettext +, python3 +, pkg-config +, gnome +, gtk3 +, gobject-introspection +, gdk-pixbuf +, librsvg +, libgweather +, geoclue2 +, wrapGAppsHook +, folks +, libchamplain +, gfbgraph +, libsoup +, gsettings-desktop-schemas +, webkitgtk +, gjs +, libgee +, libhandy +, geocode-glib +, evolution-data-server +, gnome-online-accounts +}: + +stdenv.mkDerivation rec { + pname = "gnome-maps"; + version = "40.1"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-mAXUwFs6NpV0bTdisoFr/+bZ19VuF7y7nZ1B3C0CYxo="; + }; + + doCheck = true; + + nativeBuildInputs = [ + gettext + meson + ninja + pkg-config + python3 + wrapGAppsHook + ]; + + buildInputs = [ + evolution-data-server + folks + gdk-pixbuf + geoclue2 + geocode-glib + gfbgraph + gjs + gnome-online-accounts + gnome.adwaita-icon-theme + gobject-introspection + gsettings-desktop-schemas + gtk3 + libchamplain + libgee + libgweather + libhandy + librsvg + libsoup + webkitgtk + ]; + + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + + # The .service file isn't wrapped with the correct environment + # so misses GIR files when started. By re-pointing from the gjs + # entry point to the wrapped binary we get back to a wrapped + # binary. + substituteInPlace "data/org.gnome.Maps.service.in" \ + --replace "Exec=@pkgdatadir@/org.gnome.Maps" \ + "Exec=$out/bin/gnome-maps" + ''; + + preCheck = '' + # “time.js” included by “timeTest” and “translationsTest” depends on “org.gnome.desktop.interface” schema. + export XDG_DATA_DIRS="${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:$XDG_DATA_DIRS" + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Maps"; + description = "A map application for GNOME 3"; + maintainers = teams.gnome.members; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/apps/gnome-music/default.nix b/pkgs/desktops/gnome/apps/gnome-music/default.nix new file mode 100644 index 0000000000000..51e3d5a9cdf37 --- /dev/null +++ b/pkgs/desktops/gnome/apps/gnome-music/default.nix @@ -0,0 +1,113 @@ +{ lib +, meson +, ninja +, gettext +, fetchurl +, gdk-pixbuf +, tracker +, libxml2 +, python3 +, libnotify +, wrapGAppsHook +, libmediaart +, gobject-introspection +, gnome-online-accounts +, grilo +, grilo-plugins +, pkg-config +, gtk3 +, pango +, glib +, desktop-file-utils +, appstream-glib +, itstool +, gnome +, gst_all_1 +, libdazzle +, libsoup +, gsettings-desktop-schemas +}: + +python3.pkgs.buildPythonApplication rec { + pname = "gnome-music"; + version = "40.0"; + + format = "other"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "1djqhd4jccvk352hwxjhiwjgbnv1qnpv450f2c6w6581vcn9pq38"; + }; + + nativeBuildInputs = [ + meson + ninja + gettext + itstool + pkg-config + libxml2 + wrapGAppsHook + desktop-file-utils + appstream-glib + gobject-introspection + ]; + + buildInputs = [ + gtk3 + pango + glib + libmediaart + gnome-online-accounts + gobject-introspection + gdk-pixbuf + gnome.adwaita-icon-theme + python3 + grilo + grilo-plugins + libnotify + libdazzle + libsoup + gsettings-desktop-schemas + tracker + ] ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad + gst-plugins-ugly + ]); + + propagatedBuildInputs = with python3.pkgs; [ + pycairo + dbus-python + pygobject3 + ]; + + + postPatch = '' + for f in meson_post_conf.py meson_post_install.py; do + chmod +x $f + patchShebangs $f + done + ''; + + doCheck = false; + + # handle setup hooks better + strictDeps = false; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Music"; + description = "Music player and management application for the GNOME desktop environment"; + maintainers = teams.gnome.members; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/apps/gnome-nettool/default.nix b/pkgs/desktops/gnome/apps/gnome-nettool/default.nix new file mode 100644 index 0000000000000..ca75b7aae07f4 --- /dev/null +++ b/pkgs/desktops/gnome/apps/gnome-nettool/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, fetchurl, pkg-config, gnome, gtk3, wrapGAppsHook +, libgtop, intltool, itstool, libxml2, nmap, inetutils }: + +stdenv.mkDerivation rec { + pname = "gnome-nettool"; + version = "3.8.1"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1c9cvzvyqgfwa5zzyvp7118pkclji62fkbb33g4y9sp5kw6m397h"; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + gtk3 wrapGAppsHook libgtop intltool itstool libxml2 + gnome.adwaita-icon-theme + ]; + + propagatedUserEnvPkgs = [ nmap inetutils ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + versionPolicy = "none"; + }; + }; + + meta = with lib; { + homepage = "https://gitlab.gnome.org/GNOME/gnome-nettool"; + description = "A collection of networking tools"; + maintainers = teams.gnome.members; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/apps/gnome-notes/default.nix b/pkgs/desktops/gnome/apps/gnome-notes/default.nix new file mode 100644 index 0000000000000..6af206069e292 --- /dev/null +++ b/pkgs/desktops/gnome/apps/gnome-notes/default.nix @@ -0,0 +1,87 @@ +{ lib, stdenv +, meson +, ninja +, gettext +, fetchurl +, pkg-config +, wrapGAppsHook +, itstool +, desktop-file-utils +, python3 +, glib +, gtk3 +, evolution-data-server +, gnome-online-accounts +, json-glib +, libuuid +, curl +, libhandy +, webkitgtk +, gnome +, libxml2 +, gsettings-desktop-schemas +, tracker +}: + +stdenv.mkDerivation rec { + pname = "gnome-notes"; + version = "40.1"; + + src = fetchurl { + url = "mirror://gnome/sources/bijiben/${lib.versions.major version}/bijiben-${version}.tar.xz"; + sha256 = "1gvvb2klkzbmyzwkjgmscdiqcl8lyz9b0rxb4igjz079csq6z805"; + }; + + doCheck = true; + + postPatch = '' + chmod +x build-aux/meson_post_install.py + patchShebangs build-aux/meson_post_install.py + ''; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + itstool + libxml2 + desktop-file-utils + python3 + wrapGAppsHook + ]; + + buildInputs = [ + glib + gtk3 + json-glib + libuuid + curl + libhandy + webkitgtk + tracker + gnome-online-accounts + gsettings-desktop-schemas + evolution-data-server + gnome.adwaita-icon-theme + ]; + + mesonFlags = [ + "-Dupdate_mimedb=false" + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = "bijiben"; + attrPath = "gnome.gnome-notes"; + }; + }; + + meta = with lib; { + description = "Note editor designed to remain simple to use"; + homepage = "https://wiki.gnome.org/Apps/Notes"; + license = licenses.gpl3; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/apps/gnome-power-manager/default.nix b/pkgs/desktops/gnome/apps/gnome-power-manager/default.nix new file mode 100644 index 0000000000000..0337f70a20e51 --- /dev/null +++ b/pkgs/desktops/gnome/apps/gnome-power-manager/default.nix @@ -0,0 +1,60 @@ +{ lib, stdenv +, gettext +, fetchurl +, pkg-config +, gtk3 +, glib +, meson +, ninja +, upower +, python3 +, desktop-file-utils +, wrapGAppsHook +, gnome }: + +let + pname = "gnome-power-manager"; + version = "3.32.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; + sha256 = "0drfn3wcc8l4n07qwv6p0rw2dwcd00hwzda282q62l6sasks2b2g"; + }; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + }; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook + gettext + + # needed by meson_post_install.sh + python3 + glib.dev + desktop-file-utils + ]; + + buildInputs = [ + gtk3 + glib + upower + gnome.adwaita-icon-theme + ]; + + meta = with lib; { + homepage = "https://projects-old.gnome.org/gnome-power-manager/"; + description = "View battery and power statistics provided by UPower"; + maintainers = teams.gnome.members; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix b/pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix new file mode 100644 index 0000000000000..29f7aa6e9ee4b --- /dev/null +++ b/pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix @@ -0,0 +1,72 @@ +{ lib, stdenv +, fetchurl +, pkg-config +, gettext +, gobject-introspection +, wrapGAppsHook +, gjs +, glib +, gtk3 +, gdk-pixbuf +, gst_all_1 +, gnome +, meson +, ninja +, python3 +, desktop-file-utils +, libhandy +}: + +stdenv.mkDerivation rec { + pname = "gnome-sound-recorder"; + version = "40.0"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "00b55vsfzx877b7mj744abzjws7zclz71wbvh0axsrbl9l84ranl"; + }; + + nativeBuildInputs = [ + pkg-config + gettext + meson + ninja + gobject-introspection + wrapGAppsHook + python3 + desktop-file-utils + ]; + + buildInputs = [ + gjs + glib + gtk3 + gdk-pixbuf + libhandy + ] ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad # for gstreamer-player-1.0 + ]); + + postPatch = '' + chmod +x build-aux/meson_post_install.py + patchShebangs build-aux/meson_post_install.py + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + }; + }; + + meta = with lib; { + description = "A simple and modern sound recorder"; + homepage = "https://wiki.gnome.org/Apps/SoundRecorder"; + license = licenses.gpl2Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/apps/gnome-todo/default.nix b/pkgs/desktops/gnome/apps/gnome-todo/default.nix new file mode 100644 index 0000000000000..885f21cf3ec80 --- /dev/null +++ b/pkgs/desktops/gnome/apps/gnome-todo/default.nix @@ -0,0 +1,89 @@ +{ lib, stdenv +, fetchurl +, fetchpatch +, meson +, ninja +, pkg-config +, python3 +, wrapGAppsHook +, gettext +, gnome +, glib +, gtk3 +, libpeas +, gnome-online-accounts +, gsettings-desktop-schemas +, evolution-data-server +, libxml2 +, libsoup +, libical +, librest +, json-glib +}: + +stdenv.mkDerivation rec { + pname = "gnome-todo"; + version = "3.28.1"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "08ygqbib72jlf9y0a16k54zz51sncpq2wa18wp81v46q8301ymy7"; + }; + + patches = [ + # fix build with libecal 2.0 + (fetchpatch { + name = "gnome-todo-eds-libecal-2.0.patch"; + url = "https://src.fedoraproject.org/rpms/gnome-todo/raw/bed44b8530f3c79589982e03b430b3a125e9bceb/f/gnome-todo-eds-libecal-2.0.patch"; + sha256 = "1ghrz973skal36j90wm2z13m3panw983r6y0k7z9gpj5lxgz92mq"; + }) + ]; + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + python3 + wrapGAppsHook + ]; + + buildInputs = [ + glib + gtk3 + libpeas + gnome-online-accounts + gsettings-desktop-schemas + gnome.adwaita-icon-theme + # Plug-ins + evolution-data-server + libxml2 + libsoup + libical + librest + json-glib + ]; + + # Fix parallel building: missing dependency from src/gtd-application.c + # Probably remove for 3.30+ https://gitlab.gnome.org/GNOME/gnome-todo/issues/170 + preBuild = "ninja src/gtd-vcs-identifier.h"; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + }; + }; + + meta = with lib; { + description = "Personal task manager for GNOME"; + homepage = "https://wiki.gnome.org/Apps/Todo"; + license = licenses.gpl3Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/apps/gnome-weather/default.nix b/pkgs/desktops/gnome/apps/gnome-weather/default.nix new file mode 100644 index 0000000000000..39c10e82a1c2e --- /dev/null +++ b/pkgs/desktops/gnome/apps/gnome-weather/default.nix @@ -0,0 +1,76 @@ +{ lib +, stdenv +, fetchurl +, pkg-config +, gnome +, gtk3 +, libhandy +, wrapGAppsHook +, gjs +, gobject-introspection +, libgweather +, meson +, ninja +, geoclue2 +, gnome-desktop +, python3 +, gsettings-desktop-schemas +}: + +stdenv.mkDerivation rec { + pname = "gnome-weather"; + version = "40.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-weather/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "1vxfcvga5waangq3rzwdrdxyy5sw40vv0l463lc651s0n8xafd9a"; + }; + + nativeBuildInputs = [ + pkg-config + meson + ninja + wrapGAppsHook + python3 + ]; + + buildInputs = [ + gtk3 + libhandy + gjs + gobject-introspection + gnome-desktop + libgweather + gnome.adwaita-icon-theme + geoclue2 + gsettings-desktop-schemas + ]; + + postPatch = '' + # The .service file is not wrapped with the correct environment + # so misses GIR files when started. By re-pointing from the gjs + # entry point to the wrapped binary we get back to a wrapped + # binary. + substituteInPlace "data/org.gnome.Weather.service.in" \ + --replace "Exec=@DATA_DIR@/@APP_ID@" \ + "Exec=$out/bin/gnome-weather" + + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-weather"; + attrPath = "gnome.gnome-weather"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Weather"; + description = "Access current weather conditions and forecasts"; + maintainers = teams.gnome.members; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/apps/polari/default.nix b/pkgs/desktops/gnome/apps/polari/default.nix new file mode 100644 index 0000000000000..0675ccb2f82d1 --- /dev/null +++ b/pkgs/desktops/gnome/apps/polari/default.nix @@ -0,0 +1,54 @@ +{ lib, stdenv, itstool, fetchurl, gdk-pixbuf, adwaita-icon-theme +, telepathy-glib, gjs, meson, ninja, gettext, telepathy-idle, libxml2, desktop-file-utils +, pkg-config, gtk3, glib, libsecret, libsoup, webkitgtk, gobject-introspection, appstream-glib +, gnome, wrapGAppsHook, telepathy-logger, gspell, gsettings-desktop-schemas }: + +let + pname = "polari"; + version = "3.38.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; + sha256 = "1l82nmb5qk4h69rsdhzlcmjjdhwh9jzfs4cnw8hy39sg5v9ady1s"; + }; + + patches = [ + # Upstream runs the thumbnailer by passing it to gjs. + # If we wrap it in a shell script, gjs can no longer run it. + # Let’s change the code to run the script directly by making it executable and having gjs in shebang. + ./make-thumbnailer-wrappable.patch + ]; + + propagatedUserEnvPkgs = [ telepathy-idle telepathy-logger ]; + + nativeBuildInputs = [ + meson ninja pkg-config itstool gettext wrapGAppsHook libxml2 + desktop-file-utils gobject-introspection appstream-glib + ]; + + buildInputs = [ + gtk3 glib adwaita-icon-theme gsettings-desktop-schemas + telepathy-glib telepathy-logger gjs gspell gdk-pixbuf libsecret libsoup webkitgtk + ]; + + postFixup = '' + wrapGApp "$out/share/polari/thumbnailer.js" + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Polari"; + description = "IRC chat client designed to integrate with the GNOME desktop"; + maintainers = teams.gnome.members; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/apps/polari/make-thumbnailer-wrappable.patch b/pkgs/desktops/gnome/apps/polari/make-thumbnailer-wrappable.patch new file mode 100644 index 0000000000000..0fb09eb154af1 --- /dev/null +++ b/pkgs/desktops/gnome/apps/polari/make-thumbnailer-wrappable.patch @@ -0,0 +1,24 @@ +diff --git a/src/thumbnailer.js b/src/thumbnailer.js +old mode 100644 +new mode 100755 +index e2ad0a5..7ebf08a +--- a/src/thumbnailer.js ++++ b/src/thumbnailer.js +@@ -1,3 +1,4 @@ ++#!/usr/bin/env gjs + imports.gi.versions.Gdk = '3.0'; + imports.gi.versions.Gtk = '3.0'; + +diff --git a/src/urlPreview.js b/src/urlPreview.js +index f17e0be..ccffc32 100644 +--- a/src/urlPreview.js ++++ b/src/urlPreview.js +@@ -44,7 +44,7 @@ class Thumbnailer { + _generateThumbnail(data) { + let { filename, uri } = data; + this._subProc = Gio.Subprocess.new( +- ['gjs', `${pkg.pkgdatadir}/thumbnailer.js`, uri, filename], ++ [`${pkg.pkgdatadir}/thumbnailer.js`, uri, filename], + Gio.SubprocessFlags.NONE); + this._subProc.wait_async(null, (o, res) => { + try { diff --git a/pkgs/desktops/gnome/apps/seahorse/default.nix b/pkgs/desktops/gnome/apps/seahorse/default.nix new file mode 100644 index 0000000000000..d46aed7bbe940 --- /dev/null +++ b/pkgs/desktops/gnome/apps/seahorse/default.nix @@ -0,0 +1,84 @@ +{ lib, stdenv +, fetchurl +, vala +, meson +, ninja +, libpwquality +, pkg-config +, gtk3 +, glib +, wrapGAppsHook +, itstool +, gnupg +, libsoup +, gnome +, gpgme +, python3 +, openldap +, gcr +, libsecret +, avahi +, p11-kit +, openssh +, gsettings-desktop-schemas +, libhandy +}: + +stdenv.mkDerivation rec { + pname = "seahorse"; + version = "40.0"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + hash = "sha256-fscFezhousbqBB/aghQKOfXsnlsYi0UJFNRTvC1V0Cw="; + }; + + doCheck = true; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + itstool + wrapGAppsHook + python3 + ]; + + buildInputs = [ + gtk3 + glib + gcr + gsettings-desktop-schemas + gnupg + gnome.adwaita-icon-theme + gpgme + libsecret + avahi + libsoup + p11-kit + openssh + openldap + libpwquality + libhandy + ]; + + postPatch = '' + patchShebangs build-aux/ + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Seahorse"; + description = "Application for managing encryption keys and passwords in the GnomeKeyring"; + maintainers = teams.gnome.members; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/apps/vinagre/default.nix b/pkgs/desktops/gnome/apps/vinagre/default.nix new file mode 100644 index 0000000000000..31e198783e04f --- /dev/null +++ b/pkgs/desktops/gnome/apps/vinagre/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchurl, pkg-config, gtk3, gnome, vte, libxml2, gtk-vnc, intltool +, libsecret, itstool, wrapGAppsHook, librsvg }: + +stdenv.mkDerivation rec { + pname = "vinagre"; + version = "3.22.0"; + + src = fetchurl { + url = "mirror://gnome/sources/vinagre/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "cd1cdbacca25c8d1debf847455155ee798c3e67a20903df8b228d4ece5505e82"; + }; + + nativeBuildInputs = [ pkg-config intltool itstool wrapGAppsHook ]; + buildInputs = [ + gtk3 vte libxml2 gtk-vnc libsecret gnome.adwaita-icon-theme librsvg + ]; + + NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral"; + + passthru = { + updateScript = gnome.updateScript { + packageName = "vinagre"; + attrPath = "gnome.vinagre"; + }; + }; + + meta = with lib; { + description = "Remote desktop viewer for GNOME"; + homepage = "https://wiki.gnome.org/Apps/Vinagre"; + license = licenses.gpl2Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix new file mode 100644 index 0000000000000..04f8a7a3c37b9 --- /dev/null +++ b/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, fetchurl, pkg-config, intltool, gnome +, iconnamingutils, gtk3, gdk-pixbuf, librsvg, hicolor-icon-theme }: + +stdenv.mkDerivation rec { + pname = "adwaita-icon-theme"; + version = "40.1.1"; + + src = fetchurl { + url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "C2xDbtatmIeoitofcqAZex63OwINjTRKurTH+nJQ+PY="; + }; + + # For convenience, we can specify adwaita-icon-theme only in packages + propagatedBuildInputs = [ hicolor-icon-theme ]; + + buildInputs = [ gdk-pixbuf librsvg ]; + + nativeBuildInputs = [ pkg-config intltool iconnamingutils gtk3 ]; + + dontDropIconThemeCache = true; + + # remove a tree of dirs with no files within + postInstall = '' rm -rf "$out/locale" ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = "adwaita-icon-theme"; + attrPath = "gnome.adwaita-icon-theme"; + }; + }; + + meta = with lib; { + platforms = with platforms; linux ++ darwin; + maintainers = teams.gnome.members; + }; +} diff --git a/pkgs/desktops/gnome/core/baobab/default.nix b/pkgs/desktops/gnome/core/baobab/default.nix new file mode 100644 index 0000000000000..8d0f9459c3b07 --- /dev/null +++ b/pkgs/desktops/gnome/core/baobab/default.nix @@ -0,0 +1,64 @@ +{ stdenv +, lib +, gettext +, fetchurl +, vala +, desktop-file-utils +, meson +, ninja +, pkg-config +, python3 +, gtk3 +, libhandy +, glib +, libxml2 +, wrapGAppsHook +, itstool +, gnome +}: + +stdenv.mkDerivation rec { + pname = "baobab"; + version = "40.0"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "19yii3bdgivxrcka1c4g6dpbmql5nyawwhzlsph7z6bs68nambm6"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + gettext + itstool + libxml2 + desktop-file-utils + wrapGAppsHook + python3 + ]; + + buildInputs = [ + gtk3 + libhandy + glib + gnome.adwaita-icon-theme + ]; + + doCheck = true; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + }; + }; + + meta = with lib; { + description = "Graphical application to analyse disk usage in any GNOME environment"; + homepage = "https://wiki.gnome.org/Apps/DiskUsageAnalyzer"; + license = licenses.gpl2Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/core/caribou/default.nix b/pkgs/desktops/gnome/core/caribou/default.nix new file mode 100644 index 0000000000000..5985ff8226677 --- /dev/null +++ b/pkgs/desktops/gnome/core/caribou/default.nix @@ -0,0 +1,54 @@ +{ fetchurl, lib, stdenv, pkg-config, gnome, glib, gtk3, clutter, dbus, python3, libxml2 +, libxklavier, libXtst, gtk2, intltool, libxslt, at-spi2-core, autoreconfHook +, wrapGAppsHook, libgee }: + +let + pname = "caribou"; + version = "0.4.21"; + pythonEnv = python3.withPackages ( ps: with ps; [ pygobject3 ] ); +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; + sha256 = "0mfychh1q3dx0b96pjz9a9y112bm9yqyim40yykzxx1hppsdjhww"; + }; + + patches = [ + # Fix crash in GNOME Flashback + # https://bugzilla.gnome.org/show_bug.cgi?id=791001 + (fetchurl { + url = "https://bugzilla.gnome.org/attachment.cgi?id=364774"; + sha256 = "15k1455grf6knlrxqbjnk7sals1730b0whj30451scp46wyvykvd"; + }) + ]; + + nativeBuildInputs = [ pkg-config intltool libxslt libxml2 autoreconfHook wrapGAppsHook ]; + + buildInputs = [ + glib gtk3 clutter at-spi2-core dbus pythonEnv python3.pkgs.pygobject3 + libXtst gtk2 + ]; + + propagatedBuildInputs = [ libgee libxklavier ]; + + postPatch = '' + patchShebangs . + substituteInPlace libcaribou/Makefile.am --replace "--shared-library=libcaribou.so.0" "--shared-library=$out/lib/libcaribou.so.0" + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + }; + }; + + meta = with lib; { + description = "An input assistive technology intended for switch and pointer users"; + homepage = "https://wiki.gnome.org/Projects/Caribou"; + license = licenses.lgpl21; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/core/dconf-editor/default.nix b/pkgs/desktops/gnome/core/dconf-editor/default.nix new file mode 100644 index 0000000000000..165980d7e9c13 --- /dev/null +++ b/pkgs/desktops/gnome/core/dconf-editor/default.nix @@ -0,0 +1,69 @@ +{ lib +, stdenv +, fetchurl +, meson +, ninja +, vala +, libxslt +, pkg-config +, glib +, gtk3 +, gnome +, python3 +, dconf +, libxml2 +, gettext +, docbook-xsl-nons +, wrapGAppsHook +, gobject-introspection +}: + +stdenv.mkDerivation rec { + pname = "dconf-editor"; + version = "3.38.3"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-Vxr0x9rU8Em1PmzXKLea3fCMJ92ra8V7OW0hGGbueeM="; + }; + + nativeBuildInputs = [ + meson + ninja + vala + libxslt + pkg-config + wrapGAppsHook + gettext + docbook-xsl-nons + libxml2 + gobject-introspection + python3 + ]; + + buildInputs = [ + glib + gtk3 + dconf + ]; + + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + }; + }; + + meta = with lib; { + description = "GSettings editor for GNOME"; + homepage = "https://wiki.gnome.org/Apps/DconfEditor"; + license = licenses.gpl3Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/core/empathy/default.nix b/pkgs/desktops/gnome/core/empathy/default.nix new file mode 100644 index 0000000000000..fbfee37cd13e9 --- /dev/null +++ b/pkgs/desktops/gnome/core/empathy/default.nix @@ -0,0 +1,147 @@ +{ lib, stdenv +, intltool +, fetchurl +, webkitgtk +, pkg-config +, gtk3 +, glib +, file +, librsvg +, gnome +, gdk-pixbuf +, python3 +, telepathy-glib +, telepathy-farstream +, clutter-gtk +, clutter-gst +, gst_all_1 +, cogl +, gnome-online-accounts +, gcr +, libsecret +, folks +, libpulseaudio +, telepathy-mission-control +, telepathy-logger +, libnotify +, clutter +, libsoup +, gnutls +, evolution-data-server +, yelp-xsl +, libcanberra-gtk3 +, p11-kit +, farstream +, libtool +, shared-mime-info +, wrapGAppsHook +, itstool +, libxml2 +, libxslt +, icu +, libgee +, gsettings-desktop-schemas +, isocodes +, enchant +, libchamplain +, geoclue2 +, geocode-glib +, cheese +, libgudev +}: + +stdenv.mkDerivation rec { + pname = "empathy"; + version = "3.25.90"; + + src = fetchurl { + url = "mirror://gnome/sources/empathy/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0sn10fcymc6lyrabk7vx8lpvlaxxkqnmcwj9zdkfa8qf3388k4nc"; + }; + + propagatedBuildInputs = [ + (folks.override { telepathySupport = true; }) + telepathy-logger + evolution-data-server + telepathy-mission-control + ]; + + nativeBuildInputs = [ + pkg-config + libtool + intltool + itstool + file + wrapGAppsHook + libxml2 + libxslt + yelp-xsl + python3 + ]; + + buildInputs = [ + gtk3 + glib + webkitgtk + icu + gnome-online-accounts + telepathy-glib + clutter-gtk + clutter-gst + cogl + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gcr + libsecret + libpulseaudio + gdk-pixbuf + libnotify + clutter + libsoup + gnutls + libgee + p11-kit + libcanberra-gtk3 + telepathy-farstream + farstream + gnome.adwaita-icon-theme + gsettings-desktop-schemas + librsvg + + # Spell-checking + enchant + isocodes + + # Display maps, location awareness, geocode support + libchamplain + geoclue2 + geocode-glib + + # Cheese webcam support, camera monitoring + cheese + libgudev + ]; + + enableParallelBuilding = true; + + preFixup = '' + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" + ) + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = "empathy"; + versionPolicy = "none"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Empathy"; + description = "Messaging program which supports text, voice, video chat, and file transfers over many different protocols"; + maintainers = teams.gnome.members; + license = [ licenses.gpl2 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/core/eog/default.nix b/pkgs/desktops/gnome/core/eog/default.nix new file mode 100644 index 0000000000000..426a878335289 --- /dev/null +++ b/pkgs/desktops/gnome/core/eog/default.nix @@ -0,0 +1,95 @@ +{ lib, stdenv +, fetchurl +, meson +, ninja +, gettext +, itstool +, pkg-config +, libxml2 +, libjpeg +, libpeas +, libportal +, gnome +, gtk3 +, glib +, gsettings-desktop-schemas +, adwaita-icon-theme +, gnome-desktop +, lcms2 +, gdk-pixbuf +, exempi +, shared-mime-info +, wrapGAppsHook +, librsvg +, libexif +, gobject-introspection +, python3 +}: + +stdenv.mkDerivation rec { + pname = "eog"; + version = "40.1"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-e+CGA3/tm2v4S6yXqD48kYMBt+nJavEwsnJS0KURFok="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + itstool + wrapGAppsHook + libxml2 + gobject-introspection + python3 + ]; + + buildInputs = [ + libjpeg + libportal + gtk3 + gdk-pixbuf + glib + libpeas + librsvg + lcms2 + gnome-desktop + libexif + exempi + gsettings-desktop-schemas + shared-mime-info + adwaita-icon-theme + ]; + + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; + + preFixup = '' + gappsWrapperArgs+=( + # Thumbnailers + --prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share" + --prefix XDG_DATA_DIRS : "${librsvg}/share" + --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" + ) + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + }; + }; + + meta = with lib; { + description = "GNOME image viewer"; + homepage = "https://wiki.gnome.org/Apps/EyeOfGnome"; + license = licenses.gpl2Plus; + maintainers = teams.gnome.members; + platforms = platforms.unix; + }; +} diff --git a/pkgs/desktops/gnome/core/epiphany/default.nix b/pkgs/desktops/gnome/core/epiphany/default.nix new file mode 100644 index 0000000000000..f286d384c4e80 --- /dev/null +++ b/pkgs/desktops/gnome/core/epiphany/default.nix @@ -0,0 +1,115 @@ +{ lib, stdenv +, meson +, ninja +, gettext +, fetchurl +, pkg-config +, gtk3 +, glib +, icu +, wrapGAppsHook +, gnome +, libportal +, libxml2 +, libxslt +, itstool +, webkitgtk +, libsoup +, glib-networking +, libsecret +, gnome-desktop +, libnotify +, libarchive +, p11-kit +, sqlite +, gcr +, isocodes +, desktop-file-utils +, python3 +, nettle +, gdk-pixbuf +, gst_all_1 +, json-glib +, libdazzle +, libhandy +, buildPackages +}: + +stdenv.mkDerivation rec { + pname = "epiphany"; + version = "40.1"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "1l0sb1xg16g4wg3z99xb0w2kbyczbn7q4mphs3w4lxq22xml4sk9"; + }; + + nativeBuildInputs = [ + desktop-file-utils + gettext + itstool + libxslt + meson + ninja + pkg-config + python3 + wrapGAppsHook + buildPackages.glib + buildPackages.gtk3 + ]; + + buildInputs = [ + gcr + gdk-pixbuf + glib + glib-networking + gnome-desktop + gnome.adwaita-icon-theme + gst_all_1.gst-libav + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-ugly + gst_all_1.gstreamer + gtk3 + icu + isocodes + json-glib + libdazzle + libhandy + libportal + libnotify + libarchive + libsecret + libsoup + libxml2 + nettle + p11-kit + sqlite + webkitgtk + ]; + + # Tests need an X display + mesonFlags = [ + "-Dunit_tests=disabled" + ]; + + postPatch = '' + chmod +x post_install.py # patchShebangs requires executable file + patchShebangs post_install.py + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Epiphany"; + description = "WebKit based web browser for GNOME"; + maintainers = teams.gnome.members; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/core/evince/default.nix b/pkgs/desktops/gnome/core/evince/default.nix new file mode 100644 index 0000000000000..3d7f3e0b8356c --- /dev/null +++ b/pkgs/desktops/gnome/core/evince/default.nix @@ -0,0 +1,135 @@ +{ lib, stdenv +, fetchurl +, meson +, ninja +, pkg-config +, gettext +, libxml2 +, appstream +, glib +, gtk3 +, pango +, atk +, gdk-pixbuf +, shared-mime-info +, itstool +, gnome +, poppler +, ghostscriptX +, djvulibre +, libspectre +, libarchive +, libhandy +, libsecret +, wrapGAppsHook +, librsvg +, gobject-introspection +, yelp-tools +, gspell +, adwaita-icon-theme +, gsettings-desktop-schemas +, gnome-desktop +, dbus +, python3 +, texlive +, t1lib +, gst_all_1 +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 +, supportMultimedia ? true # PDF multimedia +, libgxps +, supportXPS ? true # Open XML Paper Specification via libgxps +}: + +stdenv.mkDerivation rec { + pname = "evince"; + version = "40.1"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchurl { + url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0bfg7prmjk3z8irx1nfkkqph3igg3cy4pwd7pcxjxbshqdin6rks"; + }; + + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; + + nativeBuildInputs = [ + appstream + docbook-xsl-nons + docbook_xml_dtd_43 + gettext + gobject-introspection + gtk-doc + itstool + meson + ninja + pkg-config + python3 + wrapGAppsHook + yelp-tools + ]; + + buildInputs = [ + adwaita-icon-theme + atk + dbus # only needed to find the service directory + djvulibre + gdk-pixbuf + ghostscriptX + glib + gnome-desktop + gsettings-desktop-schemas + gspell + gtk3 + libarchive + libhandy + librsvg + libsecret + libspectre + libxml2 + pango + poppler + t1lib + texlive.bin.core # kpathsea for DVI support + ] ++ lib.optional supportXPS libgxps + ++ lib.optionals supportMultimedia (with gst_all_1; [ + gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav ]); + + mesonFlags = [ + "-Dnautilus=false" + "-Dps=enabled" + ]; + + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + + preFixup = '' + gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Evince"; + description = "GNOME's document viewer"; + + longDescription = '' + Evince is a document viewer for multiple document formats. It + currently supports PDF, PostScript, DjVu, TIFF and DVI. The goal + of Evince is to replace the multiple document viewers that exist + on the GNOME Desktop with a single simple application. + ''; + + license = lib.licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = teams.gnome.members; + }; +} diff --git a/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/pkgs/desktops/gnome/core/evolution-data-server/default.nix new file mode 100644 index 0000000000000..0ed3565d7f039 --- /dev/null +++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -0,0 +1,66 @@ +{ fetchurl, lib, stdenv, substituteAll, pkg-config, gnome, python3, gobject-introspection +, intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata, libcanberra-gtk3, gcr, p11-kit +, db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking, pcre, vala, cmake, ninja +, libkrb5, openldap, webkitgtk, libaccounts-glib, json-glib, glib, gtk3, libphonenumber +, gnome-online-accounts, libgweather, libgdata, gsettings-desktop-schemas, boost, protobuf }: + +stdenv.mkDerivation rec { + pname = "evolution-data-server"; + version = "3.40.1"; + + outputs = [ "out" "dev" ]; + + src = fetchurl { + url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "08iykha7zhk21b3axsp3v1jfwda612v0m8rz8zlzppm5i8s5ziza"; + }; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + inherit tzdata; + }) + ]; + + prePatch = '' + substitute ${./hardcode-gsettings.patch} hardcode-gsettings.patch --subst-var-by ESD_GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"} \ + --subst-var-by GDS_GSETTINGS_PATH ${glib.getSchemaPath gsettings-desktop-schemas} + patches="$patches $PWD/hardcode-gsettings.patch" + ''; + + nativeBuildInputs = [ + cmake ninja pkg-config intltool python3 gperf wrapGAppsHook gobject-introspection vala + ]; + buildInputs = [ + glib libsoup libxml2 gtk3 gnome-online-accounts + gcr p11-kit libgweather libgdata libaccounts-glib json-glib + icu sqlite libkrb5 openldap webkitgtk glib-networking + libcanberra-gtk3 pcre libphonenumber boost protobuf + ]; + + propagatedBuildInputs = [ libsecret nss nspr libical db libsoup ]; + + cmakeFlags = [ + "-DENABLE_UOA=OFF" + "-DENABLE_VALA_BINDINGS=ON" + "-DENABLE_INTROSPECTION=ON" + "-DCMAKE_SKIP_BUILD_RPATH=OFF" + "-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include" + "-DWITH_PHONENUMBER=ON" + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = "evolution-data-server"; + versionPolicy = "odd-unstable"; + }; + }; + + meta = with lib; { + description = "Unified backend for programs that work with contacts, tasks, and calendar information"; + homepage = "https://wiki.gnome.org/Apps/Evolution"; + license = licenses.lgpl2; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/core/evolution-data-server/fix-paths.patch b/pkgs/desktops/gnome/core/evolution-data-server/fix-paths.patch new file mode 100644 index 0000000000000..334235516591f --- /dev/null +++ b/pkgs/desktops/gnome/core/evolution-data-server/fix-paths.patch @@ -0,0 +1,11 @@ +--- a/src/calendar/libecal/e-cal-system-timezone.c ++++ b/src/calendar/libecal/e-cal-system-timezone.c +@@ -26,7 +26,7 @@ + #ifdef HAVE_SOLARIS + #define SYSTEM_ZONEINFODIR "/usr/share/lib/zoneinfo/tab" + #else +-#define SYSTEM_ZONEINFODIR "/usr/share/zoneinfo" ++#define SYSTEM_ZONEINFODIR "@tzdata@/share/zoneinfo" + #endif + + #define ETC_TIMEZONE "/etc/timezone" diff --git a/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch b/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch new file mode 100644 index 0000000000000..4e345c3cb3ca8 --- /dev/null +++ b/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch @@ -0,0 +1,526 @@ +diff --git a/src/addressbook/libebook/e-book-client.c b/src/addressbook/libebook/e-book-client.c +index 2c0557c3c..5955aa55e 100644 +--- a/src/addressbook/libebook/e-book-client.c ++++ b/src/addressbook/libebook/e-book-client.c +@@ -1989,7 +1989,20 @@ e_book_client_get_self (ESourceRegistry *registry, + + *out_client = book_client; + +- settings = g_settings_new (SELF_UID_PATH_ID); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ SELF_UID_PATH_ID, ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + uid = g_settings_get_string (settings, SELF_UID_KEY); + g_object_unref (settings); + +@@ -2057,7 +2070,20 @@ e_book_client_set_self (EBookClient *client, + g_return_val_if_fail ( + e_contact_get_const (contact, E_CONTACT_UID) != NULL, FALSE); + +- settings = g_settings_new (SELF_UID_PATH_ID); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ SELF_UID_PATH_ID, ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + g_settings_set_string ( + settings, SELF_UID_KEY, + e_contact_get_const (contact, E_CONTACT_UID)); +@@ -2093,8 +2119,20 @@ e_book_client_is_self (EContact *contact) + * unfortunately the API doesn't allow that. + */ + g_mutex_lock (&mutex); +- if (!settings) +- settings = g_settings_new (SELF_UID_PATH_ID); ++ if (!settings) { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ SELF_UID_PATH_ID, ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + uid = g_settings_get_string (settings, SELF_UID_KEY); + g_mutex_unlock (&mutex); + +diff --git a/src/addressbook/libebook/e-book.c b/src/addressbook/libebook/e-book.c +index 3396b57c0..ac6420b2e 100644 +--- a/src/addressbook/libebook/e-book.c ++++ b/src/addressbook/libebook/e-book.c +@@ -2594,7 +2594,20 @@ e_book_get_self (ESourceRegistry *registry, + return FALSE; + } + +- settings = g_settings_new (SELF_UID_PATH_ID); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ SELF_UID_PATH_ID, ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + uid = g_settings_get_string (settings, SELF_UID_KEY); + g_object_unref (settings); + +@@ -2649,7 +2662,20 @@ e_book_set_self (EBook *book, + g_return_val_if_fail (E_IS_BOOK (book), FALSE); + g_return_val_if_fail (E_IS_CONTACT (contact), FALSE); + +- settings = g_settings_new (SELF_UID_PATH_ID); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ SELF_UID_PATH_ID, ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + g_settings_set_string ( + settings, SELF_UID_KEY, + e_contact_get_const (contact, E_CONTACT_UID)); +@@ -2677,7 +2703,20 @@ e_book_is_self (EContact *contact) + + g_return_val_if_fail (E_IS_CONTACT (contact), FALSE); + +- settings = g_settings_new (SELF_UID_PATH_ID); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ SELF_UID_PATH_ID, ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + uid = g_settings_get_string (settings, SELF_UID_KEY); + g_object_unref (settings); + +diff --git a/src/calendar/backends/contacts/e-cal-backend-contacts.c b/src/calendar/backends/contacts/e-cal-backend-contacts.c +index de1716941..e83b104f1 100644 +--- a/src/calendar/backends/contacts/e-cal-backend-contacts.c ++++ b/src/calendar/backends/contacts/e-cal-backend-contacts.c +@@ -1397,7 +1397,20 @@ e_cal_backend_contacts_init (ECalBackendContacts *cbc) + (GDestroyNotify) g_free, + (GDestroyNotify) contact_record_free); + +- cbc->priv->settings = g_settings_new ("org.gnome.evolution-data-server.calendar"); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution-data-server.calendar", ++ FALSE); ++ cbc->priv->settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + cbc->priv->notifyid = 0; + cbc->priv->update_alarms_id = 0; + cbc->priv->alarm_enabled = FALSE; +diff --git a/src/calendar/libecal/e-reminder-watcher.c b/src/calendar/libecal/e-reminder-watcher.c +index b08a7f301..a49fe39c5 100644 +--- a/src/calendar/libecal/e-reminder-watcher.c ++++ b/src/calendar/libecal/e-reminder-watcher.c +@@ -2202,7 +2202,21 @@ e_reminder_watcher_init (EReminderWatcher *watcher) + + watcher->priv = G_TYPE_INSTANCE_GET_PRIVATE (watcher, E_TYPE_REMINDER_WATCHER, EReminderWatcherPrivate); + watcher->priv->cancellable = g_cancellable_new (); +- watcher->priv->settings = g_settings_new ("org.gnome.evolution-data-server.calendar"); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution-data-server.calendar", ++ FALSE); ++ watcher->priv->settings = g_settings_new_full(schema, NULL, ++ NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + watcher->priv->scheduled = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, e_reminder_watcher_free_rd_slist); + watcher->priv->default_zone = icaltimezone_copy (zone); + watcher->priv->timers_enabled = TRUE; +diff --git a/src/camel/camel-cipher-context.c b/src/camel/camel-cipher-context.c +index dcdc3eed0..fd2e428c2 100644 +--- a/src/camel/camel-cipher-context.c ++++ b/src/camel/camel-cipher-context.c +@@ -1635,7 +1635,20 @@ camel_cipher_can_load_photos (void) + GSettings *settings; + gboolean load_photos; + +- settings = g_settings_new ("org.gnome.evolution-data-server"); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution-data-server", ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + load_photos = g_settings_get_boolean (settings, "camel-cipher-load-photos"); + g_clear_object (&settings); + +diff --git a/src/camel/camel-gpg-context.c b/src/camel/camel-gpg-context.c +index 1b3362886..f0811b292 100644 +--- a/src/camel/camel-gpg-context.c ++++ b/src/camel/camel-gpg-context.c +@@ -573,7 +573,20 @@ gpg_ctx_get_executable_name (void) + GSettings *settings; + gchar *path; + +- settings = g_settings_new ("org.gnome.evolution-data-server"); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution-data-server", ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + path = g_settings_get_string (settings, "camel-gpg-binary"); + g_clear_object (&settings); + +diff --git a/src/libedataserver/e-network-monitor.c b/src/libedataserver/e-network-monitor.c +index e0d8b87d6..3a4d5a359 100644 +--- a/src/libedataserver/e-network-monitor.c ++++ b/src/libedataserver/e-network-monitor.c +@@ -255,7 +255,20 @@ e_network_monitor_constructed (GObject *object) + /* Chain up to parent's method. */ + G_OBJECT_CLASS (e_network_monitor_parent_class)->constructed (object); + +- settings = g_settings_new ("org.gnome.evolution-data-server"); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution-data-server", ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + g_settings_bind ( + settings, "network-monitor-gio-name", + object, "gio-name", +diff --git a/src/libedataserver/e-oauth2-service-google.c b/src/libedataserver/e-oauth2-service-google.c +index f0c6f2cbf..0053e3ce6 100644 +--- a/src/libedataserver/e-oauth2-service-google.c ++++ b/src/libedataserver/e-oauth2-service-google.c +@@ -69,7 +69,20 @@ eos_google_read_settings (EOAuth2Service *service, + if (!value) { + GSettings *settings; + +- settings = g_settings_new ("org.gnome.evolution-data-server"); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution-data-server", ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + value = g_settings_get_string (settings, key_name); + g_object_unref (settings); + +diff --git a/src/libedataserver/e-oauth2-service-outlook.c b/src/libedataserver/e-oauth2-service-outlook.c +index 687c10d3b..684583c35 100644 +--- a/src/libedataserver/e-oauth2-service-outlook.c ++++ b/src/libedataserver/e-oauth2-service-outlook.c +@@ -70,7 +70,20 @@ eos_outlook_read_settings (EOAuth2Service *service, + if (!value) { + GSettings *settings; + +- settings = g_settings_new ("org.gnome.evolution-data-server"); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution-data-server", ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + value = g_settings_get_string (settings, key_name); + g_object_unref (settings); + +diff --git a/src/libedataserver/e-oauth2-service.c b/src/libedataserver/e-oauth2-service.c +index 682673c16..436f52d5f 100644 +--- a/src/libedataserver/e-oauth2-service.c ++++ b/src/libedataserver/e-oauth2-service.c +@@ -95,7 +95,20 @@ eos_default_guess_can_process (EOAuth2Service *service, + name_len = strlen (name); + hostname_len = strlen (hostname); + +- settings = g_settings_new ("org.gnome.evolution-data-server"); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution-data-server", ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + values = g_settings_get_strv (settings, "oauth2-services-hint"); + g_object_unref (settings); + +diff --git a/src/libedataserver/e-proxy.c b/src/libedataserver/e-proxy.c +index 883379a60..989353494 100644 +--- a/src/libedataserver/e-proxy.c ++++ b/src/libedataserver/e-proxy.c +@@ -969,8 +969,37 @@ e_proxy_init (EProxy *proxy) + + proxy->priv->type = PROXY_TYPE_SYSTEM; + +- proxy->priv->evolution_proxy_settings = g_settings_new ("org.gnome.evolution.shell.network-config"); +- proxy->priv->proxy_settings = g_settings_new ("org.gnome.system.proxy"); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution.shell.network-config", ++ FALSE); ++ proxy->priv->evolution_proxy_settings = g_settings_new_full(schema, ++ NULL, ++ NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@GDS_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.system.proxy", ++ FALSE); ++ proxy->priv->proxy_settings = g_settings_new_full(schema, ++ NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + proxy->priv->proxy_http_settings = g_settings_get_child (proxy->priv->proxy_settings, "http"); + proxy->priv->proxy_https_settings = g_settings_get_child (proxy->priv->proxy_settings, "https"); + proxy->priv->proxy_socks_settings = g_settings_get_child (proxy->priv->proxy_settings, "socks"); +diff --git a/src/libedataserver/e-source-registry.c b/src/libedataserver/e-source-registry.c +index a5a30a3e1..5fbdf8190 100644 +--- a/src/libedataserver/e-source-registry.c ++++ b/src/libedataserver/e-source-registry.c +@@ -1749,7 +1749,21 @@ e_source_registry_init (ESourceRegistry *registry) + + g_mutex_init (®istry->priv->sources_lock); + +- registry->priv->settings = g_settings_new (GSETTINGS_SCHEMA); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ GSETTINGS_SCHEMA, ++ FALSE); ++ registry->priv->settings = g_settings_new_full(schema, NULL, ++ NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + + g_signal_connect ( + registry->priv->settings, "changed", +diff --git a/src/libedataserverui/e-reminders-widget.c b/src/libedataserverui/e-reminders-widget.c +index f89cd4a5c..06cca9b5f 100644 +--- a/src/libedataserverui/e-reminders-widget.c ++++ b/src/libedataserverui/e-reminders-widget.c +@@ -1650,7 +1650,21 @@ static void + e_reminders_widget_init (ERemindersWidget *reminders) + { + reminders->priv = e_reminders_widget_get_instance_private (reminders); +- reminders->priv->settings = g_settings_new ("org.gnome.evolution-data-server.calendar"); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution-data-server.calendar", ++ FALSE); ++ reminders->priv->settings = g_settings_new_full(schema, NULL, ++ NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + reminders->priv->cancellable = g_cancellable_new (); + reminders->priv->is_empty = TRUE; + reminders->priv->is_mapped = FALSE; +diff --git a/src/services/evolution-source-registry/evolution-source-registry-autoconfig.c b/src/services/evolution-source-registry/evolution-source-registry-autoconfig.c +index 6f03053d6..dffc186c7 100644 +--- a/src/services/evolution-source-registry/evolution-source-registry-autoconfig.c ++++ b/src/services/evolution-source-registry/evolution-source-registry-autoconfig.c +@@ -706,7 +706,20 @@ evolution_source_registry_merge_autoconfig_sources (ESourceRegistryServer *serve + gchar *autoconfig_directory; + gint ii; + +- settings = g_settings_new ("org.gnome.evolution-data-server"); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution-data-server", ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + + autoconfig_sources = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, e_autoconfig_free_merge_source_data); + +diff --git a/src/services/evolution-source-registry/evolution-source-registry-migrate-proxies.c b/src/services/evolution-source-registry/evolution-source-registry-migrate-proxies.c +index d531cb9e2..c5b1c761c 100644 +--- a/src/services/evolution-source-registry/evolution-source-registry-migrate-proxies.c ++++ b/src/services/evolution-source-registry/evolution-source-registry-migrate-proxies.c +@@ -61,7 +61,20 @@ evolution_source_registry_migrate_proxies (ESourceRegistryServer *server) + extension_name = E_SOURCE_EXTENSION_PROXY; + extension = e_source_get_extension (source, extension_name); + +- settings = g_settings_new (NETWORK_CONFIG_SCHEMA_ID); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ NETWORK_CONFIG_SCHEMA_ID, ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + + switch (g_settings_get_int (settings, "proxy-type")) { + case 1: +diff --git a/src/services/evolution-source-registry/evolution-source-registry.c b/src/services/evolution-source-registry/evolution-source-registry.c +index 1c0a11382..3e144845e 100644 +--- a/src/services/evolution-source-registry/evolution-source-registry.c ++++ b/src/services/evolution-source-registry/evolution-source-registry.c +@@ -181,7 +181,20 @@ main (gint argc, + + reload: + +- settings = g_settings_new ("org.gnome.evolution-data-server"); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution-data-server", ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + + if (!opt_disable_migration && !g_settings_get_boolean (settings, "migrated")) { + g_settings_set_boolean (settings, "migrated", TRUE); diff --git a/pkgs/desktops/gnome/core/gdm/default.nix b/pkgs/desktops/gnome/core/gdm/default.nix new file mode 100644 index 0000000000000..f304497734953 --- /dev/null +++ b/pkgs/desktops/gnome/core/gdm/default.nix @@ -0,0 +1,180 @@ +{ lib, stdenv +, fetchurl +, fetchpatch +, substituteAll +, meson +, ninja +, python3 +, rsync +, pkg-config +, glib +, itstool +, libxml2 +, xorg +, accountsservice +, libX11 +, gnome +, systemd +, dconf +, gtk3 +, libcanberra-gtk3 +, pam +, libselinux +, keyutils +, audit +, gobject-introspection +, plymouth +, librsvg +, coreutils +, xwayland +, dbus +, nixos-icons +}: + +let + + override = substituteAll { + src = ./org.gnome.login-screen.gschema.override; + icon = "${nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake-white.svg"; + }; + +in + +stdenv.mkDerivation rec { + pname = "gdm"; + version = "40.0"; + + outputs = [ "out" "dev" ]; + + src = fetchurl { + url = "mirror://gnome/sources/gdm/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "XtdLc506Iy/7HkoTK8+WW9/pVdmVtSh3NYh3WwLylQ4="; + }; + + mesonFlags = [ + "-Dgdm-xsession=true" + # TODO: Setup a default-path? https://gitlab.gnome.org/GNOME/gdm/-/blob/6fc40ac6aa37c8ad87c32f0b1a5d813d34bf7770/meson_options.txt#L6 + "-Dinitial-vt=${passthru.initialVT}" + "-Dudev-dir=${placeholder "out"}/lib/udev/rules.d" + "-Dsystemdsystemunitdir=${placeholder "out"}/lib/systemd/system" + "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user" + "--sysconfdir=/etc" + "--localstatedir=/var" + ]; + + nativeBuildInputs = [ + dconf + glib # for glib-compile-schemas + itstool + meson + ninja + pkg-config + python3 + rsync + ]; + + buildInputs = [ + accountsservice + audit + glib + gobject-introspection + gtk3 + keyutils + libX11 + libcanberra-gtk3 + libselinux + pam + plymouth + systemd + xorg.libXdmcp + ]; + + patches = [ + # GDM fails to find g-s with the following error in the journal. + # gdm-x-session[976]: dbus-run-session: failed to exec 'gnome-session': No such file or directory + # https://gitlab.gnome.org/GNOME/gdm/-/merge_requests/92 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gdm/-/commit/ccecd9c975d04da80db4cd547b67a1a94fa83292.patch"; + sha256 = "5hKS9wjjhuSAYwXct5vS0dPbmPRIINJoLC0Zm1naz6Q="; + revert = true; + }) + + # Change hardcoded paths to nix store paths. + (substituteAll { + src = ./fix-paths.patch; + inherit coreutils plymouth xwayland dbus; + }) + + # The following patches implement certain environment variables in GDM which are set by + # the gdm configuration module (nixos/modules/services/x11/display-managers/gdm.nix). + + ./gdm-x-session_extra_args.patch + + # Allow specifying a wrapper for running the session command. + ./gdm-x-session_session-wrapper.patch + + # Forwards certain environment variables to the gdm-x-session child process + # to ensure that the above two patches actually work. + ./gdm-session-worker_forward-vars.patch + + # Set up the environment properly when launching sessions + # https://github.com/NixOS/nixpkgs/issues/48255 + ./reset-environment.patch + ]; + + postPatch = '' + patchShebangs build-aux/meson_post_install.py + + # Upstream checks some common paths to find an `X` binary. We already know it. + echo #!/bin/sh > build-aux/find-x-server.sh + echo "echo ${lib.getBin xorg.xorgserver}/bin/X" >> build-aux/find-x-server.sh + patchShebangs build-aux/find-x-server.sh + ''; + + preInstall = '' + install -D ${override} ${DESTDIR}/$out/share/glib-2.0/schemas/org.gnome.login-screen.gschema.override + ''; + + postInstall = '' + # Move stuff from DESTDIR to proper location. + # We use rsync to merge the directories. + rsync --archive "${DESTDIR}/etc" "$out" + rm --recursive "${DESTDIR}/etc" + for o in $outputs; do + rsync --archive "${DESTDIR}/''${!o}" "$(dirname "''${!o}")" + rm --recursive "${DESTDIR}/''${!o}" + done + # Ensure the DESTDIR is removed. + rmdir "${DESTDIR}/nix/store" "${DESTDIR}/nix" "${DESTDIR}" + + # We are setting DESTDIR so the post-install script does not compile the schemas. + glib-compile-schemas "$out/share/glib-2.0/schemas" + ''; + + # HACK: We want to install configuration files to $out/etc + # but GDM should read them from /etc on a NixOS system. + # With autotools, it was possible to override Make variables + # at install time but Meson does not support this + # so we need to convince it to install all files to a temporary + # location using DESTDIR and then move it to proper one in postInstall. + DESTDIR = "${placeholder "out"}/dest"; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gdm"; + attrPath = "gnome.gdm"; + }; + + # Used in GDM NixOS module + # Don't remove. + initialVT = "7"; + }; + + meta = with lib; { + description = "A program that manages graphical display servers and handles graphical user logins"; + homepage = "https://wiki.gnome.org/Projects/GDM"; + license = licenses.gpl2Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/core/gdm/fix-paths.patch b/pkgs/desktops/gnome/core/gdm/fix-paths.patch new file mode 100644 index 0000000000000..d649556fe9e62 --- /dev/null +++ b/pkgs/desktops/gnome/core/gdm/fix-paths.patch @@ -0,0 +1,82 @@ +--- a/daemon/gdm-local-display-factory.c ++++ b/daemon/gdm-local-display-factory.c +@@ -201,7 +201,7 @@ + #ifdef ENABLE_WAYLAND_SUPPORT + gboolean wayland_enabled = FALSE; + if (gdm_settings_direct_get_boolean (GDM_KEY_WAYLAND_ENABLE, &wayland_enabled)) { +- if (wayland_enabled && g_file_test ("/usr/bin/Xwayland", G_FILE_TEST_IS_EXECUTABLE) ) ++ if (wayland_enabled && g_file_test ("@xwayland@/bin/Xwayland", G_FILE_TEST_IS_EXECUTABLE) ) + return TRUE; + } + #endif +--- a/daemon/gdm-manager.c ++++ b/daemon/gdm-manager.c +@@ -145,7 +145,7 @@ + GError *error; + + error = NULL; +- res = g_spawn_command_line_sync ("plymouth --ping", ++ res = g_spawn_command_line_sync ("@plymouth@/bin/plymouth --ping", + NULL, NULL, &status, &error); + if (! res) { + g_debug ("Could not ping plymouth: %s", error->message); +@@ -163,7 +163,7 @@ + GError *error; + + error = NULL; +- res = g_spawn_command_line_sync ("plymouth deactivate", ++ res = g_spawn_command_line_sync ("@plymouth@/bin/plymouth deactivate", + NULL, NULL, NULL, &error); + if (! res) { + g_warning ("Could not deactivate plymouth: %s", error->message); +@@ -178,7 +178,7 @@ + GError *error; + + error = NULL; +- res = g_spawn_command_line_async ("plymouth quit --retain-splash", &error); ++ res = g_spawn_command_line_async ("@plymouth@/bin/plymouth quit --retain-splash", &error); + if (! res) { + g_warning ("Could not quit plymouth: %s", error->message); + g_error_free (error); +@@ -194,7 +194,7 @@ + GError *error; + + error = NULL; +- res = g_spawn_command_line_async ("plymouth quit", &error); ++ res = g_spawn_command_line_async ("@plymouth@/bin/plymouth quit", &error); + if (! res) { + g_warning ("Could not quit plymouth: %s", error->message); + g_error_free (error); +--- a/data/gdm.service.in ++++ b/data/gdm.service.in +@@ -26,7 +26,7 @@ Restart=always + IgnoreSIGPIPE=no + BusName=org.gnome.DisplayManager + EnvironmentFile=-${LANG_CONFIG_FILE} +-ExecReload=/bin/kill -SIGHUP $MAINPID ++ExecReload=@coreutils@/bin/kill -SIGHUP $MAINPID + KeyringMode=shared + + [Install] +--- a/daemon/gdm-session.c ++++ b/daemon/gdm-session.c +@@ -2916,16 +2916,16 @@ gdm_session_start_session (GdmSession *self, + */ + if (run_launcher) { + if (is_x11) { +- program = g_strdup_printf (LIBEXECDIR "/gdm-x-session %s\"dbus-run-session -- %s\"", ++ program = g_strdup_printf (LIBEXECDIR "/gdm-x-session %s\"@dbus@/bin/dbus-run-session --dbus-daemon=@dbus@/bin/dbus-daemon -- %s\"", + register_session ? "--register-session " : "", + self->selected_program); + } else { +- program = g_strdup_printf (LIBEXECDIR "/gdm-wayland-session %s\"dbus-run-session -- %s\"", ++ program = g_strdup_printf (LIBEXECDIR "/gdm-wayland-session %s\"@dbus@/bin/dbus-run-session --dbus-daemon=@dbus@/bin/dbus-daemon -- %s\"", + register_session ? "--register-session " : "", + self->selected_program); + } + } else { +- program = g_strdup_printf ("dbus-run-session -- %s", ++ program = g_strdup_printf ("@dbus@/bin/dbus-run-session --dbus-daemon=@dbus@/bin/dbus-daemon -- %s", + self->selected_program); + } + } diff --git a/pkgs/desktops/gnome/core/gdm/gdm-session-worker_forward-vars.patch b/pkgs/desktops/gnome/core/gdm/gdm-session-worker_forward-vars.patch new file mode 100644 index 0000000000000..401b6aea0c28e --- /dev/null +++ b/pkgs/desktops/gnome/core/gdm/gdm-session-worker_forward-vars.patch @@ -0,0 +1,31 @@ +diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c +index 9ef4c5b..94da834 100644 +--- a/daemon/gdm-session-worker.c ++++ b/daemon/gdm-session-worker.c +@@ -1515,6 +1515,16 @@ gdm_session_worker_load_env_d (GdmSessionWorker *worker) + g_object_unref (dir); + } + ++static void ++gdm_session_worker_forward_var (GdmSessionWorker *worker, char const *var) ++{ ++ char const *value = g_getenv(var); ++ if (value != NULL) { ++ g_debug ("forwarding %s= %s", var, value); ++ gdm_session_worker_set_environment_variable(worker, var, value); ++ } ++} ++ + static gboolean + gdm_session_worker_accredit_user (GdmSessionWorker *worker, + GError **error) +@@ -1559,6 +1569,9 @@ gdm_session_worker_accredit_user (GdmSessionWorker *worker, + goto out; + } + ++ gdm_session_worker_forward_var(worker, "GDM_X_SERVER_EXTRA_ARGS"); ++ gdm_session_worker_forward_var(worker, "GDM_X_SESSION_WRAPPER"); ++ + gdm_session_worker_update_environment_from_passwd_info (worker, + uid, + gid, diff --git a/pkgs/desktops/gnome/core/gdm/gdm-x-session_extra_args.patch b/pkgs/desktops/gnome/core/gdm/gdm-x-session_extra_args.patch new file mode 100644 index 0000000000000..66071aa4af805 --- /dev/null +++ b/pkgs/desktops/gnome/core/gdm/gdm-x-session_extra_args.patch @@ -0,0 +1,38 @@ +diff --git a/daemon/gdm-x-session.c.orig b/daemon/gdm-x-session.c +index d835b34..1f4b7f1 100644 +--- a/daemon/gdm-x-session.c.orig ++++ b/daemon/gdm-x-session.c +@@ -211,6 +211,7 @@ spawn_x_server (State *state, + char *vt_string = NULL; + char *display_number; + gsize display_number_size; ++ gchar **xserver_extra_args = NULL; + + auth_file = prepare_auth_file (); + +@@ -285,6 +286,17 @@ spawn_x_server (State *state, + if (state->debug_enabled) { + g_ptr_array_add (arguments, "-core"); + } ++ ++ if (g_getenv ("GDM_X_SERVER_EXTRA_ARGS") != NULL) { ++ g_debug ("using GDM_X_SERVER_EXTRA_ARGS: %s", g_getenv("GDM_X_SERVER_EXTRA_ARGS")); ++ xserver_extra_args = g_strsplit(g_getenv("GDM_X_SERVER_EXTRA_ARGS"), " ", -1); ++ for (gchar **extra_arg = xserver_extra_args; *extra_arg; extra_arg++) { ++ if (strlen(*extra_arg) < 1) continue; ++ g_debug ("adding: %s", *extra_arg); ++ g_ptr_array_add (arguments, *extra_arg); ++ } ++ } ++ + g_ptr_array_add (arguments, NULL); + + subprocess = g_subprocess_launcher_spawnv (launcher, +@@ -332,6 +344,7 @@ spawn_x_server (State *state, + + is_running = TRUE; + out: ++ g_strfreev(xserver_extra_args); + g_clear_pointer (&auth_file, g_free); + g_clear_object (&data_stream); + g_clear_object (&subprocess); diff --git a/pkgs/desktops/gnome/core/gdm/gdm-x-session_session-wrapper.patch b/pkgs/desktops/gnome/core/gdm/gdm-x-session_session-wrapper.patch new file mode 100644 index 0000000000000..58481f0730fae --- /dev/null +++ b/pkgs/desktops/gnome/core/gdm/gdm-x-session_session-wrapper.patch @@ -0,0 +1,40 @@ +diff --git a/daemon/gdm-x-session.c b/daemon/gdm-x-session.c +index 88fe96f..b1b140a 100644 +--- a/daemon/gdm-x-session.c ++++ b/daemon/gdm-x-session.c +@@ -664,18 +664,34 @@ spawn_session (State *state, + state->session_command, + NULL); + } else { ++ char const *session_wrapper; ++ char *eff_session_command; + int ret; + char **argv; + +- ret = g_shell_parse_argv (state->session_command, ++ session_wrapper = g_getenv("GDM_X_SESSION_WRAPPER"); ++ if (session_wrapper != NULL) { ++ char *quoted_wrapper = g_shell_quote(session_wrapper); ++ eff_session_command = g_strjoin(" ", quoted_wrapper, state->session_command, NULL); ++ g_free(quoted_wrapper); ++ } else { ++ eff_session_command = state->session_command; ++ } ++ ++ ret = g_shell_parse_argv (eff_session_command, + NULL, + &argv, + &error); + ++ if (session_wrapper != NULL) { ++ g_free(eff_session_command); ++ } ++ + if (!ret) { + g_debug ("could not parse session arguments: %s", error->message); + goto out; + } ++ + subprocess = g_subprocess_launcher_spawnv (launcher, + (const char * const *) argv, + &error); diff --git a/pkgs/desktops/gnome/core/gdm/org.gnome.login-screen.gschema.override b/pkgs/desktops/gnome/core/gdm/org.gnome.login-screen.gschema.override new file mode 100644 index 0000000000000..8c17f494b0f2a --- /dev/null +++ b/pkgs/desktops/gnome/core/gdm/org.gnome.login-screen.gschema.override @@ -0,0 +1,2 @@ +[org.gnome.login-screen] +logo='@icon@' diff --git a/pkgs/desktops/gnome/core/gdm/reset-environment.patch b/pkgs/desktops/gnome/core/gdm/reset-environment.patch new file mode 100644 index 0000000000000..61defd9c4bc20 --- /dev/null +++ b/pkgs/desktops/gnome/core/gdm/reset-environment.patch @@ -0,0 +1,20 @@ +--- a/daemon/gdm-wayland-session.c ++++ b/daemon/gdm-wayland-session.c +@@ -285,6 +285,7 @@ spawn_session (State *state, + "WAYLAND_DISPLAY", + "WAYLAND_SOCKET", + "GNOME_SHELL_SESSION_MODE", ++ "__NIXOS_SET_ENVIRONMENT_DONE", + NULL }; + + g_debug ("Running wayland session"); +--- a/daemon/gdm-x-session.c ++++ b/daemon/gdm-x-session.c +@@ -610,6 +610,7 @@ spawn_session (State *state, + "WAYLAND_DISPLAY", + "WAYLAND_SOCKET", + "GNOME_SHELL_SESSION_MODE", ++ "__NIXOS_SET_ENVIRONMENT_DONE", + NULL }; + + g_debug ("Running X session"); diff --git a/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix new file mode 100644 index 0000000000000..370cd14e46775 --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix @@ -0,0 +1,22 @@ +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gnome, gettext }: + +stdenv.mkDerivation rec { + pname = "gnome-backgrounds"; + version = "40.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "YN+KDaMBzkJbcEPUKuMuxAEf8I8Y4Pxi8pQBMF2jpw4="; + }; + + passthru = { + updateScript = gnome.updateScript { packageName = "gnome-backgrounds"; attrPath = "gnome.gnome-backgrounds"; }; + }; + + nativeBuildInputs = [ meson ninja pkg-config gettext ]; + + meta = with lib; { + platforms = platforms.unix; + maintainers = teams.gnome.members; + }; +} diff --git a/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix new file mode 100644 index 0000000000000..07b77c04994d8 --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix @@ -0,0 +1,86 @@ +{ lib +, stdenv +, fetchurl +, gnome +, meson +, ninja +, pkg-config +, gtk3 +, gettext +, glib +, udev +, itstool +, libxml2 +, wrapGAppsHook +, libnotify +, libcanberra-gtk3 +, gobject-introspection +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 +, python3 +, gsettings-desktop-schemas +}: + +stdenv.mkDerivation rec { + pname = "gnome-bluetooth"; + version = "3.34.5"; + + # TODO: split out "lib" + outputs = [ "out" "dev" "devdoc" "man" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1a9ynlwwkb3wpg293ym517vmrkk63y809mmcv9a21k5yr199x53c"; + }; + + nativeBuildInputs = [ + meson + ninja + gettext + itstool + pkg-config + libxml2 + wrapGAppsHook + gobject-introspection + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 + python3 + ]; + + buildInputs = [ + glib + gtk3 + udev + libnotify + libcanberra-gtk3 + gnome.adwaita-icon-theme + gsettings-desktop-schemas + ]; + + mesonFlags = [ + "-Dicon_update=false" + "-Dgtk_doc=true" + ]; + + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + }; + }; + + meta = with lib; { + homepage = "https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en"; + description = "Application that let you manage Bluetooth in the GNOME destkop"; + maintainers = teams.gnome.members; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/core/gnome-calculator/default.nix b/pkgs/desktops/gnome/core/gnome-calculator/default.nix new file mode 100644 index 0000000000000..7e19e9523ce84 --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-calculator/default.nix @@ -0,0 +1,89 @@ +{ stdenv +, lib +, meson +, ninja +, vala +, gettext +, itstool +, fetchurl +, pkg-config +, libxml2 +, gtk3 +, glib +, gtksourceview4 +, wrapGAppsHook +, gobject-introspection +, python3 +, gnome +, mpfr +, gmp +, libsoup +, libmpc +, libhandy +, gsettings-desktop-schemas +, libgee +}: + +stdenv.mkDerivation rec { + pname = "gnome-calculator"; + version = "40.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "1xkazxbkpn1z5pfphhps7fc5q4yc8lp7f6b222n8bx5iyxhwbrkz"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + gettext + itstool + wrapGAppsHook + python3 + gobject-introspection # for finding vapi files + ]; + + buildInputs = [ + gtk3 + glib + libxml2 + gtksourceview4 + mpfr + gmp + gnome.adwaita-icon-theme + libgee + gsettings-desktop-schemas + libsoup + libmpc + libhandy + ]; + + doCheck = true; + + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + ''; + + preCheck = '' + # Currency conversion test tries to store currency data in $HOME/.cache. + export HOME=$TMPDIR + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-calculator"; + attrPath = "gnome.gnome-calculator"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Calculator"; + description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment"; + maintainers = teams.gnome.members; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/core/gnome-color-manager/default.nix b/pkgs/desktops/gnome/core/gnome-color-manager/default.nix new file mode 100644 index 0000000000000..dae367f1d5baa --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-color-manager/default.nix @@ -0,0 +1,66 @@ +{ lib, stdenv +, fetchurl +, meson +, ninja +, pkg-config +, gettext +, itstool +, desktop-file-utils +, gnome +, glib +, gtk3 +, libexif +, libtiff +, colord +, colord-gtk +, libcanberra-gtk3 +, lcms2 +, vte +, exiv2 +}: + +stdenv.mkDerivation rec { + pname = "gnome-color-manager"; + version = "3.32.0"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1vpxa2zjz3lkq9ldjg0fl65db9s6b4kcs8nyaqfz3jygma7ifg3w"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + itstool + desktop-file-utils + ]; + + buildInputs = [ + glib + gtk3 + libexif + libtiff + colord + colord-gtk + libcanberra-gtk3 + lcms2 + vte + exiv2 + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + }; + }; + + meta = with lib; { + description = "A set of graphical utilities for color management to be used in the GNOME desktop"; + license = licenses.gpl2Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/core/gnome-common/default.nix b/pkgs/desktops/gnome/core/gnome-common/default.nix new file mode 100644 index 0000000000000..cb50396a40401 --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-common/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchurl, which, gnome, autoconf, automake }: + +stdenv.mkDerivation rec { + pname = "gnome-common"; + version = "3.18.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-common/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "22569e370ae755e04527b76328befc4c73b62bfd4a572499fde116b8318af8cf"; + }; + + passthru = { + updateScript = gnome.updateScript { packageName = "gnome-common"; attrPath = "gnome.gnome-common"; }; + }; + + patches = [(fetchurl { + name = "gnome-common-patch"; + url = "https://bug697543.bugzilla-attachments.gnome.org/attachment.cgi?id=240935"; + sha256 = "17abp7czfzirjm7qsn2czd03hdv9kbyhk3lkjxg2xsf5fky7z7jl"; + })]; + + propagatedBuildInputs = [ which autoconf automake ]; # autogen.sh which is using gnome-common tends to require which + + meta = with lib; { + maintainers = teams.gnome.members; + }; +} diff --git a/pkgs/desktops/gnome/core/gnome-contacts/default.nix b/pkgs/desktops/gnome/core/gnome-contacts/default.nix new file mode 100644 index 0000000000000..62a43d20d5806 --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-contacts/default.nix @@ -0,0 +1,95 @@ +{ lib, stdenv +, gettext +, fetchurl +, evolution-data-server +, pkg-config +, libxslt +, docbook_xsl +, docbook_xml_dtd_42 +, python3 +, gtk3 +, glib +, cheese +, libchamplain +, clutter-gtk +, geocode-glib +, gnome-desktop +, gnome-online-accounts +, wrapGAppsHook +, folks +, libgdata +, libxml2 +, gnome +, vala +, meson +, ninja +, libhandy +, gsettings-desktop-schemas +}: + +stdenv.mkDerivation rec { + pname = "gnome-contacts"; + version = "40.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-contacts/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0w2g5xhw65adzvwzakrj5kaim4sw1w7s8qqwm3nm6inq50znzpn9"; + }; + + propagatedUserEnvPkgs = [ + evolution-data-server + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + gettext + libxslt + docbook_xsl + docbook_xml_dtd_42 + python3 + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + glib + evolution-data-server + gsettings-desktop-schemas + folks + libgdata # required by some dependency transitively + gnome-desktop + libhandy + libxml2 + gnome-online-accounts + cheese + gnome.adwaita-icon-theme + libchamplain + clutter-gtk + geocode-glib + ]; + + postPatch = '' + chmod +x build-aux/meson_post_install.py + patchShebangs build-aux/meson_post_install.py + ''; + + doCheck = true; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-contacts"; + attrPath = "gnome.gnome-contacts"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Contacts"; + description = "GNOME’s integrated address book"; + maintainers = teams.gnome.members; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix new file mode 100644 index 0000000000000..6170f53c716ba --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -0,0 +1,190 @@ +{ fetchurl +, fetchpatch +, lib +, stdenv +, substituteAll +, accountsservice +, adwaita-icon-theme +, cheese +, clutter +, clutter-gtk +, colord +, colord-gtk +, cups +, docbook-xsl-nons +, fontconfig +, gdk-pixbuf +, gettext +, glib +, glib-networking +, glibc +, gnome-bluetooth +, gnome-color-manager +, gnome-desktop +, gnome-online-accounts +, gnome-settings-daemon +, gnome +, grilo +, grilo-plugins +, gsettings-desktop-schemas +, gsound +, gtk3 +, ibus +, libcanberra-gtk3 +, libgnomekbd +, libgtop +, libgudev +, libhandy +, libkrb5 +, libpulseaudio +, libpwquality +, librsvg +, libsecret +, libsoup +, libwacom +, libxml2 +, libxslt +, meson +, modemmanager +, mutter +, networkmanager +, networkmanagerapplet +, libnma +, ninja +, pkg-config +, polkit +, python3 +, samba +, shared-mime-info +, sound-theme-freedesktop +, tracker +, tracker-miners +, tzdata +, udisks2 +, upower +, epoxy +, gnome-user-share +, gnome-remote-desktop +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "gnome-control-center"; + version = "40.0"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-zMmlc2UXOFEJrlpZkGwlgkTdh5t1A61ZhM9BZVyzAvE="; + }; + + patches = [ + (substituteAll { + src = ./paths.patch; + gcm = gnome-color-manager; + gnome_desktop = gnome-desktop; + inherit glibc libgnomekbd tzdata; + inherit cups networkmanagerapplet; + }) + + # Fix startup assertion in power panel. + # https://gitlab.gnome.org/GNOME/gnome-control-center/merge_requests/974 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-control-center/commit/9acaa10567c94048657c69538e5d7813f82c4224.patch"; + sha256 = "59GeTPcG2UiVTL4VTS/TP0p0QkAQpm3VgvuAiw64wUU="; + }) + ]; + + nativeBuildInputs = [ + docbook-xsl-nons + gettext + libxslt + meson + ninja + pkg-config + python3 + shared-mime-info + wrapGAppsHook + ]; + + buildInputs = [ + accountsservice + adwaita-icon-theme + cheese + clutter + clutter-gtk + colord + colord-gtk + epoxy + fontconfig + gdk-pixbuf + glib + glib-networking + gnome-bluetooth + gnome-desktop + gnome-online-accounts + gnome-remote-desktop # optional, sharing panel + gnome-settings-daemon + gnome-user-share # optional, sharing panel + grilo + grilo-plugins # for setting wallpaper from Flickr + gsettings-desktop-schemas + gsound + gtk3 + ibus + libcanberra-gtk3 + libgtop + libgudev + libhandy + libkrb5 + libnma + libpulseaudio + libpwquality + librsvg + libsecret + libsoup + libwacom + libxml2 + modemmanager + mutter # schemas for the keybindings + networkmanager + polkit + samba + tracker + tracker-miners # for search locations dialog + udisks2 + upower + ]; + + postPatch = '' + chmod +x build-aux/meson/meson_post_install.py # patchShebangs requires executable file + patchShebangs build-aux/meson/meson_post_install.py + ''; + + preFixup = '' + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${sound-theme-freedesktop}/share" + # Thumbnailers (for setting user profile pictures) + --prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share" + --prefix XDG_DATA_DIRS : "${librsvg}/share" + # WM keyboard shortcuts + --prefix XDG_DATA_DIRS : "${mutter}/share" + ) + for i in $out/share/applications/*; do + substituteInPlace $i --replace "Exec=gnome-control-center" "Exec=$out/bin/gnome-control-center" + done + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + }; + }; + + meta = with lib; { + description = "Utilities to configure the GNOME desktop"; + license = licenses.gpl2Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/core/gnome-control-center/paths.patch b/pkgs/desktops/gnome/core/gnome-control-center/paths.patch new file mode 100644 index 0000000000000..a6787477b8144 --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-control-center/paths.patch @@ -0,0 +1,194 @@ +diff --git a/panels/color/cc-color-panel.c b/panels/color/cc-color-panel.c +index 603178efc..c363a6a5c 100644 +--- a/panels/color/cc-color-panel.c ++++ b/panels/color/cc-color-panel.c +@@ -591,7 +591,7 @@ gcm_prefs_calibrate_cb (CcColorPanel *prefs) + + /* run with modal set */ + argv = g_ptr_array_new_with_free_func (g_free); +- g_ptr_array_add (argv, g_strdup ("gcm-calibrate")); ++ g_ptr_array_add (argv, g_build_filename ("@gcm@", "bin", "gcm-calibrate", NULL)); + g_ptr_array_add (argv, g_strdup ("--device")); + g_ptr_array_add (argv, g_strdup (cd_device_get_id (prefs->current_device))); + g_ptr_array_add (argv, g_strdup ("--parent-window")); +@@ -1029,7 +1029,7 @@ gcm_prefs_profile_view (CcColorPanel *prefs, CdProfile *profile) + + /* open up gcm-viewer as a info pane */ + argv = g_ptr_array_new_with_free_func (g_free); +- g_ptr_array_add (argv, g_strdup ("gcm-viewer")); ++ g_ptr_array_add (argv, g_build_filename ("@gcm@", "bin", "gcm-viewer", NULL)); + g_ptr_array_add (argv, g_strdup ("--profile")); + g_ptr_array_add (argv, g_strdup (cd_profile_get_id (profile))); + g_ptr_array_add (argv, g_strdup ("--parent-window")); +@@ -1275,15 +1275,12 @@ gcm_prefs_device_clicked (CcColorPanel *prefs, CdDevice *device) + static void + gcm_prefs_profile_clicked (CcColorPanel *prefs, CdProfile *profile, CdDevice *device) + { +- g_autofree gchar *s = NULL; +- + /* get profile */ + g_debug ("selected profile = %s", + cd_profile_get_filename (profile)); + + /* allow getting profile info */ +- if (cd_profile_get_filename (profile) != NULL && +- (s = g_find_program_in_path ("gcm-viewer")) != NULL) ++ if (cd_profile_get_filename (profile) != NULL) + gtk_widget_set_sensitive (prefs->toolbutton_profile_view, TRUE); + else + gtk_widget_set_sensitive (prefs->toolbutton_profile_view, FALSE); +diff --git a/panels/datetime/tz.h b/panels/datetime/tz.h +index a2376f8a4..98769e08f 100644 +--- a/panels/datetime/tz.h ++++ b/panels/datetime/tz.h +@@ -27,11 +27,7 @@ + + G_BEGIN_DECLS + +-#ifndef __sun +-# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab" +-#else +-# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab" +-#endif ++#define TZ_DATA_FILE "@tzdata@/share/zoneinfo/zone.tab" + + typedef struct _TzDB TzDB; + typedef struct _TzLocation TzLocation; +diff --git a/panels/info-overview/cc-info-overview-panel.c b/panels/info-overview/cc-info-overview-panel.c +index bd0e07762..0e71351f8 100644 +--- a/panels/info-overview/cc-info-overview-panel.c ++++ b/panels/info-overview/cc-info-overview-panel.c +@@ -172,7 +172,7 @@ load_gnome_version (char **version, + gsize length; + g_autoptr(VersionData) data = NULL; + +- if (!g_file_get_contents (DATADIR "/gnome/gnome-version.xml", ++ if (!g_file_get_contents ("@gnome_desktop@/share/gnome/gnome-version.xml", + &contents, + &length, + &error)) +diff --git a/panels/keyboard/cc-input-list-box.c b/panels/keyboard/cc-input-list-box.c +index 6c2cb5614..8f57159cc 100644 +--- a/panels/keyboard/cc-input-list-box.c ++++ b/panels/keyboard/cc-input-list-box.c +@@ -223,10 +223,10 @@ row_layout_cb (CcInputListBox *self, + layout_variant = cc_input_source_get_layout_variant (source); + + if (layout_variant && layout_variant[0]) +- commandline = g_strdup_printf ("gkbd-keyboard-display -l \"%s\t%s\"", ++ commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l \"%s\t%s\"", + layout, layout_variant); + else +- commandline = g_strdup_printf ("gkbd-keyboard-display -l %s", ++ commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l %s", + layout); + + g_spawn_command_line_async (commandline, NULL); +diff --git a/panels/network/connection-editor/net-connection-editor.c b/panels/network/connection-editor/net-connection-editor.c +index 505b8ee25..62e94009f 100644 +--- a/panels/network/connection-editor/net-connection-editor.c ++++ b/panels/network/connection-editor/net-connection-editor.c +@@ -267,9 +267,9 @@ net_connection_editor_do_fallback (NetConnectionEditor *self, const gchar *type) + g_autoptr(GError) error = NULL; + + if (self->is_new_connection) { +- cmdline = g_strdup_printf ("nm-connection-editor --type='%s' --create", type); ++ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --type='%s' --create", type); + } else { +- cmdline = g_strdup_printf ("nm-connection-editor --edit='%s'", ++ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --edit='%s'", + nm_connection_get_uuid (self->connection)); + } + +diff --git a/panels/network/net-device-bluetooth.c b/panels/network/net-device-bluetooth.c +index 74dfb0e9a..5f53d1a20 100644 +--- a/panels/network/net-device-bluetooth.c ++++ b/panels/network/net-device-bluetooth.c +@@ -90,7 +90,7 @@ nm_device_bluetooth_refresh_ui (NetDeviceBluetooth *self) + update_off_switch_from_device_state (self->device_off_switch, state, self); + + /* set up the Options button */ +- path = g_find_program_in_path ("nm-connection-editor"); ++ path = g_find_program_in_path ("@networkmanagerapplet@/bin/nm-connection-editor"); + gtk_widget_set_visible (GTK_WIDGET (self->options_button), state != NM_DEVICE_STATE_UNMANAGED && path != NULL); + } + +@@ -141,7 +141,7 @@ options_button_clicked_cb (NetDeviceBluetooth *self) + + connection = net_device_get_find_connection (self->client, self->device); + uuid = nm_connection_get_uuid (connection); +- cmdline = g_strdup_printf ("nm-connection-editor --edit %s", uuid); ++ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --edit %s", uuid); + g_debug ("Launching '%s'\n", cmdline); + if (!g_spawn_command_line_async (cmdline, &error)) + g_warning ("Failed to launch nm-connection-editor: %s", error->message); +@@ -185,7 +185,7 @@ net_device_bluetooth_init (NetDeviceBluetooth *self) + + gtk_widget_init_template (GTK_WIDGET (self)); + +- path = g_find_program_in_path ("nm-connection-editor"); ++ path = g_find_program_in_path ("@networkmanagerapplet@/bin/nm-connection-editor"); + gtk_widget_set_visible (GTK_WIDGET (self->options_button), path != NULL); + } + +diff --git a/panels/network/net-device-mobile.c b/panels/network/net-device-mobile.c +index 34eb86241..50d0a2bed 100644 +--- a/panels/network/net-device-mobile.c ++++ b/panels/network/net-device-mobile.c +@@ -508,7 +508,7 @@ options_button_clicked_cb (NetDeviceMobile *self) + + connection = net_device_get_find_connection (self->client, self->device); + uuid = nm_connection_get_uuid (connection); +- cmdline = g_strdup_printf ("nm-connection-editor --edit %s", uuid); ++ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --edit %s", uuid); + g_debug ("Launching '%s'\n", cmdline); + if (!g_spawn_command_line_async (cmdline, &error)) + g_warning ("Failed to launch nm-connection-editor: %s", error->message); +@@ -797,7 +797,7 @@ net_device_mobile_init (NetDeviceMobile *self) + + self->cancellable = g_cancellable_new (); + +- path = g_find_program_in_path ("nm-connection-editor"); ++ path = g_find_program_in_path ("@networkmanagerapplet@/bin/nm-connection-editor"); + gtk_widget_set_visible (GTK_WIDGET (self->options_button), path != NULL); + } + +diff --git a/panels/printers/pp-host.c b/panels/printers/pp-host.c +index a31a606e3..ed5133d29 100644 +--- a/panels/printers/pp-host.c ++++ b/panels/printers/pp-host.c +@@ -256,7 +256,7 @@ _pp_host_get_snmp_devices_thread (GTask *task, + devices = g_ptr_array_new_with_free_func (g_object_unref); + + argv = g_new0 (gchar *, 3); +- argv[0] = g_strdup ("/usr/lib/cups/backend/snmp"); ++ argv[0] = g_strdup ("@cups@/lib/cups/backend/snmp"); + argv[1] = g_strdup (priv->hostname); + + /* Use SNMP to get printer's informations */ +diff --git a/panels/user-accounts/run-passwd.c b/panels/user-accounts/run-passwd.c +index 86f53d4fc..0b052856f 100644 +--- a/panels/user-accounts/run-passwd.c ++++ b/panels/user-accounts/run-passwd.c +@@ -150,7 +150,7 @@ spawn_passwd (PasswdHandler *passwd_handler, GError **error) + gchar **envp; + gint my_stdin, my_stdout, my_stderr; + +- argv[0] = "/usr/bin/passwd"; /* Is it safe to rely on a hard-coded path? */ ++ argv[0] = "/run/wrappers/bin/passwd"; /* Is it safe to rely on a hard-coded path? */ + argv[1] = NULL; + + envp = g_get_environ (); +diff --git a/tests/datetime/test-endianess.c b/tests/datetime/test-endianess.c +index 9cb92007a..84d2f0fa3 100644 +--- a/tests/datetime/test-endianess.c ++++ b/tests/datetime/test-endianess.c +@@ -26,7 +26,7 @@ test_endianess (void) + g_autoptr(GDir) dir = NULL; + const char *name; + +- dir = g_dir_open ("/usr/share/i18n/locales/", 0, NULL); ++ dir = g_dir_open ("@glibc@/share/i18n/locales/", 0, NULL); + if (dir == NULL) { + /* Try with /usr/share/locale/ + * https://bugzilla.gnome.org/show_bug.cgi?id=646780 */ diff --git a/pkgs/desktops/gnome/core/gnome-desktop/bubblewrap-paths.patch b/pkgs/desktops/gnome/core/gnome-desktop/bubblewrap-paths.patch new file mode 100644 index 0000000000000..57eb4b3d44a9a --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-desktop/bubblewrap-paths.patch @@ -0,0 +1,15 @@ +--- a/libgnome-desktop/gnome-desktop-thumbnail-script.c ++++ b/libgnome-desktop/gnome-desktop-thumbnail-script.c +@@ -536,9 +536,9 @@ add_bwrap (GPtrArray *array, + g_return_val_if_fail (script->s_infile != NULL, FALSE); + + add_args (array, +- "bwrap", +- "--ro-bind", "/usr", "/usr", +- "--ro-bind", "/etc/ld.so.cache", "/etc/ld.so.cache", ++ "@bubblewrap_bin@", ++ "--ro-bind", "@storeDir@", "@storeDir@", ++ "--ro-bind", "/run/current-system", "/run/current-system", + NULL); + + /* These directories might be symlinks into /usr/... */ diff --git a/pkgs/desktops/gnome/core/gnome-desktop/default.nix b/pkgs/desktops/gnome/core/gnome-desktop/default.nix new file mode 100644 index 0000000000000..56bd074c2cb90 --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-desktop/default.nix @@ -0,0 +1,96 @@ +{ lib +, stdenv +, fetchurl +, substituteAll +, pkg-config +, libxslt +, ninja +, gnome +, gtk3 +, glib +, gettext +, libxml2 +, xkeyboard_config +, libxkbcommon +, isocodes +, meson +, wayland +, libseccomp +, systemd +, bubblewrap +, gobject-introspection +, gtk-doc +, docbook-xsl-nons +, gsettings-desktop-schemas +}: + +stdenv.mkDerivation rec { + pname = "gnome-desktop"; + version = "40.1"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-igeJcwUhnFaZVJriBI9xVVFe+Xx85NZYXd2hXVhZ4c8="; + }; + + patches = [ + (substituteAll { + src = ./bubblewrap-paths.patch; + bubblewrap_bin = "${bubblewrap}/bin/bwrap"; + inherit (builtins) storeDir; + }) + ]; + + nativeBuildInputs = [ + pkg-config + meson + ninja + gettext + libxslt + libxml2 + gobject-introspection + gtk-doc + docbook-xsl-nons + glib + ]; + + buildInputs = [ + bubblewrap + xkeyboard_config + libxkbcommon # for xkbregistry + isocodes + wayland + gtk3 + glib + libseccomp + systemd + ]; + + propagatedBuildInputs = [ + gsettings-desktop-schemas + ]; + + mesonFlags = [ + "-Dgtk_doc=true" + "-Ddesktop_docs=false" + ]; + + separateDebugInfo = stdenv.isLinux; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-desktop"; + attrPath = "gnome.gnome-desktop"; + }; + }; + + meta = with lib; { + description = "Library with common API for various GNOME modules"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-desktop"; + license = with licenses; [ gpl2Plus lgpl2Plus ]; + platforms = platforms.linux; + maintainers = teams.gnome.members; + }; +} diff --git a/pkgs/desktops/gnome/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome/core/gnome-dictionary/default.nix new file mode 100644 index 0000000000000..a399c4e85377c --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-dictionary/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, desktop-file-utils, appstream-glib, libxslt +, libxml2, gettext, itstool, wrapGAppsHook, docbook_xsl, docbook_xml_dtd_43 +, gnome, gtk3, glib, gsettings-desktop-schemas }: + +stdenv.mkDerivation rec { + pname = "gnome-dictionary"; + version = "40.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-dictionary/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "1d8dhcfys788vv27v34i3s3x3jdvdi2kqn2a5p8c937a9hm0qr9f"; + }; + + doCheck = true; + + nativeBuildInputs = [ + meson ninja pkg-config wrapGAppsHook libxml2 gettext itstool + desktop-file-utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43 + ]; + buildInputs = [ gtk3 glib gsettings-desktop-schemas gnome.adwaita-icon-theme ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-dictionary"; + attrPath = "gnome.gnome-dictionary"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Dictionary"; + description = "Dictionary is the GNOME application to look up definitions"; + maintainers = teams.gnome.members; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix new file mode 100644 index 0000000000000..c11a1df883a0b --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix @@ -0,0 +1,85 @@ +{ lib +, stdenv +, gettext +, fetchurl +, pkg-config +, udisks2 +, libhandy +, libsecret +, libdvdread +, meson +, ninja +, gtk3 +, glib +, wrapGAppsHook +, python3 +, libnotify +, itstool +, gnome +, libxml2 +, gsettings-desktop-schemas +, libcanberra-gtk3 +, libxslt +, docbook-xsl-nons +, libpwquality +, systemd +}: + +stdenv.mkDerivation rec { + pname = "gnome-disk-utility"; + version = "40.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-KkuZrBHKIzlLKMVYS56WKE6MWk2mXPBiB95U9Csf8UE="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + itstool + libxslt + docbook-xsl-nons + wrapGAppsHook + python3 + libxml2 + ]; + + buildInputs = [ + gtk3 + glib + libhandy + libsecret + libpwquality + libnotify + libdvdread + libcanberra-gtk3 + udisks2 + gnome.adwaita-icon-theme + systemd + gnome.gnome-settings-daemon + gsettings-desktop-schemas + ]; + + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-disk-utility"; + attrPath = "gnome.gnome-disk-utility"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Disks"; + description = "A udisks graphical front-end"; + maintainers = teams.gnome.members; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix new file mode 100644 index 0000000000000..622a7de1bffa2 --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, meson, ninja, gettext, fetchurl +, pkg-config, gtk3, glib, libxml2, gnome-desktop, adwaita-icon-theme, libhandy +, wrapGAppsHook, gnome, harfbuzz }: + +stdenv.mkDerivation rec { + pname = "gnome-font-viewer"; + version = "40.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0hpyi0sz3gcqqs9lkwyk8b6hr39m3n27432x98kxr436jj37dk6j"; + }; + + doCheck = true; + + nativeBuildInputs = [ meson ninja pkg-config gettext wrapGAppsHook libxml2 ]; + buildInputs = [ gtk3 glib gnome-desktop adwaita-icon-theme harfbuzz libhandy ]; + + # Do not run meson-postinstall.sh + preConfigure = "sed -i '2,$ d' meson-postinstall.sh"; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-font-viewer"; + attrPath = "gnome.gnome-font-viewer"; + }; + }; + + meta = with lib; { + description = "Program that can preview fonts and create thumbnails for fonts"; + maintainers = teams.gnome.members; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/core/gnome-initial-setup/0001-fix-paths.patch b/pkgs/desktops/gnome/core/gnome-initial-setup/0001-fix-paths.patch new file mode 100644 index 0000000000000..2323759522535 --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-initial-setup/0001-fix-paths.patch @@ -0,0 +1,62 @@ +From 1ae0eca39ba6af27f37e2fe81395b91a2761a408 Mon Sep 17 00:00:00 2001 +Message-Id: <1ae0eca39ba6af27f37e2fe81395b91a2761a408.1600627676.git-series.worldofpeace@protonmail.ch> +From: WORLDofPEACE +Date: Sun, 20 Sep 2020 14:46:59 -0400 +Subject: [PATCH] fix paths + +--- + gnome-initial-setup/pages/keyboard/cc-input-chooser.c | 6 +++--- + gnome-initial-setup/pages/timezone/tz.h | 4 ++-- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/gnome-initial-setup/pages/keyboard/cc-input-chooser.c b/gnome-initial-setup/pages/keyboard/cc-input-chooser.c +index 196abf6..613d0e5 100644 +--- a/gnome-initial-setup/pages/keyboard/cc-input-chooser.c ++++ b/gnome-initial-setup/pages/keyboard/cc-input-chooser.c +@@ -177,9 +177,9 @@ preview_cb (GtkLabel *label, + return TRUE; + + if (variant[0]) +- commandline = g_strdup_printf ("gkbd-keyboard-display -l \"%s\t%s\"", layout, variant); ++ commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l \"%s\t%s\"", layout, variant); + else +- commandline = g_strdup_printf ("gkbd-keyboard-display -l %s", layout); ++ commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l %s", layout); + g_spawn_command_line_async (commandline, NULL); + g_free (commandline); + +@@ -831,7 +831,7 @@ cc_input_chooser_class_init (CcInputChooserClass *klass) + g_param_spec_string ("showing-extra", "", "", "", + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); + +- signals[CHANGED] = ++ signals[CHANGED] = + g_signal_new ("changed", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_FIRST, +diff --git a/gnome-initial-setup/pages/timezone/tz.h b/gnome-initial-setup/pages/timezone/tz.h +index a2376f8..5cb7bc9 100644 +--- a/gnome-initial-setup/pages/timezone/tz.h ++++ b/gnome-initial-setup/pages/timezone/tz.h +@@ -4,7 +4,7 @@ + * Copyright (C) 2000-2001 Ximian, Inc. + * + * Authors: Hans Petter Jansson +- * ++ * + * Largely based on Michael Fulbright's work on Anaconda. + * + * This program is free software; you can redistribute it and/or modify +@@ -28,7 +28,7 @@ + G_BEGIN_DECLS + + #ifndef __sun +-# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab" ++# define TZ_DATA_FILE "@tzdata@/share/zoneinfo/zone.tab" + #else + # define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab" + #endif + +base-commit: 5132e206a6bf81964450561d68473ac015760455 +-- +git-series 0.9.1 diff --git a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix new file mode 100644 index 0000000000000..6d57e29a596df --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix @@ -0,0 +1,106 @@ +{ lib, stdenv +, fetchurl +, substituteAll +, gettext +, meson +, ninja +, pkg-config +, wrapGAppsHook +, gnome +, accountsservice +, fontconfig +, gdm +, geoclue2 +, geocode-glib +, glib +, gnome-desktop +, gnome-online-accounts +, gtk3 +, libgweather +, json-glib +, krb5 +, libpwquality +, librest +, libsecret +, networkmanager +, pango +, polkit +, webkitgtk +, systemd +, libnma +, tzdata +, libgnomekbd +, gsettings-desktop-schemas +}: + +stdenv.mkDerivation rec { + pname = "gnome-initial-setup"; + version = "40.1"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "10zf87n6c947k9rkk2rqc9cbfwcvq23axq3rf7x1an7npv3414gi"; + }; + + patches = [ + (substituteAll { + src = ./0001-fix-paths.patch; + inherit tzdata libgnomekbd; + }) + ]; + + nativeBuildInputs = [ + gettext + meson + ninja + pkg-config + systemd + wrapGAppsHook + ]; + + buildInputs = [ + accountsservice + fontconfig + gdm + geoclue2 + geocode-glib + glib + gnome-desktop + gnome-online-accounts + gsettings-desktop-schemas + gtk3 + json-glib + krb5 + libgweather + libnma + libpwquality + librest + libsecret + networkmanager + pango + polkit + webkitgtk + ]; + + mesonFlags = [ + "-Dcheese=disabled" + "-Dibus=disabled" + "-Dparental_controls=disabled" + "-Dvendor-conf-file=${./vendor.conf}" + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + }; + }; + + meta = with lib; { + description = "Simple, easy, and safe way to prepare a new system"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-initial-setup"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = teams.gnome.members; + }; +} diff --git a/pkgs/desktops/gnome/core/gnome-initial-setup/vendor.conf b/pkgs/desktops/gnome/core/gnome-initial-setup/vendor.conf new file mode 100644 index 0000000000000..a06b37e100edc --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-initial-setup/vendor.conf @@ -0,0 +1,5 @@ +# Disable pages not right for NixOS +# For example user accounts should be preconfigured +# and we can't modify system time with systemd. +[pages] +skip=account;software;password;timezone; diff --git a/pkgs/desktops/gnome/core/gnome-keyring/default.nix b/pkgs/desktops/gnome/core/gnome-keyring/default.nix new file mode 100644 index 0000000000000..8c9815509e2d5 --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-keyring/default.nix @@ -0,0 +1,102 @@ +{ lib +, stdenv +, fetchurl +, pkg-config +, dbus +, libgcrypt +, pam +, python2 +, glib +, libxslt +, gettext +, gcr +, libcap_ng +, libselinux +, p11-kit +, openssh +, wrapGAppsHook +, docbook-xsl-nons +, docbook_xml_dtd_43 +, gnome +}: + +stdenv.mkDerivation rec { + pname = "gnome-keyring"; + version = "40.0"; + + outputs = [ "out" "dev" ]; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-keyring/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0cdrlcw814zayhvlaxqs1sm9bqlfijlp22dzzd0g5zg2isq4vlm3"; + }; + + nativeBuildInputs = [ + pkg-config + gettext + libxslt + docbook-xsl-nons + docbook_xml_dtd_43 + wrapGAppsHook + ]; + + buildInputs = [ + glib + libgcrypt + pam + openssh + libcap_ng + libselinux + gcr + p11-kit + ]; + + # In 3.20.1, tests do not support Python 3 + checkInputs = [ dbus python2 ]; + + configureFlags = [ + "--with-pkcs11-config=${placeholder "out"}/etc/pkcs11/" # installation directories + "--with-pkcs11-modules=${placeholder "out"}/lib/pkcs11/" + ]; + + # Tends to fail non-deterministically. + # - https://github.com/NixOS/nixpkgs/issues/55293 + # - https://github.com/NixOS/nixpkgs/issues/51121 + doCheck = false; + + postPatch = '' + patchShebangs build + ''; + + checkPhase = '' + export HOME=$(mktemp -d) + dbus-run-session \ + --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + make check + ''; + + # Use wrapped gnome-keyring-daemon with cap_ipc_lock=ep + postFixup = '' + files=($out/etc/xdg/autostart/* $out/share/dbus-1/services/*) + + for file in ''${files[*]}; do + substituteInPlace $file \ + --replace "$out/bin/gnome-keyring-daemon" "/run/wrappers/bin/gnome-keyring-daemon" + done + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-keyring"; + attrPath = "gnome.gnome-keyring"; + }; + }; + + meta = with lib; { + description = "Collection of components in GNOME that store secrets, passwords, keys, certificates and make them available to applications"; + homepage = "https://wiki.gnome.org/Projects/GnomeKeyring"; + license = licenses.gpl2; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome/core/gnome-online-miners/default.nix new file mode 100644 index 0000000000000..95fdf35b8831b --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-online-miners/default.nix @@ -0,0 +1,116 @@ +{ lib, stdenv +, fetchurl +, fetchpatch +, autoconf-archive +, autoreconfHook +, pkg-config +, glib +, gnome +, libxml2 +, libgdata +, grilo +, libzapojit +, grilo-plugins +, gnome-online-accounts +, libmediaart +, tracker +, gfbgraph +, librest +, libsoup +, json-glib +, gmp +, openssl +, dleyna-server +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "gnome-online-miners"; + version = "3.34.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-online-miners/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1n2jz9i8a42zwxx5h8j2gdy6q1vyydh4vl00r0al7w8jzdh24p44"; + }; + + patches = [ + # Fix use after free + # https://gitlab.gnome.org/GNOME/gnome-online-miners/merge_requests/4 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-online-miners/commit/9eb57c6a8cd1a925c508646edae936eee0a8e46b.patch"; + sha256 = "O1GRnzs33I0mFzrNDFkTGiBKstq5krYg7fwj60367TA="; + }) + + # Port to Tracker 3 + # https://gitlab.gnome.org/GNOME/gnome-online-miners/merge_requests/3 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-online-miners/commit/2d3798252807cad9eb061ed2b37e35170c1a1daf.patch"; + sha256 = "hwrkxroMpTfOwJAPkYQFdDCroZ2qSsvOgDetrJDig20="; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-online-miners/commit/1548c0c527f0e4389047448d7d3b6cff55278c8e.patch"; + sha256 = "U9w81c9Kze7kv5KHeGqvDeSNHzSayVrUG0XYsYMa1sg="; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-online-miners/commit/941ebd8890c9ac4f75a1f58ccbea9731f46ad912.patch"; + sha256 = "JHtDlZ54/BlSiUA3ROHfCTtTKSin3g6JNm8NS6pYML8="; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-online-miners/commit/d1681a64bc3f65894af2549e3ba2bffbaf6f539a.patch"; + sha256 = "9ZEatz5I81UAnjS1qCGWYDQQOxg/qp9Tg3xG/a+3goc="; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-online-miners/commit/3d2af8785c84d6e50d8a8e6a2569a4b709184e94.patch"; + sha256 = "7bdUE2k6g3Z8sdGYEb6pUm1/wbKDe4BHbylXUzfuTG0="; + }) + ]; + + nativeBuildInputs = [ + # patch changes configure.ac + autoconf-archive + autoreconfHook + + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + glib + libgdata + libxml2 + libsoup + gmp + openssl + grilo + libzapojit + grilo-plugins + gnome-online-accounts + libmediaart + tracker + gfbgraph + json-glib + librest + dleyna-server + ]; + + NIX_CFLAGS_COMPILE = [ + "-Wno-error=format-security" # https://gitlab.gnome.org/GNOME/gnome-online-miners/merge_requests/3/diffs#note_942747 + ]; + + enableParallelBuilding = true; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-online-miners"; + attrPath = "gnome.gnome-online-miners"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Projects/GnomeOnlineMiners"; + description = "A set of crawlers that go through your online content and index them locally in Tracker"; + maintainers = teams.gnome.members; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix new file mode 100644 index 0000000000000..8411b2edecb49 --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix @@ -0,0 +1,64 @@ +{ lib, stdenv +, fetchurl +, cairo +, meson +, ninja +, pkg-config +, python3 +, wrapGAppsHook +, glib +, pipewire +, systemd +, libvncserver +, libsecret +, libnotify +, gdk-pixbuf +, freerdp +}: + +stdenv.mkDerivation rec { + pname = "gnome-remote-desktop"; + version = "0.1.9"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + hash = "sha256-8iZtp4tBRT7NNRKuzwop3rcMvq16RG/I2sAlEIsJ0M8="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + python3 + wrapGAppsHook + ]; + + buildInputs = [ + cairo + freerdp + gdk-pixbuf # For libnotify + glib + libnotify + libsecret + libvncserver + pipewire + systemd + ]; + + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + ''; + + mesonFlags = [ + "-Dsystemd_user_unit_dir=${placeholder "out"}/lib/systemd/user" + ]; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Projects/Mutter/RemoteDesktop"; + description = "GNOME Remote Desktop server"; + maintainers = teams.gnome.members; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome/core/gnome-screenshot/default.nix new file mode 100644 index 0000000000000..5b02fda3e32ff --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-screenshot/default.nix @@ -0,0 +1,43 @@ +{ lib, stdenv, gettext, libxml2, libhandy, fetchurl, pkg-config, libcanberra-gtk3 +, gtk3, glib, meson, ninja, python3, wrapGAppsHook, appstream-glib, desktop-file-utils +, gnome, gsettings-desktop-schemas }: + +let + pname = "gnome-screenshot"; + version = "40.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${name}.tar.xz"; + sha256 = "1qm544ymwibk31s30k47vnn79xg30m18r7l4di0c57g375dak31n"; + }; + + doCheck = true; + + postPatch = '' + chmod +x build-aux/postinstall.py # patchShebangs requires executable file + patchShebangs build-aux/postinstall.py + ''; + + nativeBuildInputs = [ meson ninja pkg-config gettext appstream-glib libxml2 desktop-file-utils python3 wrapGAppsHook ]; + buildInputs = [ + gtk3 glib libcanberra-gtk3 libhandy gnome.adwaita-icon-theme + gsettings-desktop-schemas + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + }; + }; + + meta = with lib; { + homepage = "https://en.wikipedia.org/wiki/GNOME_Screenshot"; + description = "Utility used in the GNOME desktop environment for taking screenshots"; + maintainers = teams.gnome.members; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/core/gnome-session/ctl.nix b/pkgs/desktops/gnome/core/gnome-session/ctl.nix new file mode 100644 index 0000000000000..6a274e35bf568 --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-session/ctl.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, glib +, systemd +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "gnome-session-ctl"; + version = "40.0"; + + src = fetchFromGitHub { + owner = "nix-community"; + repo = pname; + rev = version; + hash = "sha256-gvBmLx8Qoj1vPsOwaZsd9+pTDvU5D7uUts7ZT1pXwNo="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + glib + systemd + ]; + + meta = with lib; { + description = "gnome-session-ctl extracted from gnome-session for nixpkgs"; + homepage = "https://github.com/nix-community/gnome-session-ctl"; + license = licenses.gpl2Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/core/gnome-session/default.nix b/pkgs/desktops/gnome/core/gnome-session/default.nix new file mode 100644 index 0000000000000..c1ebc43620715 --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-session/default.nix @@ -0,0 +1,90 @@ +{ fetchurl, lib, stdenv, substituteAll, meson, ninja, pkg-config, gnome, glib, gtk3, gsettings-desktop-schemas +, gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412, python3 +, libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash, gnome-session-ctl }: + +stdenv.mkDerivation rec { + pname = "gnome-session"; + version = "40.1.1"; + + outputs = ["out" "sessions"]; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-session/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "10nzyhmgkrzk6i70kj7690na0hmsv6qy5bmr10akxq9jxqlphy4w"; + }; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + gsettings = "${glib.bin}/bin/gsettings"; + dbusLaunch = "${dbus.lib}/bin/dbus-launch"; + grep = "${gnugrep}/bin/grep"; + bash = "${bash}/bin/bash"; + }) + ]; + + mesonFlags = [ "-Dsystemd=true" "-Dsystemd_session=default" ]; + + nativeBuildInputs = [ + meson ninja pkg-config gettext makeWrapper + xmlto libxslt docbook_xsl docbook_xml_dtd_412 python3 + dbus # for DTD + ]; + + buildInputs = [ + glib gtk3 libICE gnome-desktop json-glib xorg.xtrans gnome.adwaita-icon-theme + gnome.gnome-settings-daemon gsettings-desktop-schemas systemd epoxy + ]; + + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + + # Use our provided `gnome-session-ctl` + original="@libexecdir@/gnome-session-ctl" + replacement="${gnome-session-ctl}/libexec/gnome-session-ctl" + + find data/ -type f -name "*.service.in" -exec sed -i \ + -e s,$original,$replacement,g \ + {} + + ''; + + # `bin/gnome-session` will reset the environment when run in wayland, we + # therefor wrap `libexec/gnome-session-binary` instead which is the actual + # binary needing wrapping + preFixup = '' + wrapProgram "$out/libexec/gnome-session-binary" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ + --suffix XDG_DATA_DIRS : "${gnome.gnome-shell}/share"\ + --suffix XDG_CONFIG_DIRS : "${gnome.gnome-settings-daemon}/etc/xdg" + ''; + + # We move the GNOME sessions to another output since gnome-session is a dependency of + # GDM itself. If we do not hide them, it will show broken GNOME sessions when GDM is + # enabled without proper GNOME installation. + postInstall = '' + mkdir $sessions + moveToOutput share/wayland-sessions "$sessions" + moveToOutput share/xsessions "$sessions" + + # Our provided one is being used + rm -rf $out/libexec/gnome-session-ctl + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-session"; + attrPath = "gnome.gnome-session"; + }; + providedSessions = [ "gnome" "gnome-xorg" ]; + }; + + meta = with lib; { + description = "GNOME session manager"; + homepage = "https://wiki.gnome.org/Projects/SessionManagement"; + license = licenses.gpl2Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/core/gnome-session/fix-paths.patch b/pkgs/desktops/gnome/core/gnome-session/fix-paths.patch new file mode 100644 index 0000000000000..320b3024deee2 --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-session/fix-paths.patch @@ -0,0 +1,42 @@ +diff --git a/gnome-session/gnome-session.in b/gnome-session/gnome-session.in +index ddd1a591..46a3488b 100755 +--- a/gnome-session/gnome-session.in ++++ b/gnome-session/gnome-session.in +@@ -3,17 +3,19 @@ + if [ "x$XDG_SESSION_TYPE" = "xwayland" ] && + [ "x$XDG_SESSION_CLASS" != "xgreeter" ] && + [ -n "$SHELL" ] && +- grep -q "$SHELL" /etc/shells && +- ! (echo "$SHELL" | grep -q "false") && +- ! (echo "$SHELL" | grep -q "nologin"); then ++ @grep@ -q "$SHELL" /etc/shells && ++ ! (echo "$SHELL" | @grep@ -q "false") && ++ ! (echo "$SHELL" | @grep@ -q "nologin"); then + if [ "$1" != '-l' ]; then +- exec bash -c "exec -l '$SHELL' -c '$0 -l $*'" ++ # Make sure the shell actually sets up the environment. ++ unset __NIXOS_SET_ENVIRONMENT_DONE ++ exec @bash@ -c "exec -l '$SHELL' -c '$0 -l $*'" + else + shift + fi + fi + +-SETTING=$(G_MESSAGES_DEBUG='' gsettings get org.gnome.system.locale region) ++SETTING=$(G_MESSAGES_DEBUG='' @gsettings@ get org.gnome.system.locale region) + REGION=${SETTING#\'} + REGION=${REGION%\'} + +diff --git a/gnome-session/main.c b/gnome-session/main.c +index 84edfbe5..e5285489 100644 +--- a/gnome-session/main.c ++++ b/gnome-session/main.c +@@ -215,7 +215,7 @@ require_dbus_session (int argc, + } + new_argv[i + 2] = NULL; + +- if (!execvp ("dbus-launch", new_argv)) { ++ if (!execvp ("@dbusLaunch@", new_argv)) { + g_set_error (error, + G_SPAWN_ERROR, + G_SPAWN_ERROR_FAILED, diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix new file mode 100644 index 0000000000000..e091cf2365af3 --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix @@ -0,0 +1,133 @@ +{ lib, stdenv +, fetchpatch +, substituteAll +, fetchurl +, meson +, ninja +, pkg-config +, gnome +, perl +, gettext +, gtk3 +, glib +, libnotify +, libgnomekbd +, lcms2 +, libpulseaudio +, alsaLib +, libcanberra-gtk3 +, upower +, colord +, libgweather +, polkit +, gsettings-desktop-schemas +, geoclue2 +, systemd +, libgudev +, libwacom +, libxslt +, libxml2 +, modemmanager +, networkmanager +, gnome-desktop +, geocode-glib +, docbook_xsl +, wrapGAppsHook +, python3 +, tzdata +, nss +, gcr +, gnome-session-ctl +}: + +stdenv.mkDerivation rec { + pname = "gnome-settings-daemon"; + version = "40.0.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "08bv32hvsmd8izw0llvldg0c2d71srch4hi8j94jwgm5d4dsrprp"; + }; + + patches = [ + # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/202 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/commit/aae1e774dd9de22fe3520cf9eb2bfbf7216f5eb0.patch"; + sha256 = "O4m0rOW8Zrgu3Q0p0OA8b951VC0FjYbOUk9MLzB9icI="; + }) + + (substituteAll { + src = ./fix-paths.patch; + inherit tzdata; + }) + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + perl + gettext + libxml2 + libxslt + docbook_xsl + wrapGAppsHook + python3 + ]; + + buildInputs = [ + gtk3 + glib + gsettings-desktop-schemas + modemmanager + networkmanager + libnotify + libgnomekbd # for org.gnome.libgnomekbd.keyboard schema + gnome-desktop + lcms2 + libpulseaudio + alsaLib + libcanberra-gtk3 + upower + colord + libgweather + nss + polkit + geocode-glib + geoclue2 + systemd + libgudev + libwacom + gcr + ]; + + mesonFlags = [ + "-Dudev_dir=${placeholder "out"}/lib/udev" + "-Dgnome_session_ctl_path=${gnome-session-ctl}/libexec/gnome-session-ctl" + ]; + + # Default for release buildtype but passed manually because + # we're using plain + NIX_CFLAGS_COMPILE = "-DG_DISABLE_CAST_CHECKS"; + + + postPatch = '' + for f in gnome-settings-daemon/codegen.py plugins/power/gsd-power-constants-update.pl meson_post_install.py; do + chmod +x $f + patchShebangs $f + done + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + }; + }; + + meta = with lib; { + license = licenses.gpl2Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/fix-paths.patch b/pkgs/desktops/gnome/core/gnome-settings-daemon/fix-paths.patch new file mode 100644 index 0000000000000..2229302cab7c0 --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/fix-paths.patch @@ -0,0 +1,15 @@ +--- a/plugins/datetime/tz.h ++++ b/plugins/datetime/tz.h +@@ -27,11 +27,7 @@ + + #include + +-#ifndef __sun +-# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab" +-#else +-# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab" +-#endif ++#define TZ_DATA_FILE "@tzdata@/share/zoneinfo/zone.tab" + + typedef struct _TzDB TzDB; + typedef struct _TzLocation TzLocation; diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/global-backlight-helper.patch b/pkgs/desktops/gnome/core/gnome-settings-daemon/global-backlight-helper.patch new file mode 100644 index 0000000000000..8f3951af2da85 --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/global-backlight-helper.patch @@ -0,0 +1,26 @@ +diff --git a/plugins/power/gsd-backlight.c b/plugins/power/gsd-backlight.c +index d7d10fd2..5619d6ad 100644 +--- a/plugins/power/gsd-backlight.c ++++ b/plugins/power/gsd-backlight.c +@@ -358,7 +358,7 @@ gsd_backlight_run_set_helper (GsdBacklight *backlight, GTask *task) + proc = g_subprocess_new (G_SUBPROCESS_FLAGS_STDOUT_SILENCE, + &error, + "pkexec", +- LIBEXECDIR "/gsd-backlight-helper", ++ "/run/current-system/sw/bin/gnome-settings-daemon/gsd-backlight-helper", + g_udev_device_get_sysfs_path (backlight->udev_device), + data->value_str, NULL); + } else { +diff --git a/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in b/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in +index f16300f8..79d6bd17 100644 +--- a/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in ++++ b/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in +@@ -25,7 +25,7 @@ + no + yes + +- @libexecdir@/gsd-backlight-helper ++ /run/current-system/sw/bin/gnome-settings-daemon/gsd-backlight-helper + + + diff --git a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix new file mode 100644 index 0000000000000..6c38b7909590d --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix @@ -0,0 +1,73 @@ +{ lib, stdenv, fetchurl, fetchpatch, meson, ninja, gettext, pkg-config, spidermonkey_68, glib +, gnome, gnome-menus, substituteAll }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extensions"; + version = "40.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "15hak4prx2nx1svfii39clxy1lll8crdf7p91if85jcsh6r8ab8p"; + }; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + }; + }; + + patches = [ + (substituteAll { + src = ./fix_gmenu.patch; + gmenu_path = "${gnome-menus}/lib/girepository-1.0"; + }) + + # Do not show welcome dialog in gnome-classic. + # Needed for gnome-shell 40.1. + # https://gitlab.gnome.org/GNOME/gnome-shell-extensions/merge_requests/169 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-shell-extensions/commit/3e8bbb07ea7109c44d5ac7998f473779e742d041.patch"; + sha256 = "jSmPwSBgRBfPPP9mGVjw1mSWumIXQqtA6tSqHr3U+3w="; + }) + ]; + + doCheck = true; + # 60 is required for tests + # https://gitlab.gnome.org/GNOME/gnome-shell-extensions/blob/3.34.0/meson.build#L23 + checkInputs = [ spidermonkey_68 ]; + + nativeBuildInputs = [ meson ninja pkg-config gettext glib ]; + + mesonFlags = [ "-Dextension_set=all" ]; + + preFixup = '' + # The meson build doesn't compile the schemas. + # Fixup adapted from export-zips.sh in the source. + + extensiondir=$out/share/gnome-shell/extensions + schemadir=${glib.makeSchemaPath "$out" "${pname}-${version}"} + + glib-compile-schemas $schemadir + + for f in $extensiondir/*; do + name=`basename ''${f%%@*}` + uuid=$name@gnome-shell-extensions.gcampax.github.com + schema=$schemadir/org.gnome.shell.extensions.$name.gschema.xml + + if [ -f $schema ]; then + mkdir $f/schemas + ln -s $schema $f/schemas; + glib-compile-schemas $f/schemas + fi + done + ''; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Projects/GnomeShell/Extensions"; + description = "Modify and extend GNOME Shell functionality and behavior"; + maintainers = teams.gnome.members; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/core/gnome-shell-extensions/fix_gmenu.patch b/pkgs/desktops/gnome/core/gnome-shell-extensions/fix_gmenu.patch new file mode 100644 index 0000000000000..555664e8ae25f --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-shell-extensions/fix_gmenu.patch @@ -0,0 +1,11 @@ +--- a/extensions/apps-menu/extension.js ++++ b/extensions/apps-menu/extension.js +@@ -1,6 +1,8 @@ + /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */ + /* exported init enable disable */ + ++imports.gi.GIRepository.Repository.prepend_search_path('@gmenu_path@'); ++ + const { + Atk, Clutter, Gio, GLib, GMenu, GObject, Gtk, Meta, Shell, St + } = imports.gi; diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix new file mode 100644 index 0000000000000..66eaafb2cc795 --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -0,0 +1,225 @@ +{ fetchurl +, fetchpatch +, fetchgit +, substituteAll +, lib, stdenv +, meson +, ninja +, pkg-config +, gnome +, json-glib +, gettext +, libsecret +, python3 +, polkit +, networkmanager +, gtk-doc +, docbook-xsl-nons +, at-spi2-core +, libstartup_notification +, unzip +, shared-mime-info +, libgweather +, librsvg +, geoclue2 +, perl +, docbook_xml_dtd_45 +, desktop-file-utils +, libpulseaudio +, libical +, gobject-introspection +, wrapGAppsHook +, libxslt +, gcr +, accountsservice +, gdk-pixbuf +, gdm +, upower +, ibus +, libnma +, libgnomekbd +, gnome-desktop +, gsettings-desktop-schemas +, gnome-keyring +, glib +, gjs +, mutter +, evolution-data-server +, gtk3 +, gtk4 +, sassc +, systemd +, pipewire +, gst_all_1 +, adwaita-icon-theme +, gnome-bluetooth +, gnome-clocks +, gnome-settings-daemon +, gnome-autoar +, asciidoc-full +, bash-completion +, mesa +}: + +# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup +let + pythonEnv = python3.withPackages (ps: with ps; [ pygobject3 ]); +in +stdenv.mkDerivation rec { + pname = "gnome-shell"; + version = "40.0-unstable-2021-05-01"; + + outputs = [ "out" "devdoc" ]; + + src = fetchgit { + url = "https://gitlab.gnome.org/GNOME/gnome-shell.git"; + rev = "a8a79c03330427808e776c344f7ebc42782a1b5a"; + sha256 = "ivHV0SRpnBqsdC7fu1Xhtd/BA55O0UdbUyDLy5KHNYs="; + fetchSubmodules = true; + }; + # src = fetchurl { + # url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz"; + # sha256 = "sha256-vOcfQC36qcXiab9lv0iiI0PYlubPmiw0ZpOS1/v2hHg="; + # }; + + patches = [ + # Hardcode paths to various dependencies so that they can be found at runtime. + (substituteAll { + src = ./fix-paths.patch; + inherit libgnomekbd unzip; + gsettings = "${glib.bin}/bin/gsettings"; + }) + + # Use absolute path for libshew installation to make our patched gobject-introspection + # aware of the location to hardcode in the generated GIR file. + ./shew-gir-path.patch + + # Make D-Bus services wrappable. + ./wrap-services.patch + + # Fix greeter logo being too big. + # https://gitlab.gnome.org/GNOME/gnome-shell/issues/2591 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-shell/commit/ffb8bd5fa7704ce70ce7d053e03549dd15dce5ae.patch"; + revert = true; + sha256 = "14h7ahlxgly0n3sskzq9dhxzbyb04fn80pv74vz1526396676dzl"; + }) + + # Work around failing fingerprint auth + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/gnome-shell/raw/9a647c460b651aaec0b8a21f046cc289c1999416/f/0001-gdm-Work-around-failing-fingerprint-auth.patch"; + sha256 = "pFvZli3TilUt6YwdZztpB8Xq7O60XfuWUuPMMVSpqLw="; + }) + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + docbook-xsl-nons + docbook_xml_dtd_45 + gtk-doc + perl + wrapGAppsHook + sassc + desktop-file-utils + libxslt.bin + python3 + asciidoc-full + ]; + + buildInputs = [ + systemd + gsettings-desktop-schemas + gnome-keyring + glib + gcr + accountsservice + libsecret + polkit + gdk-pixbuf + librsvg + networkmanager + libstartup_notification + gjs + mutter + libpulseaudio + evolution-data-server + libical + gtk3 + gtk4 + gdm + geoclue2 + adwaita-icon-theme + gnome-bluetooth + gnome-clocks # schemas needed + at-spi2-core + upower + ibus + gnome-desktop + gnome-settings-daemon + gobject-introspection + mesa + + # recording + pipewire + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + + # not declared at build time, but typelib is needed at runtime + libgweather + libnma + + # for gnome-extension tool + bash-completion + gnome-autoar + json-glib + ]; + + mesonFlags = [ + "-Dgtk_doc=true" + ]; + + postPatch = '' + patchShebangs src/data-to-c.pl + chmod +x meson/postinstall.py + patchShebangs meson/postinstall.py + + substituteInPlace src/gnome-shell-extension-tool.in --replace "@PYTHON@" "${pythonEnv}/bin/python" + substituteInPlace src/gnome-shell-perf-tool.in --replace "@PYTHON@" "${pythonEnv}/bin/python" + ''; + + preFixup = '' + gappsWrapperArgs+=( + # Until glib’s xdgmime is patched + # Fixes “Failed to load resource:///org/gnome/shell/theme/noise-texture.png: Unrecognized image file format” + --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" + ) + ''; + + postFixup = '' + # The services need typelibs. + for svc in org.gnome.ScreenSaver org.gnome.Shell.Extensions org.gnome.Shell.Notifications org.gnome.Shell.Screencast; do + wrapGApp $out/share/gnome-shell/$svc + done + ''; + + passthru = { + mozillaPlugin = "/lib/mozilla/plugins"; + updateScript = gnome.updateScript { + packageName = "gnome-shell"; + attrPath = "gnome.gnome-shell"; + }; + }; + + meta = with lib; { + description = "Core user interface for the GNOME 3 desktop"; + homepage = "https://wiki.gnome.org/Projects/GnomeShell"; + license = licenses.gpl2Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch b/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch new file mode 100644 index 0000000000000..e17a608a2d85e --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch @@ -0,0 +1,30 @@ +--- a/js/ui/extensionDownloader.js ++++ b/js/ui/extensionDownloader.js +@@ -86,7 +86,7 @@ + stream.output_stream.write_bytes(contents, null); + stream.close(null); + let [success, pid] = GLib.spawn_async(null, +- ['unzip', '-uod', dir.get_path(), '--', file.get_path()], ++ ['@unzip@/bin/unzip', '-uod', dir.get_path(), '--', file.get_path()], + null, + GLib.SpawnFlags.SEARCH_PATH | GLib.SpawnFlags.DO_NOT_REAP_CHILD, + null); +--- a/js/ui/status/keyboard.js ++++ b/js/ui/status/keyboard.js +@@ -1062,6 +1062,6 @@ class InputSourceIndicator extends PanelMenu.Button { + if (xkbVariant.length > 0) + description = `${description}\t${xkbVariant}`; + +- Util.spawn(['gkbd-keyboard-display', '-l', description]); ++ Util.spawn(['@libgnomekbd@/bin/gkbd-keyboard-display', '-l', description]); + } + }); +--- a/data/org.gnome.Shell-disable-extensions.service ++++ b/data/org.gnome.Shell-disable-extensions.service +@@ -10,5 +10,5 @@ Requisite=gnome-session-stable.timer + [Service] + Type=simple + # Disable extensions +-ExecStart=gsettings set org.gnome.shell disable-user-extensions true ++ExecStart=@gsettings@ set org.gnome.shell disable-user-extensions true + Restart=no diff --git a/pkgs/desktops/gnome/core/gnome-shell/shew-gir-path.patch b/pkgs/desktops/gnome/core/gnome-shell/shew-gir-path.patch new file mode 100644 index 0000000000000..6d888725b5d2e --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-shell/shew-gir-path.patch @@ -0,0 +1,11 @@ +--- a/subprojects/shew/src/meson.build ++++ b/subprojects/shew/src/meson.build +@@ -13,7 +13,7 @@ shew_sources = [ + libshew = library(full_name, + sources: shew_sources, + dependencies: [gtk_dep, x11_dep], +- install_dir: pkglibdir, ++ install_dir: get_option('prefix') / pkglibdir, + install: true, + ) + diff --git a/pkgs/desktops/gnome/core/gnome-shell/wrap-services.patch b/pkgs/desktops/gnome/core/gnome-shell/wrap-services.patch new file mode 100644 index 0000000000000..bc494caea9dd0 --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-shell/wrap-services.patch @@ -0,0 +1,57 @@ +diff --git a/js/dbusServices/dbus-service.in b/js/dbusServices/dbus-service.in +old mode 100644 +new mode 100755 +index 524166102..100b81a63 +--- a/js/dbusServices/dbus-service.in ++++ b/js/dbusServices/dbus-service.in +@@ -1,3 +1,9 @@ ++#!@gjs@ ++ ++// gjs determines the package name from argv[0], which is .*-wrapped ++// so we need to override it to the original one. ++imports.package._findEffectiveEntryPointName = () => '@service@' ++ + imports.package.start({ + name: '@PACKAGE_NAME@', + prefix: '@prefix@', +diff --git a/js/dbusServices/dbus-service.service.in b/js/dbusServices/dbus-service.service.in +index 3b0d09abe..4fd4bb66d 100644 +--- a/js/dbusServices/dbus-service.service.in ++++ b/js/dbusServices/dbus-service.service.in +@@ -1,3 +1,3 @@ + [D-BUS Service] + Name=@service@ +-Exec=@gjs@ @pkgdatadir@/@service@ ++Exec=@pkgdatadir@/@service@ +diff --git a/js/dbusServices/meson.build b/js/dbusServices/meson.build +index c749f45dc..11bcb0c9e 100644 +--- a/js/dbusServices/meson.build ++++ b/js/dbusServices/meson.build +@@ -2,6 +2,7 @@ launcherconf = configuration_data() + launcherconf.set('PACKAGE_NAME', meson.project_name()) + launcherconf.set('prefix', prefix) + launcherconf.set('libdir', libdir) ++launcherconf.set('gjs', gjs.path()) + + dbus_services = { + 'org.gnome.Shell.Extensions': 'extensions', +@@ -11,16 +12,17 @@ dbus_services = { + config_dir = '@0@/..'.format(meson.current_build_dir()) + + foreach service, dir : dbus_services ++ svc_launcherconf = launcherconf ++ svc_launcherconf.set('service', service) + configure_file( + input: 'dbus-service.in', + output: service, +- configuration: launcherconf, ++ configuration: svc_launcherconf, + install_dir: pkgdatadir, + ) + + serviceconf = configuration_data() + serviceconf.set('service', service) +- serviceconf.set('gjs', gjs.path()) + serviceconf.set('pkgdatadir', pkgdatadir) + + configure_file( diff --git a/pkgs/desktops/gnome/core/gnome-software/default.nix b/pkgs/desktops/gnome/core/gnome-software/default.nix new file mode 100644 index 0000000000000..64cd214e8090f --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -0,0 +1,120 @@ +{ lib +, stdenv +, fetchurl +, substituteAll +, pkg-config +, meson +, ninja +, gettext +, gnome +, wrapGAppsHook +, packagekit +, ostree +, glib +, appstream +, libsoup +, libhandy +, polkit +, isocodes +, gspell +, libxslt +, gobject-introspection +, flatpak +, fwupd +, gtk3 +, gsettings-desktop-schemas +, gnome-desktop +, libxmlb +, gnome-online-accounts +, json-glib +, libsecret +, valgrind-light +, docbook-xsl-nons +, docbook_xml_dtd_42 +, docbook_xml_dtd_43 +, gtk-doc +, desktop-file-utils +, libsysprof-capture +}: + +let + withFwupd = stdenv.isx86_64 || stdenv.isi686; +in + +stdenv.mkDerivation rec { + pname = "gnome-software"; + version = "40.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "16q2902swxsjdxb1nj335sv1bb76rvq4w6dn4yszkwf3s0fd86in"; + }; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + inherit isocodes; + }) + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + wrapGAppsHook + libxslt + docbook_xml_dtd_42 + docbook_xml_dtd_43 + valgrind-light + docbook-xsl-nons + gtk-doc + desktop-file-utils + gobject-introspection + ]; + + buildInputs = [ + gtk3 + glib + packagekit + appstream + libsoup + libhandy + gsettings-desktop-schemas + gnome-desktop + gspell + json-glib + libsecret + ostree + polkit + flatpak + libxmlb + gnome-online-accounts + libsysprof-capture + ] ++ lib.optionals withFwupd [ + fwupd + ]; + + mesonFlags = [ + "-Dgudev=false" + # FIXME: package malcontent parental controls + "-Dmalcontent=false" + ] ++ lib.optionals (!withFwupd) [ + "-Dfwupd=false" + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.gnome-software"; + }; + }; + + meta = with lib; { + description = "Software store that lets you install and update applications and system extensions"; + homepage = "https://wiki.gnome.org/Apps/Software"; + license = licenses.gpl2Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/core/gnome-software/fix-paths.patch b/pkgs/desktops/gnome/core/gnome-software/fix-paths.patch new file mode 100644 index 0000000000000..6f443a8a43edb --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-software/fix-paths.patch @@ -0,0 +1,11 @@ +--- a/src/gs-language.c ++++ b/src/gs-language.c +@@ -95,7 +95,7 @@ + g_autoptr(GMarkupParseContext) context = NULL; + + /* find filename */ +- filename = g_build_filename (DATADIR, "xml", "iso-codes", "iso_639.xml", NULL); ++ filename = g_build_filename ("@isocodes@", "share", "xml", "iso-codes", "iso_639.xml", NULL); + if (!g_file_test (filename, G_FILE_TEST_EXISTS)) { + g_free (filename); + filename = g_build_filename ("/usr", "share", "xml", "iso-codes", "iso_639.xml", NULL); diff --git a/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix new file mode 100644 index 0000000000000..77579be6272da --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix @@ -0,0 +1,81 @@ +{ lib +, stdenv +, gettext +, fetchurl +, pkg-config +, gtkmm3 +, libxml2 +, bash +, gtk3 +, libhandy +, glib +, wrapGAppsHook +, meson +, ninja +, python3 +, gsettings-desktop-schemas +, itstool +, gnome +, librsvg +, gdk-pixbuf +, libgtop +, systemd +}: + +stdenv.mkDerivation rec { + pname = "gnome-system-monitor"; + version = "40.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-system-monitor/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "06hxd4igxas2kyind5jwfq5qbfkknykpdfy2sy3anylhcx1hzczx"; + }; + + nativeBuildInputs = [ + pkg-config + gettext + itstool + wrapGAppsHook + meson + ninja + python3 + ]; + + buildInputs = [ + bash + gtk3 + libhandy + glib + libxml2 + gtkmm3 + libgtop + gdk-pixbuf + gnome.adwaita-icon-theme + librsvg + gsettings-desktop-schemas + systemd + ]; + + doCheck = true; + + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + sed -i '/gtk-update-icon-cache/s/^/#/' meson_post_install.py + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-system-monitor"; + attrPath = "gnome.gnome-system-monitor"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/SystemMonitor"; + description = "System Monitor shows you what programs are running and how much processor time, memory, and disk space are being used"; + maintainers = teams.gnome.members; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/core/gnome-terminal/default.nix b/pkgs/desktops/gnome/core/gnome-terminal/default.nix new file mode 100644 index 0000000000000..ab3e3aecc0352 --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-terminal/default.nix @@ -0,0 +1,51 @@ +{ lib, stdenv, fetchurl, pkg-config, libxml2, gnome, dconf, nautilus +, gtk3, gsettings-desktop-schemas, vte, gettext, which, libuuid, vala +, desktop-file-utils, itstool, wrapGAppsHook, pcre2 +, libxslt, docbook-xsl-nons }: + +stdenv.mkDerivation rec { + pname = "gnome-terminal"; + version = "3.40.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-terminal/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1r6qd6w18gk83w32y6bvn4hg2hd7qvngak4ymwpgndyp41rwqw07"; + }; + + buildInputs = [ + gtk3 gsettings-desktop-schemas vte libuuid dconf + # For extension + nautilus + ]; + + nativeBuildInputs = [ + pkg-config gettext itstool which libxml2 libxslt docbook-xsl-nons + vala desktop-file-utils wrapGAppsHook pcre2 + ]; + + # Silly ./configure, it looks for dbus file from gnome-shell in the + # installation tree of the package it is configuring. + postPatch = '' + substituteInPlace configure --replace '$(eval echo $(eval echo $(eval echo ''${dbusinterfacedir})))/org.gnome.ShellSearchProvider2.xml' "${gnome.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" + substituteInPlace src/Makefile.in --replace '$(dbusinterfacedir)/org.gnome.ShellSearchProvider2.xml' "${gnome.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" + ''; + + configureFlags = [ "--disable-migration" ]; # TODO: remove this with 3.30 + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-terminal"; + attrPath = "gnome.gnome-terminal"; + }; + }; + + enableParallelBuilding = true; + + meta = with lib; { + description = "The GNOME Terminal Emulator"; + homepage = "https://wiki.gnome.org/Apps/Terminal"; + platforms = platforms.linux; + license = licenses.gpl3Plus; + maintainers = teams.gnome.members; + }; +} diff --git a/pkgs/desktops/gnome/core/gnome-themes-extra/default.nix b/pkgs/desktops/gnome/core/gnome-themes-extra/default.nix new file mode 100644 index 0000000000000..53f775833a8fd --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-themes-extra/default.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchurl, intltool, gtk3, gnome, librsvg, pkg-config, pango, atk, gtk2 +, gdk-pixbuf, hicolor-icon-theme }: + +let + pname = "gnome-themes-extra"; + version = "3.28"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; + sha256 = "06aqg9asq2vqi9wr29bs4v8z2bf4manhbhfghf4nvw01y2zs0jvw"; + }; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + }; + }; + + nativeBuildInputs = [ pkg-config intltool ]; + buildInputs = [ gtk3 librsvg pango atk gtk2 gdk-pixbuf ]; + propagatedBuildInputs = [ gnome.adwaita-icon-theme hicolor-icon-theme ]; + + dontDropIconThemeCache = true; + + postInstall = '' + gtk-update-icon-cache "$out"/share/icons/HighContrast + ''; + + meta = with lib; { + platforms = platforms.linux; + maintainers = teams.gnome.members; + }; +} diff --git a/pkgs/desktops/gnome/core/gnome-tour/default.nix b/pkgs/desktops/gnome/core/gnome-tour/default.nix new file mode 100644 index 0000000000000..7440749e0a9b9 --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-tour/default.nix @@ -0,0 +1,75 @@ +{ lib +, stdenv +, rustPlatform +, gettext +, meson +, ninja +, fetchurl +, pkg-config +, gtk3 +, glib +, gdk-pixbuf +, desktop-file-utils +, appstream-glib +, wrapGAppsHook +, python3 +, gnome +, libhandy +, librsvg +, rustc +, cargo +}: + +stdenv.mkDerivation rec { + pname = "gnome-tour"; + version = "40.0"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + hash = "sha256-cGMiOGmgdHJ0FL7H23ONhQYhbuhMz8O8p9rFLkmMG/k="; + }; + + cargoVendorDir = "vendor"; + + nativeBuildInputs = [ + appstream-glib + cargo + desktop-file-utils + gettext + glib # glib-compile-resources + meson + ninja + pkg-config + python3 + rustPlatform.cargoSetupHook + rustc + wrapGAppsHook + ]; + + buildInputs = [ + gdk-pixbuf + glib + gtk3 + libhandy + librsvg + ]; + + postPatch = '' + chmod +x build-aux/meson_post_install.py + patchShebangs build-aux/meson_post_install.py + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + }; + }; + + meta = with lib; { + homepage = "https://gitlab.gnome.org/GNOME/gnome-tour"; + description = "GNOME Greeter & Tour"; + maintainers = teams.gnome.members; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/core/gnome-user-share/default.nix b/pkgs/desktops/gnome/core/gnome-user-share/default.nix new file mode 100644 index 0000000000000..211326cfcdbd1 --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-user-share/default.nix @@ -0,0 +1,96 @@ +{ lib, stdenv +, gettext +, meson +, ninja +, fetchurl +, fetchpatch +, apacheHttpd +, nautilus +, pkg-config +, gtk3 +, glib +, libxml2 +, systemd +, wrapGAppsHook +, itstool +, libnotify +, mod_dnssd +, gnome +, libcanberra-gtk3 +, python3 +}: + +stdenv.mkDerivation rec { + pname = "gnome-user-share"; + version = "3.34.0"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "04r9ck9v4i0d31grbli1d4slw2d6dcsfkpaybkwbzi7wnj72l30x"; + }; + + patches = [ + # fix gio-unix-2.0 lookup + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-user-share/commit/8772980d4732c15505b15dccff2ca3c97e96d49d.patch"; + sha256 = "03clzhrx72pq1cbmg2y24hvw4i1xsvrg9ip113fi5bc3w4gcji7p"; + }) + ]; + + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; + + preConfigure = '' + sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' \ + -e 's,''${HTTP_MODULES_PATH},${apacheHttpd}/modules,' \ + -i data/dav_user_2.4.conf + ''; + + mesonFlags = [ + "-Dhttpd=${apacheHttpd.out}/bin/httpd" + "-Dmodules_path=${apacheHttpd.dev}/modules" + "-Dsystemduserunitdir=${placeholder "out"}/etc/systemd/user" + # In 3.34.0 it defaults to false but it is silently ignored and always installed. + # Let’s add it anyway in case they decide to make build respect the option in the future. + "-Dnautilus_extension=true" + ]; + + nativeBuildInputs = [ + pkg-config + meson + ninja + gettext + itstool + libxml2 + wrapGAppsHook + python3 + ]; + + buildInputs = [ + gtk3 + glib + nautilus + libnotify + libcanberra-gtk3 + systemd + ]; + + doCheck = true; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + }; + }; + + meta = with lib; { + homepage = "https://help.gnome.org/users/gnome-user-share/3.8"; + description = "Service that exports the contents of the Public folder in your home directory on the local network"; + maintainers = teams.gnome.members; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/core/gucharmap/default.nix b/pkgs/desktops/gnome/core/gucharmap/default.nix new file mode 100644 index 0000000000000..336a4d260c4ed --- /dev/null +++ b/pkgs/desktops/gnome/core/gucharmap/default.nix @@ -0,0 +1,108 @@ +{ lib, stdenv +, intltool +, fetchFromGitLab +, meson +, ninja +, pkg-config +, python3 +, gtk3 +, adwaita-icon-theme +, glib +, desktop-file-utils +, gtk-doc +, wrapGAppsHook +, gnome +, itstool +, libxml2 +, yelp-tools +, docbook_xsl +, docbook_xml_dtd_412 +, gsettings-desktop-schemas +, callPackage +, unzip +, unicode-character-database +, unihan-database +, runCommand +, symlinkJoin +, gobject-introspection +}: + +let + # TODO: make upstream patch allowing to use the uncompressed file, + # preferably from XDG_DATA_DIRS. + # https://gitlab.gnome.org/GNOME/gucharmap/issues/13 + unihanZip = runCommand "unihan" {} '' + mkdir -p $out/share/unicode + ln -s ${unihan-database.src} $out/share/unicode/Unihan.zip + ''; + ucd = symlinkJoin { + name = "ucd+unihan"; + paths = [ + unihanZip + unicode-character-database + ]; + }; +in stdenv.mkDerivation rec { + pname = "gucharmap"; + version = "13.0.2"; + + outputs = [ "out" "lib" "dev" "devdoc" ]; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = pname; + rev = version; + sha256 = "099za9mc6qdq9pwcbjp3d7hxjbaa43vk2w9qw4yiyswl1xq3jw62"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + python3 + wrapGAppsHook + unzip + intltool + itstool + gtk-doc + docbook_xsl + docbook_xml_dtd_412 + yelp-tools + libxml2 + desktop-file-utils + gobject-introspection + ]; + + buildInputs = [ + gtk3 + glib + gsettings-desktop-schemas + adwaita-icon-theme + ]; + + mesonFlags = [ + "-Ducd_path=${ucd}/share/unicode" + "-Dvapi=false" + ]; + + doCheck = true; + + postPatch = '' + patchShebangs data/meson_desktopfile.py gucharmap/gen-guch-unicode-tables.pl gucharmap/meson_compileschemas.py + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + }; + }; + + meta = with lib; { + description = "GNOME Character Map, based on the Unicode Character Database"; + homepage = "https://wiki.gnome.org/Apps/Gucharmap"; + license = licenses.gpl3; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome/core/libgnome-keyring/default.nix new file mode 100644 index 0000000000000..aa3c7ed398114 --- /dev/null +++ b/pkgs/desktops/gnome/core/libgnome-keyring/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool, gobject-introspection, gnome }: + +let + pname = "libgnome-keyring"; + version = "3.12.0"; +in +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; + sha256 = "c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783"; + }; + + outputs = [ "out" "dev" ]; + + propagatedBuildInputs = [ glib gobject-introspection dbus libgcrypt ]; + nativeBuildInputs = [ pkg-config intltool ]; + + meta = { + description = "Framework for managing passwords and other secrets"; + homepage = "https://wiki.gnome.org/Projects/GnomeKeyring"; + license = with lib.licenses; [ gpl2Plus lgpl2Plus ]; + inherit (glib.meta) platforms maintainers; + + longDescription = '' + gnome-keyring is a program that keeps password and other secrets for + users. The library libgnome-keyring is used by applications to integrate + with the gnome-keyring system. + ''; + }; +} diff --git a/pkgs/desktops/gnome/core/mutter/3.34/0001-EGL-Include-EGL-eglmesaext.h.patch b/pkgs/desktops/gnome/core/mutter/3.34/0001-EGL-Include-EGL-eglmesaext.h.patch new file mode 100644 index 0000000000000..3691c034d1ee6 --- /dev/null +++ b/pkgs/desktops/gnome/core/mutter/3.34/0001-EGL-Include-EGL-eglmesaext.h.patch @@ -0,0 +1,74 @@ +From 7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d Mon Sep 17 00:00:00 2001 +Message-Id: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch> +From: WORLDofPEACE +Date: Sun, 20 Oct 2019 12:04:31 +0200 +Subject: [PATCH 1/7] EGL: Include EGL/eglmesaext.h + +From: Jan Alexander Steffens (heftig) + +The eglext.h shipped by libglvnd does not include the Mesa extensions, +unlike the header shipped in Mesa. + +Fixes https://gitlab.gnome.org/GNOME/mutter/issues/876 + +(cherry picked from commit a444a4c5f58ea516ad3cd9d6ddc0056c3ca9bc90) +--- + cogl/cogl/meson.build | 2 +- + src/backends/meta-egl-ext.h | 1 + + src/backends/meta-egl.c | 1 + + src/backends/meta-egl.h | 1 + + 4 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build +index 1057ef9..9a64294 100644 +--- a/cogl/cogl/meson.build ++++ b/cogl/cogl/meson.build +@@ -48,7 +48,7 @@ cogl_gl_header_h = configure_file( + built_headers += [cogl_gl_header_h] + + if have_egl +- cogl_egl_includes_string = '#include \n#include ' ++ cogl_egl_includes_string = '#include \n#include \n#include ' + else + cogl_egl_includes_string = '' + endif +diff --git a/src/backends/meta-egl-ext.h b/src/backends/meta-egl-ext.h +index 8705e7d..db0b74f 100644 +--- a/src/backends/meta-egl-ext.h ++++ b/src/backends/meta-egl-ext.h +@@ -29,6 +29,7 @@ + + #include + #include ++#include + + /* + * This is a little different to the tests shipped with EGL implementations, +diff --git a/src/backends/meta-egl.c b/src/backends/meta-egl.c +index 6554be9..fdeff4f 100644 +--- a/src/backends/meta-egl.c ++++ b/src/backends/meta-egl.c +@@ -27,6 +27,7 @@ + + #include + #include ++#include + #include + #include + #include +diff --git a/src/backends/meta-egl.h b/src/backends/meta-egl.h +index f2a8164..4591e7d 100644 +--- a/src/backends/meta-egl.h ++++ b/src/backends/meta-egl.h +@@ -28,6 +28,7 @@ + + #include + #include ++#include + #include + + #define META_EGL_ERROR meta_egl_error_quark () + +base-commit: 48ffbb582404c1d52196eb6cc5f082c31ca4910c +-- +git-series 0.9.1 diff --git a/pkgs/desktops/gnome/core/mutter/3.34/0002-drop-inheritable.patch b/pkgs/desktops/gnome/core/mutter/3.34/0002-drop-inheritable.patch new file mode 100644 index 0000000000000..28f89ac7c0c61 --- /dev/null +++ b/pkgs/desktops/gnome/core/mutter/3.34/0002-drop-inheritable.patch @@ -0,0 +1,135 @@ +From 14cee101882e65a57dcd66ea0f8399477b23ce7e Mon Sep 17 00:00:00 2001 +Message-Id: <14cee101882e65a57dcd66ea0f8399477b23ce7e.1601082838.git-series.worldofpeace@protonmail.ch> +In-Reply-To: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch> +References: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch> +From: WORLDofPEACE +Date: Sat, 19 Oct 2019 13:26:05 +0200 +Subject: [PATCH 2/7] drop inheritable + +From: Tor Hedin Brønner + +Adapted from https://gitlab.gnome.org/GNOME/mutter/commit/c53c47ae123b03cc66044d2b846342123ecb3a01 + +We only want to drop inheritable though, to prevent the ambient set leaking further than gnome-shell. +--- + config.h.meson | 3 +++ + meson.build | 5 +++++ + meson_options.txt | 6 ++++++ + src/core/main.c | 10 ++++++++++ + src/meson.build | 1 + + 5 files changed, 25 insertions(+) + +diff --git a/config.h.meson b/config.h.meson +index 0bab718..202fb7e 100644 +--- a/config.h.meson ++++ b/config.h.meson +@@ -58,6 +58,9 @@ + /* Xwayland applications allowed to issue keyboard grabs */ + #mesondefine XWAYLAND_GRAB_DEFAULT_ACCESS_RULES + ++/* Defined if libcap-ng is available */ ++#mesondefine HAVE_LIBCAPNG ++ + /* XKB base prefix */ + #mesondefine XKB_BASE + +diff --git a/meson.build b/meson.build +index 29d495b..86970df 100644 +--- a/meson.build ++++ b/meson.build +@@ -35,6 +35,7 @@ libstartup_notification_req = '>= 0.7' + libcanberra_req = '>= 0.26' + libwacom_req = '>= 0.13' + atk_req = '>= 2.5.3' ++libcapng_req = '>= 0.7.9' + + # optional version requirements + udev_req = '>= 228' +@@ -125,6 +126,7 @@ xau_dep = dependency('xau') + ice_dep = dependency('ice') + atk_dep = dependency('atk', version: atk_req) + libcanberra_dep = dependency('libcanberra', version: libcanberra_req) ++libcapng_dep = dependency('libcap-ng', required: get_option('libcapng')) + + # For now always require X11 support + have_x11 = true +@@ -256,6 +258,7 @@ have_core_tests = false + have_cogl_tests = false + have_clutter_tests = false + have_installed_tests = false ++have_libcapng = libcapng_dep.found() + + if have_tests + have_core_tests = get_option('core_tests') +@@ -361,6 +364,7 @@ cdata.set('HAVE_LIBWACOM', have_libwacom) + cdata.set('HAVE_SM', have_sm) + cdata.set('HAVE_STARTUP_NOTIFICATION', have_startup_notification) + cdata.set('HAVE_INTROSPECTION', have_introspection) ++cdata.set('HAVE_LIBCAPNG', have_libcapng) + cdata.set('HAVE_PROFILER', have_profiler) + + xkb_base = xkeyboard_config_dep.get_pkgconfig_variable('xkb_base') +@@ -443,6 +447,7 @@ output = [ + ' Startup notification..... ' + have_startup_notification.to_string(), + ' Introspection............ ' + have_introspection.to_string(), + ' Profiler................. ' + have_profiler.to_string(), ++ ' libcap-ng................ ' + have_libcapng.to_string(), + '', + ' Tests:', + '', +diff --git a/meson_options.txt b/meson_options.txt +index 73aa7ad..8bfaacd 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -152,3 +152,9 @@ option('xwayland_grab_default_access_rules', + value: 'gnome-boxes,remote-viewer,virt-viewer,virt-manager,vinagre,vncviewer,Xephyr', + description: 'Comma delimited list of applications ressources or class allowed to issue X11 grabs in Xwayland' + ) ++ ++option('libcapng', ++ type: 'feature', ++ value: 'auto', ++ description: 'Enable libcap-ng support' ++) +diff --git a/src/core/main.c b/src/core/main.c +index 3935f35..ecf3cb2 100644 +--- a/src/core/main.c ++++ b/src/core/main.c +@@ -66,6 +66,10 @@ + #include + #endif + ++#ifdef HAVE_LIBCAPNG ++#include ++#endif ++ + #if defined(HAVE_NATIVE_BACKEND) && defined(HAVE_WAYLAND) + #include + #endif /* HAVE_WAYLAND && HAVE_NATIVE_BACKEND */ +@@ -673,6 +677,12 @@ meta_run (void) + if (!meta_display_open ()) + meta_exit (META_EXIT_ERROR); + ++#ifdef HAVE_LIBCAPNG ++ capng_clear(CAPNG_SELECT_BOTH); ++ capng_update(CAPNG_ADD, CAPNG_EFFECTIVE|CAPNG_PERMITTED, CAP_SYS_NICE); ++ capng_apply(CAPNG_SELECT_BOTH); ++#endif ++ + g_main_loop_run (meta_main_loop); + + meta_finalize (); +diff --git a/src/meson.build b/src/meson.build +index 90d8073..a9fffa2 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -18,6 +18,7 @@ mutter_pkg_deps = [ + glib_dep, + gsettings_desktop_schemas_dep, + gtk3_dep, ++ libcapng_dep, + pango_dep, + ] + +-- +git-series 0.9.1 diff --git a/pkgs/desktops/gnome/core/mutter/3.34/0003-Fix-glitches-in-gala.patch b/pkgs/desktops/gnome/core/mutter/3.34/0003-Fix-glitches-in-gala.patch new file mode 100644 index 0000000000000..9f78a324d9daf --- /dev/null +++ b/pkgs/desktops/gnome/core/mutter/3.34/0003-Fix-glitches-in-gala.patch @@ -0,0 +1,33 @@ +From 5d2b9a03f24b4dbc423adff52b2eeb478c4b5913 Mon Sep 17 00:00:00 2001 +Message-Id: <5d2b9a03f24b4dbc423adff52b2eeb478c4b5913.1601082838.git-series.worldofpeace@protonmail.ch> +In-Reply-To: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch> +References: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch> +From: WORLDofPEACE +Date: Sun, 5 Apr 2020 23:06:03 -0400 +Subject: [PATCH 3/7] Fix glitches in gala + +From: worldofpeace + +This fixes issues for users of mutter like in gala[0]. + +Upstream report: https://gitlab.gnome.org/GNOME/mutter/issues/536 +[0]: https://github.com/elementary/gala/issues/605 +--- + clutter/clutter/clutter-actor.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c +index ecf9a59..07b8b71 100644 +--- a/clutter/clutter/clutter-actor.c ++++ b/clutter/clutter/clutter-actor.c +@@ -17831,7 +17831,7 @@ _clutter_actor_get_paint_volume_mutable (ClutterActor *self) + if (_clutter_actor_get_paint_volume_real (self, &priv->paint_volume)) + { + priv->paint_volume_valid = TRUE; +- priv->needs_paint_volume_update = FALSE; ++ //priv->needs_paint_volume_update = FALSE; + return &priv->paint_volume; + } + else +-- +git-series 0.9.1 diff --git a/pkgs/desktops/gnome/core/mutter/3.34/0004-profiler-track-changes-in-GLib-and-Sysprof.patch b/pkgs/desktops/gnome/core/mutter/3.34/0004-profiler-track-changes-in-GLib-and-Sysprof.patch new file mode 100644 index 0000000000000..cd98d3950415b --- /dev/null +++ b/pkgs/desktops/gnome/core/mutter/3.34/0004-profiler-track-changes-in-GLib-and-Sysprof.patch @@ -0,0 +1,58 @@ +From 5a9f9fbaa1322b2ad0a52fcdd171d4f44d031918 Mon Sep 17 00:00:00 2001 +Message-Id: <5a9f9fbaa1322b2ad0a52fcdd171d4f44d031918.1601082838.git-series.worldofpeace@protonmail.ch> +In-Reply-To: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch> +References: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch> +From: WORLDofPEACE +Date: Wed, 30 Oct 2019 15:23:24 -0700 +Subject: [PATCH 4/7] profiler: track changes in GLib and Sysprof + +From: Christian Hergert + +This tracks the changes to gdbus-codegen in terms of how GUnixFDList is +done to use the UnixFD annotation. + +https://gitlab.gnome.org/GNOME/mutter/merge_requests/908 +(cherry picked from commit 605171291993460f31d470a8143d6438d0c6169c) +--- + src/backends/meta-profiler.c | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +diff --git a/src/backends/meta-profiler.c b/src/backends/meta-profiler.c +index 10d433a..0d62701 100644 +--- a/src/backends/meta-profiler.c ++++ b/src/backends/meta-profiler.c +@@ -51,13 +51,12 @@ G_DEFINE_TYPE_WITH_CODE (MetaProfiler, + static gboolean + handle_start (MetaDBusSysprof3Profiler *dbus_profiler, + GDBusMethodInvocation *invocation, ++ GUnixFDList *fd_list, + GVariant *options, + GVariant *fd_variant) + { + MetaProfiler *profiler = META_PROFILER (dbus_profiler); + GMainContext *main_context = g_main_context_default (); +- GDBusMessage *message; +- GUnixFDList *fd_list; + const char *group_name; + int position; + int fd = -1; +@@ -73,8 +72,6 @@ handle_start (MetaDBusSysprof3Profiler *dbus_profiler, + + g_variant_get (fd_variant, "h", &position); + +- message = g_dbus_method_invocation_get_message (invocation); +- fd_list = g_dbus_message_get_unix_fd_list (message); + if (fd_list) + fd = g_unix_fd_list_get (fd_list, position, NULL); + +@@ -98,7 +95,7 @@ handle_start (MetaDBusSysprof3Profiler *dbus_profiler, + + g_debug ("Profiler running"); + +- meta_dbus_sysprof3_profiler_complete_start (dbus_profiler, invocation); ++ meta_dbus_sysprof3_profiler_complete_start (dbus_profiler, invocation, NULL); + return TRUE; + } + +-- +git-series 0.9.1 diff --git a/pkgs/desktops/gnome/core/mutter/3.34/0005-meta-Add-missing-display.h-to-meta-workspace-manager.h.patch b/pkgs/desktops/gnome/core/mutter/3.34/0005-meta-Add-missing-display.h-to-meta-workspace-manager.h.patch new file mode 100644 index 0000000000000..138970ddda0ac --- /dev/null +++ b/pkgs/desktops/gnome/core/mutter/3.34/0005-meta-Add-missing-display.h-to-meta-workspace-manager.h.patch @@ -0,0 +1,32 @@ +From 2caa072dd8e283a8e43febeab55fe8b76dda69b7 Mon Sep 17 00:00:00 2001 +Message-Id: <2caa072dd8e283a8e43febeab55fe8b76dda69b7.1601082838.git-series.worldofpeace@protonmail.ch> +In-Reply-To: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch> +References: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch> +From: WORLDofPEACE +Date: Wed, 29 Jan 2020 11:02:33 +0100 +Subject: [PATCH 5/7] meta: Add missing display.h to meta-workspace-manager.h + +From: Corentin Noël + +This is required because MetaDisplayCorner is only defined in display.h + +https://gitlab.gnome.org/GNOME/mutter/merge_requests/1025 +(cherry picked from commit 9d390ee49fb1f6300336e82ae94cc8061c6bae12) +--- + src/meta/meta-workspace-manager.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/meta/meta-workspace-manager.h b/src/meta/meta-workspace-manager.h +index 0390c44..92cd681 100644 +--- a/src/meta/meta-workspace-manager.h ++++ b/src/meta/meta-workspace-manager.h +@@ -26,6 +26,7 @@ + #include + + #include ++#include + #include + #include + +-- +git-series 0.9.1 diff --git a/pkgs/desktops/gnome/core/mutter/3.34/0006-build-bump-ABI-to-sysprof-capture-4.patch b/pkgs/desktops/gnome/core/mutter/3.34/0006-build-bump-ABI-to-sysprof-capture-4.patch new file mode 100644 index 0000000000000..6d88f0f5e7660 --- /dev/null +++ b/pkgs/desktops/gnome/core/mutter/3.34/0006-build-bump-ABI-to-sysprof-capture-4.patch @@ -0,0 +1,102 @@ +From 0c95e5a5b31eab93f149b90982680f38e8977063 Mon Sep 17 00:00:00 2001 +Message-Id: <0c95e5a5b31eab93f149b90982680f38e8977063.1601082838.git-series.worldofpeace@protonmail.ch> +In-Reply-To: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch> +References: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch> +From: WORLDofPEACE +Date: Sat, 4 Jul 2020 12:01:28 -0700 +Subject: [PATCH 6/7] build: bump ABI to sysprof-capture-4 + +From: Christian Hergert + +GLib will now be linking against sysprof-capture-4.a. To support that, +sysprof had to remove the GLib dependency from sysprof-capture-4 which +had the side-effect of breaking ABi. + +This bumps the dependency and includes a fallback to compile just the +libsysprof-capture-4.a using a subproject wrap. + +https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1352 +(cherry picked from commit 2c08eb6d163b6758efec9eafe1d5c17fc1ab3692) +--- + meson.build | 20 ++++++++++++++++++-- + src/meson.build | 8 ++++++-- + subprojects/sysprof.wrap | 4 ++++ + 3 files changed, 28 insertions(+), 4 deletions(-) + create mode 100644 subprojects/sysprof.wrap + +diff --git a/meson.build b/meson.build +index 86970df..3dc0098 100644 +--- a/meson.build ++++ b/meson.build +@@ -1,6 +1,6 @@ + project('mutter', 'c', + version: '3.34.6', +- meson_version: '>= 0.50.0', ++ meson_version: '>= 0.51.0', + license: 'GPLv2+' + ) + +@@ -52,6 +52,9 @@ gbm_req = '>= 10.3' + # screen cast version requirements + libpipewire_req = '>= 0.2.5' + ++# profiler requirements ++sysprof_req = '>= 3.37.2' ++ + gnome = import('gnome') + pkg = import('pkgconfig') + i18n = import('i18n') +@@ -275,7 +278,20 @@ endif + + have_profiler = get_option('profiler') + if have_profiler +- sysprof_dep = dependency('sysprof-capture-3') ++ # libsysprof-capture support ++ sysprof_dep = dependency('sysprof-capture-4', ++ required: true, ++ default_options: [ ++ 'enable_examples=false', ++ 'enable_gtk=false', ++ 'enable_tests=false', ++ 'enable_tools=false', ++ 'libsysprof=false', ++ 'with_sysprofd=none', ++ 'help=false', ++ ], ++ fallback: ['sysprof', 'libsysprof_capture_dep'], ++ ) + endif + + required_functions = [ +diff --git a/src/meson.build b/src/meson.build +index a9fffa2..a91baa1 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -711,9 +711,13 @@ if have_profiler + 'backends/meta-profiler.h', + ] + +- dbus_interfaces_dir = join_paths(datadir, 'dbus-1', 'interfaces') +- sysprof3_dbus_file = join_paths(dbus_interfaces_dir, 'org.gnome.Sysprof3.Profiler.xml') ++ if sysprof_dep.type_name() == 'pkgconfig' ++ sysprof_dbus_interfaces_dir = join_paths(sysprof_dep.get_pkgconfig_variable('datadir'), 'dbus-1', 'interfaces') ++ else ++ sysprof_dbus_interfaces_dir = join_paths(meson.source_root(), 'subprojects', 'sysprof', 'src') ++ endif + ++ sysprof3_dbus_file = join_paths(sysprof_dbus_interfaces_dir, 'org.gnome.Sysprof3.Profiler.xml') + dbus_sysprof3_profiler_built_sources = gnome.gdbus_codegen('meta-dbus-sysprof3-profiler', + sysprof3_dbus_file, + interface_prefix: 'org.gnome.', +diff --git a/subprojects/sysprof.wrap b/subprojects/sysprof.wrap +new file mode 100644 +index 0000000..c8f5883 +--- /dev/null ++++ b/subprojects/sysprof.wrap +@@ -0,0 +1,4 @@ ++[wrap-git] ++directory=sysprof ++url=https://gitlab.gnome.org/GNOME/sysprof.git ++revision=cae28263ff5dd4a510d82f3dc2e3a3b3d9b386fb +-- +git-series 0.9.1 diff --git a/pkgs/desktops/gnome/core/mutter/3.34/0007-fix-paths.patch b/pkgs/desktops/gnome/core/mutter/3.34/0007-fix-paths.patch new file mode 100644 index 0000000000000..8376fc649b5f0 --- /dev/null +++ b/pkgs/desktops/gnome/core/mutter/3.34/0007-fix-paths.patch @@ -0,0 +1,27 @@ +From 7bbbf082599ec786f64f2135c9acc0b4fe2ecbf4 Mon Sep 17 00:00:00 2001 +Message-Id: <7bbbf082599ec786f64f2135c9acc0b4fe2ecbf4.1601082838.git-series.worldofpeace@protonmail.ch> +In-Reply-To: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch> +References: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch> +From: WORLDofPEACE +Date: Fri, 25 Sep 2020 20:48:33 -0400 +Subject: [PATCH 7/7] fix paths + +--- + src/core/util.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/core/util.c b/src/core/util.c +index 79bcfdc..87ce549 100644 +--- a/src/core/util.c ++++ b/src/core/util.c +@@ -623,7 +623,7 @@ meta_show_dialog (const char *type, + + args = g_ptr_array_new (); + +- append_argument (args, "zenity"); ++ append_argument (args, "@zenity@/bin/zenity"); + append_argument (args, type); + + if (display) +-- +git-series 0.9.1 diff --git a/pkgs/desktops/gnome/core/mutter/3.34/default.nix b/pkgs/desktops/gnome/core/mutter/3.34/default.nix new file mode 100644 index 0000000000000..42f07d45e62f5 --- /dev/null +++ b/pkgs/desktops/gnome/core/mutter/3.34/default.nix @@ -0,0 +1,134 @@ +{ fetchurl +, fetchpatch +, substituteAll +, lib, stdenv +, pkg-config +, gnome +, pantheon +, gettext +, gobject-introspection +, upower +, cairo +, pango +, cogl +, json-glib +, libstartup_notification +, zenity +, libcanberra-gtk3 +, ninja +, xkeyboard_config +, libxkbfile +, libxkbcommon +, libXtst +, libinput +, gsettings-desktop-schemas +, glib +, gtk3 +, gnome-desktop +, geocode-glib +, pipewire_0_2 +, libgudev +, libwacom +, xwayland +, meson +, gnome-settings-daemon +, xorgserver +, python3 +, wrapGAppsHook +, sysprof +, desktop-file-utils +, libcap_ng +, egl-wayland +}: + +stdenv.mkDerivation rec { + pname = "mutter"; + version = "3.34.6"; + + outputs = [ "out" "dev" "man" ]; + + src = fetchurl { + url = "mirror://gnome/sources/mutter/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + hash = "sha256-I73ofTO4mBNYgxzsiRW7X/Hq+cHedMkM0WYLG5WINSY="; + }; + + mesonFlags = [ + "-Degl_device=true" + "-Dinstalled_tests=false" # TODO: enable these + "-Dwayland_eglstream=true" + ]; + + propagatedBuildInputs = [ + # required for pkg-config to detect mutter-clutter + json-glib + libXtst + libcap_ng + ]; + + nativeBuildInputs = [ + desktop-file-utils + gettext + meson + ninja + pkg-config + python3 + wrapGAppsHook + xorgserver # for cvt command + ]; + + buildInputs = [ + cairo + cogl + egl-wayland + geocode-glib + glib + gnome-desktop + gnome-settings-daemon + gobject-introspection + gsettings-desktop-schemas + gtk3 + libcanberra-gtk3 + libgudev + libinput + libstartup_notification + libwacom + libxkbcommon + libxkbfile + pango + pipewire_0_2 # TODO: backport pipewire 0.3 support + sysprof + upower + xkeyboard_config + xwayland + zenity + ]; + + patches = [ + ./0001-EGL-Include-EGL-eglmesaext.h.patch + ./0002-drop-inheritable.patch + ./0003-Fix-glitches-in-gala.patch + ./0004-profiler-track-changes-in-GLib-and-Sysprof.patch + ./0005-meta-Add-missing-display.h-to-meta-workspace-manager.h.patch + ./0006-build-bump-ABI-to-sysprof-capture-4.patch + (substituteAll { + src = ./0007-fix-paths.patch; + inherit zenity; + }) + ]; + + postPatch = '' + patchShebangs src/backends/native/gen-default-modes.py + ''; + + postInstall = '' + ${glib.dev}/bin/glib-compile-schemas "$out/share/glib-2.0/schemas" + ''; + + meta = with lib; { + description = "A window manager for GNOME"; + homepage = "https://gitlab.gnome.org/GNOME/mutter"; + license = licenses.gpl2; + maintainers = pantheon.maintainers; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix new file mode 100644 index 0000000000000..9f6a64ef1829b --- /dev/null +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -0,0 +1,170 @@ +{ fetchurl +, fetchpatch +, substituteAll +, runCommand +, lib, stdenv +, pkg-config +, gnome +, gettext +, gobject-introspection +, cairo +, pango +, json-glib +, libstartup_notification +, zenity +, libcanberra +, ninja +, xkeyboard_config +, libxkbfile +, libXdamage +, libxkbcommon +, libXtst +, libinput +, libdrm +, gsettings-desktop-schemas +, glib +, gtk3 +, gnome-desktop +, pipewire +, libgudev +, libwacom +, xwayland +, mesa +, meson +, gnome-settings-daemon +, xorgserver +, python3 +, wrapGAppsHook +, sysprof +, desktop-file-utils +, libcap_ng +, egl-wayland +, graphene +, wayland-protocols +}: + +let self = stdenv.mkDerivation rec { + pname = "mutter"; + version = "40.0"; + + outputs = [ "out" "dev" "man" ]; + + src = fetchurl { + url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-enGzEuWmZ8U3SJUYilBqP2tnF2i8s2K2jv3FYnc9GY4="; + }; + + patches = [ + # Drop inheritable cap_sys_nice, to prevent the ambient set from leaking + # from mutter/gnome-shell, see https://github.com/NixOS/nixpkgs/issues/71381 + # ./drop-inheritable.patch + + (substituteAll { + src = ./fix-paths.patch; + inherit zenity; + }) + + # Fix non-deterministic build failure: + # https://gitlab.gnome.org/GNOME/mutter/-/issues/1682 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/mutter/commit/91117bb052ed0d69c8ea4159c1df15c814d90627.patch"; + sha256 = "ek8hEoPP4S2TGOm6SGGOhUVIp4OT68nz0SQzZrceFUU="; + }) + ]; + + mesonFlags = [ + "-Degl_device=true" + "-Dinstalled_tests=false" # TODO: enable these + "-Dwayland_eglstream=true" + "-Dprofiler=true" + "-Dxwayland_path=${xwayland}/bin/Xwayland" + # This should be auto detected, but it looks like it manages a false + # positive. + "-Dxwayland_initfd=disabled" + ]; + + propagatedBuildInputs = [ + # required for pkg-config to detect mutter-clutter + json-glib + libXtst + libcap_ng + graphene + ]; + + nativeBuildInputs = [ + desktop-file-utils + gettext + mesa # needed for gbm + meson + ninja + pkg-config + python3 + wrapGAppsHook + xorgserver # for cvt command + ]; + + buildInputs = [ + cairo + egl-wayland + glib + gnome-desktop + gnome-settings-daemon + gobject-introspection + gsettings-desktop-schemas + gtk3 + libcanberra + libdrm + libgudev + libinput + libstartup_notification + libwacom + libxkbcommon + libxkbfile + libXdamage + pango + pipewire + sysprof + xkeyboard_config + xwayland + wayland-protocols + ]; + + postPatch = '' + patchShebangs src/backends/native/gen-default-modes.py + ''; + + postInstall = '' + ${glib.dev}/bin/glib-compile-schemas "$out/share/glib-2.0/schemas" + ''; + + # Install udev files into our own tree. + PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; + + passthru = { + libdir = "${self}/lib/mutter-7"; + + tests = { + libdirExists = runCommand "mutter-libdir-exists" {} '' + if [[ ! -d ${self.libdir} ]]; then + echo "passthru.libdir should contain a directory, “${self.libdir}” is not one." + exit 1 + fi + touch $out + ''; + }; + + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + }; + }; + + meta = with lib; { + description = "A window manager for GNOME"; + homepage = "https://gitlab.gnome.org/GNOME/mutter"; + license = licenses.gpl2Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +}; +in self diff --git a/pkgs/desktops/gnome/core/mutter/drop-inheritable.patch b/pkgs/desktops/gnome/core/mutter/drop-inheritable.patch new file mode 100644 index 0000000000000..7374e1b86935e --- /dev/null +++ b/pkgs/desktops/gnome/core/mutter/drop-inheritable.patch @@ -0,0 +1,132 @@ +From e9c772e265b2293af031c79f4bbc99b5847dfe3c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= +Date: Sat, 19 Oct 2019 13:26:05 +0200 +Subject: [PATCH] drop inheritable + +Adapted from https://gitlab.gnome.org/GNOME/mutter/commit/c53c47ae123b03cc66044d2b846342123ecb3a01 + +We only want to drop inheritable though, to prevent the ambient set leaking further than gnome-shell. + +--- + config.h.meson | 3 +++ + meson.build | 5 +++++ + meson_options.txt | 6 ++++++ + src/core/main.c | 11 +++++++++++ + src/meson.build | 1 + + 5 files changed, 26 insertions(+) + +diff --git a/config.h.meson b/config.h.meson +index 0bab71848..202fb7ed1 100644 +--- a/config.h.meson ++++ b/config.h.meson +@@ -58,6 +58,9 @@ + /* Xwayland applications allowed to issue keyboard grabs */ + #mesondefine XWAYLAND_GRAB_DEFAULT_ACCESS_RULES + ++/* Defined if libcap-ng is available */ ++#mesondefine HAVE_LIBCAPNG ++ + /* XKB base prefix */ + #mesondefine XKB_BASE + +diff --git a/meson.build b/meson.build +index 3322bd3b1..01c8020fa 100644 +--- a/meson.build ++++ b/meson.build +@@ -35,6 +35,7 @@ libstartup_notification_req = '>= 0.7' + libcanberra_req = '>= 0.26' + libwacom_req = '>= 0.13' + atk_req = '>= 2.5.3' ++libcapng_req = '>= 0.7.9' + + # optional version requirements + udev_req = '>= 228' +@@ -131,6 +131,7 @@ ice_dep = dependency('ice') + atk_dep = dependency('atk', version: atk_req) + libcanberra_dep = dependency('libcanberra', version: libcanberra_req) + dbus_dep = dependency('dbus-1') ++libcapng_dep = dependency('libcap-ng', required: get_option('libcapng')) + + # For now always require X11 support + have_x11 = true +@@ -256,6 +258,7 @@ have_core_tests = false + have_cogl_tests = false + have_clutter_tests = false + have_installed_tests = false ++have_libcapng = libcapng_dep.found() + + if have_tests + have_core_tests = get_option('core_tests') +@@ -361,6 +364,7 @@ cdata.set('HAVE_LIBWACOM', have_libwacom) + cdata.set('HAVE_SM', have_sm) + cdata.set('HAVE_STARTUP_NOTIFICATION', have_startup_notification) + cdata.set('HAVE_INTROSPECTION', have_introspection) ++cdata.set('HAVE_LIBCAPNG', have_libcapng) + cdata.set('HAVE_PROFILER', have_profiler) + + xkb_base = xkeyboard_config_dep.get_pkgconfig_variable('xkb_base') +@@ -465,6 +465,7 @@ output = [ + ' Introspection............ ' + have_introspection.to_string(), + ' Profiler................. ' + have_profiler.to_string(), + ' Xwayland initfd.......... ' + have_xwayland_initfd.to_string(), ++ ' libcap-ng................ ' + have_libcapng.to_string(), + '', + ' Tests:', + '', +diff --git a/meson_options.txt b/meson_options.txt +index 73aa7adde..8bfaacd9a 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -152,3 +152,9 @@ option('xwayland_grab_default_access_rules', + value: 'gnome-boxes,remote-viewer,virt-viewer,virt-manager,vinagre,vncviewer,Xephyr', + description: 'Comma delimited list of applications ressources or class allowed to issue X11 grabs in Xwayland' + ) ++ ++option('libcapng', ++ type: 'feature', ++ value: 'auto', ++ description: 'Enable libcap-ng support' ++) +diff --git a/src/core/main.c b/src/core/main.c +index 7f4f666d2..b27968f13 100644 +--- a/src/core/main.c ++++ b/src/core/main.c +@@ -66,6 +66,10 @@ + #include + #endif + ++#ifdef HAVE_LIBCAPNG ++#include ++#endif ++ + #if defined(HAVE_NATIVE_BACKEND) && defined(HAVE_WAYLAND) + #include + #endif /* HAVE_WAYLAND && HAVE_NATIVE_BACKEND */ +@@ -670,5 +674,12 @@ int + meta_run (void) + { + meta_start (); ++ ++#ifdef HAVE_LIBCAPNG ++ capng_clear(CAPNG_SELECT_BOTH); ++ capng_update(CAPNG_ADD, CAPNG_EFFECTIVE|CAPNG_PERMITTED, CAP_SYS_NICE); ++ capng_apply(CAPNG_SELECT_BOTH); ++#endif ++ + meta_run_main_loop (); + meta_finalize (); +diff --git a/src/meson.build b/src/meson.build +index 90d80734f..a9fffa2c2 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -18,6 +18,7 @@ mutter_pkg_deps = [ + glib_dep, + gsettings_desktop_schemas_dep, + gtk3_dep, ++ libcapng_dep, + pango_dep, + ] + +-- +2.23.0 + diff --git a/pkgs/desktops/gnome/core/mutter/fix-paths.patch b/pkgs/desktops/gnome/core/mutter/fix-paths.patch new file mode 100644 index 0000000000000..6ac0a431f61ff --- /dev/null +++ b/pkgs/desktops/gnome/core/mutter/fix-paths.patch @@ -0,0 +1,13 @@ +diff --git a/src/core/util.c b/src/core/util.c +index 57b73747d..f424cc81c 100644 +--- a/src/core/util.c ++++ b/src/core/util.c +@@ -636,7 +636,7 @@ meta_show_dialog (const char *type, + + args = g_ptr_array_new (); + +- append_argument (args, "zenity"); ++ append_argument (args, "@zenity@/bin/zenity"); + append_argument (args, type); + + if (display) diff --git a/pkgs/desktops/gnome/core/nautilus/default.nix b/pkgs/desktops/gnome/core/nautilus/default.nix new file mode 100644 index 0000000000000..f3ccdbce98cba --- /dev/null +++ b/pkgs/desktops/gnome/core/nautilus/default.nix @@ -0,0 +1,118 @@ +{ lib, stdenv +, fetchurl +, meson +, ninja +, pkg-config +, gettext +, libxml2 +, desktop-file-utils +, python3 +, wrapGAppsHook +, gtk3 +, libhandy +, libportal +, gnome +, gnome-autoar +, glib-networking +, shared-mime-info +, libnotify +, libexif +, libseccomp +, exempi +, librsvg +, tracker +, tracker-miners +, gexiv2 +, libselinux +, gdk-pixbuf +, substituteAll +, gnome-desktop +, gst_all_1 +, gsettings-desktop-schemas +, gobject-introspection +}: + +stdenv.mkDerivation rec { + pname = "nautilus"; + version = "40.1"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0cwxr7bfa19dvzra81s9wfshzv0zv7ycpfffn4amigd0fh0vkkwf"; + }; + + patches = [ + # Allow changing extension directory using environment variable. + ./extension_dir.patch + + # Hardcode required paths. + (substituteAll { + src = ./fix-paths.patch; + inherit tracker; + }) + ]; + + nativeBuildInputs = [ + desktop-file-utils + gettext + gobject-introspection + libxml2 + meson + ninja + pkg-config + python3 + wrapGAppsHook + ]; + + buildInputs = [ + exempi + gexiv2 + glib-networking + gnome-desktop + gnome.adwaita-icon-theme + gsettings-desktop-schemas + gst_all_1.gst-plugins-base + gtk3 + libhandy + libportal + libexif + libnotify + libseccomp + libselinux + shared-mime-info + tracker + tracker-miners + ]; + + propagatedBuildInputs = [ + gnome-autoar + ]; + + preFixup = '' + gappsWrapperArgs+=( + # Thumbnailers + --prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share" + --prefix XDG_DATA_DIRS : "${librsvg}/share" + --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" + ) + ''; + + postPatch = '' + patchShebangs build-aux/meson/postinstall.py + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + }; + }; + + meta = with lib; { + description = "The file manager for GNOME"; + homepage = "https://wiki.gnome.org/Apps/Files"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.gnome.members; + }; +} diff --git a/pkgs/desktops/gnome/core/nautilus/extension_dir.patch b/pkgs/desktops/gnome/core/nautilus/extension_dir.patch new file mode 100644 index 0000000000000..e1313999675d0 --- /dev/null +++ b/pkgs/desktops/gnome/core/nautilus/extension_dir.patch @@ -0,0 +1,24 @@ +diff --git a/src/nautilus-module.c b/src/nautilus-module.c +index 6273a76..4adcc8a 100644 +--- a/src/nautilus-module.c ++++ b/src/nautilus-module.c +@@ -242,11 +242,17 @@ void + nautilus_module_setup (void) + { + static gboolean initialized = FALSE; ++ const gchar* extensiondir = NULL; + + if (!initialized) + { + initialized = TRUE; + +- load_module_dir (NAUTILUS_EXTENSIONDIR); ++ extensiondir = g_getenv ("NAUTILUS_EXTENSION_DIR"); ++ if (extensiondir == NULL) { ++ extensiondir = NAUTILUS_EXTENSIONDIR; ++ } ++ ++ load_module_dir (extensiondir); + + eel_debug_call_at_shutdown (free_module_objects); + } diff --git a/pkgs/desktops/gnome/core/nautilus/fix-paths.patch b/pkgs/desktops/gnome/core/nautilus/fix-paths.patch new file mode 100644 index 0000000000000..dc9874359b233 --- /dev/null +++ b/pkgs/desktops/gnome/core/nautilus/fix-paths.patch @@ -0,0 +1,13 @@ +diff --git a/src/nautilus-tag-manager.c b/src/nautilus-tag-manager.c +index 28b96c996..0b1fad9ab 100644 +--- a/src/nautilus-tag-manager.c ++++ b/src/nautilus-tag-manager.c +@@ -962,7 +962,7 @@ child_watch_cb (GPid pid, + static void + export_tracker2_data (NautilusTagManager *self) + { +- gchar *argv[] = {"tracker3", "export", "--2to3", "files-starred", "--keyfile", NULL}; ++ gchar *argv[] = {"@tracker@/bin/tracker3", "export", "--2to3", "files-starred", "--keyfile", NULL}; + gint stdout_fd; + GPid child_pid; + g_autoptr (GError) error = NULL; diff --git a/pkgs/desktops/gnome/core/rygel/add-option-for-installation-sysconfdir.patch b/pkgs/desktops/gnome/core/rygel/add-option-for-installation-sysconfdir.patch new file mode 100644 index 0000000000000..6fe651b9cbb47 --- /dev/null +++ b/pkgs/desktops/gnome/core/rygel/add-option-for-installation-sysconfdir.patch @@ -0,0 +1,38 @@ +diff --git a/meson.build b/meson.build +index 4aa683d6..a930d533 100644 +--- a/meson.build ++++ b/meson.build +@@ -20,7 +20,11 @@ if not get_option('uninstalled') + rygel_datadir = join_paths(get_option('prefix'), get_option('datadir'), 'rygel') + rygel_libexecdir = join_paths(get_option('prefix'), get_option('libexecdir'), + 'rygel') +- rygel_sysconfdir = join_paths(get_option('prefix'), get_option('sysconfdir')) ++ if get_option('sysconfdir_install') != '' ++ rygel_sysconfdir = join_paths(get_option('prefix'), get_option('sysconfdir_install')) ++ else ++ rygel_sysconfdir = join_paths(get_option('prefix'), get_option('sysconfdir')) ++ endif + rygel_plugindir = join_paths(rygel_libdir, 'rygel-2.6', 'plugins') + rygel_enginedir = join_paths(rygel_libdir, 'rygel-2.6', 'engines') + rygel_presetdir = join_paths(rygel_datadir, 'presets') +@@ -55,7 +59,7 @@ conf.set_quoted('DATA_DIR', rygel_datadir) + conf.set_quoted('PLUGIN_DIR', rygel_plugindir) + conf.set_quoted('BIG_ICON_DIR', rygel_bigicondir) + conf.set_quoted('SMALL_ICON_DIR', rygel_smallicondir) +-conf.set_quoted('SYS_CONFIG_DIR', rygel_sysconfdir) ++conf.set_quoted('SYS_CONFIG_DIR', get_option('sysconfdir')) + conf.set_quoted('LOCALEDIR', join_paths(get_option('prefix'), get_option('localedir'))) + conf.set_quoted('MX_EXTRACT_PATH', join_paths(rygel_libexecdir, 'mx-extract')) + conf.set_quoted('DESKTOP_DIR', join_paths(get_option('prefix'), get_option('datadir'), 'applications')) +diff --git a/meson_options.txt b/meson_options.txt +index cb604c4e..1b049b77 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,6 +1,7 @@ + option('uninstalled', type: 'boolean', value: 'false', description: 'Run Rygel from build directory only') + option('api-docs', type: 'boolean', value: 'false', description: 'Build the API documentation') + option('systemd-user-units-dir', type : 'string', value : 'auto', description : 'Where to install the systemd user unit (use special values "auto" or "none", or pass a path') ++option('sysconfdir_install', type: 'string', value: '', description: 'sysconfdir to use during installation') + option('plugins', type : 'array', choices : ['external', 'gst-launch', 'lms', 'media-export', 'mpris', 'playbin', 'ruih', 'tracker', 'tracker3']) + option('engines', type : 'array', choices : ['simple', 'gstreamer']) + option('examples', type : 'boolean', value : 'true') diff --git a/pkgs/desktops/gnome/core/rygel/default.nix b/pkgs/desktops/gnome/core/rygel/default.nix new file mode 100644 index 0000000000000..f43df23f44a1d --- /dev/null +++ b/pkgs/desktops/gnome/core/rygel/default.nix @@ -0,0 +1,110 @@ +{ lib, stdenv +, fetchurl +, meson +, ninja +, pkg-config +, vala +, gettext +, libxml2 +, gobject-introspection +, wrapGAppsHook +, python3 +, glib +, gssdp +, gupnp +, gupnp-av +, gupnp-dlna +, gst_all_1 +, libgee +, libsoup +, gtk3 +, libmediaart +, sqlite +, systemd +, tracker +, shared-mime-info +, gnome +}: + +stdenv.mkDerivation rec { + pname = "rygel"; + version = "0.40.1"; + + # TODO: split out lib + outputs = [ "out" "dev" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "QkDXd1mcjNCeZ9pEzLOV0KbceEedgJzWIZgixbVooy0="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + gettext + libxml2 + gobject-introspection + wrapGAppsHook + python3 + ]; + + buildInputs = [ + glib + gssdp + gupnp + gupnp-av + gupnp-dlna + libgee + libsoup + gtk3 + libmediaart + sqlite + systemd + tracker + shared-mime-info + ] ++ (with gst_all_1; [ + gstreamer + gst-editing-services + gst-plugins-base + gst-plugins-good + gst-plugins-bad + gst-plugins-ugly + ]); + + mesonFlags = [ + "-Dsystemd-user-units-dir=${placeholder "out"}/lib/systemd/user" + "-Dapi-docs=false" + "--sysconfdir=/etc" + "-Dsysconfdir_install=${placeholder "out"}/etc" + # Build all plug-ins except for tracker 2 + "-Dplugins=external,gst-launch,lms,media-export,mpris,playbin,ruih,tracker3" + ]; + + doCheck = true; + + patches = [ + ./add-option-for-installation-sysconfdir.patch + ]; + + postPatch = '' + patchShebangs data/xml/process-xml.py + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + versionPolicy = "odd-unstable"; + }; + }; + + meta = with lib; { + description = "A home media solution (UPnP AV MediaServer) that allows you to easily share audio, video and pictures to other devices"; + homepage = "https://wiki.gnome.org/Projects/Rygel"; + license = licenses.lgpl21Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/core/simple-scan/default.nix b/pkgs/desktops/gnome/core/simple-scan/default.nix new file mode 100644 index 0000000000000..91ac4f14b22af --- /dev/null +++ b/pkgs/desktops/gnome/core/simple-scan/default.nix @@ -0,0 +1,89 @@ +{ lib, stdenv +, fetchurl +, meson +, ninja +, pkg-config +, gettext +, itstool +, python3 +, wrapGAppsHook +, cairo +, gdk-pixbuf +, colord +, glib +, gtk3 +, gusb +, packagekit +, libhandy +, libwebp +, libxml2 +, sane-backends +, vala +, gnome +, gobject-introspection +}: + +stdenv.mkDerivation rec { + pname = "simple-scan"; + version = "40.0"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-E4EbsqhhnmOkP8Lva3E1ny1cQITG1cizqtYXJLIHUa8="; + }; + + nativeBuildInputs = [ + meson + ninja + gettext + itstool + pkg-config + python3 + wrapGAppsHook + libxml2 + gobject-introspection # For setup hook + ]; + + buildInputs = [ + cairo + gdk-pixbuf + colord + glib + gnome.adwaita-icon-theme + gusb + gtk3 + libhandy + libwebp + packagekit + sane-backends + vala + ]; + + postPatch = '' + patchShebangs data/meson_compile_gschema.py + ''; + + doCheck = true; + + passthru = { + updateScript = gnome.updateScript { + packageName = "simple-scan"; + }; + }; + + meta = with lib; { + description = "Simple scanning utility"; + longDescription = '' + A really easy way to scan both documents and photos. You can crop out the + bad parts of a photo and rotate it if it is the wrong way round. You can + print your scans, export them to pdf, or save them in a range of image + formats. Basically a frontend for SANE - which is the same backend as + XSANE uses. This means that all existing scanners will work and the + interface is well tested. + ''; + homepage = "https://gitlab.gnome.org/GNOME/simple-scan"; + license = licenses.gpl3Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/core/sushi/default.nix b/pkgs/desktops/gnome/core/sushi/default.nix new file mode 100644 index 0000000000000..c42b6964bf65f --- /dev/null +++ b/pkgs/desktops/gnome/core/sushi/default.nix @@ -0,0 +1,83 @@ +{ lib, stdenv +, fetchurl +, pkg-config +, meson +, gettext +, gobject-introspection +, glib +, gnome +, gtksourceview4 +, gjs +, webkitgtk +, libmusicbrainz5 +, icu +, wrapGAppsHook +, gst_all_1 +, gdk-pixbuf +, librsvg +, gtk3 +, harfbuzz +, ninja +, epoxy +}: + +stdenv.mkDerivation rec { + pname = "sushi"; + version = "3.38.0"; + + src = fetchurl { + url = "mirror://gnome/sources/sushi/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0vlqqk916dymv4asbyvalp1m096a5hh99nx23i4xavzvgygh4h2h"; + }; + + nativeBuildInputs = [ + pkg-config + meson + ninja + gettext + gobject-introspection + wrapGAppsHook + ]; + + buildInputs = [ + glib + gtk3 + gnome.evince + icu + harfbuzz + gjs + gtksourceview4 + gdk-pixbuf + librsvg + libmusicbrainz5 + webkitgtk + epoxy + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + ]; + + # See https://github.com/NixOS/nixpkgs/issues/31168 + postInstall = '' + for file in $out/libexec/org.gnome.NautilusPreviewer + do + sed -e $"2iimports.package._findEffectiveEntryPointName = () => \'$(basename $file)\' " \ + -i $file + done + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = "sushi"; + attrPath = "gnome.sushi"; + }; + }; + + meta = with lib; { + homepage = "https://en.wikipedia.org/wiki/Sushi_(software)"; + description = "A quick previewer for Nautilus"; + maintainers = teams.gnome.members; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/core/totem/default.nix b/pkgs/desktops/gnome/core/totem/default.nix new file mode 100644 index 0000000000000..f7541fe12edf2 --- /dev/null +++ b/pkgs/desktops/gnome/core/totem/default.nix @@ -0,0 +1,123 @@ +{ lib, stdenv +, fetchurl +, meson +, ninja +, gettext +, gst_all_1 +, clutter-gtk +, clutter-gst +, python3Packages +, shared-mime-info +, pkg-config +, gtk3 +, glib +, gobject-introspection +, totem-pl-parser +, wrapGAppsHook +, itstool +, libxml2 +, vala +, gnome +, grilo +, grilo-plugins +, libpeas +, adwaita-icon-theme +, gnome-desktop +, gsettings-desktop-schemas +, gdk-pixbuf +, xvfb_run +}: + +stdenv.mkDerivation rec { + pname = "totem"; + version = "3.38.0"; + + src = fetchurl { + url = "mirror://gnome/sources/totem/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0bs33ijvxbr2prb9yj4dxglsszslsn9k258n311sld84masz4ad8"; + }; + + nativeBuildInputs = [ + meson + ninja + vala + pkg-config + gettext + python3Packages.python + itstool + gobject-introspection + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + glib + grilo + clutter-gtk + clutter-gst + totem-pl-parser + grilo-plugins + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly + gst_all_1.gst-libav + libpeas + shared-mime-info + gdk-pixbuf + libxml2 + adwaita-icon-theme + gnome-desktop + gsettings-desktop-schemas + # for plug-ins + python3Packages.pygobject3 + python3Packages.dbus-python + ]; + + checkInputs = [ + xvfb_run + ]; + + mesonFlags = [ + # TODO: https://github.com/NixOS/nixpkgs/issues/36468 + "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" + ]; + + # Tests do not work with GStreamer 1.18. + # https://gitlab.gnome.org/GNOME/totem/-/issues/450 + doCheck = false; + + postPatch = '' + chmod +x meson_compile_python.py meson_post_install.py # patchShebangs requires executable file + patchShebangs \ + ./meson_compile_python.py \ + ./meson_post_install.py + ''; + + checkPhase = '' + runHook preCheck + + xvfb-run -s '-screen 0 800x600x24' \ + ninja test + + runHook postCheck + ''; + + wrapPrefixVariables = [ "PYTHONPATH" ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = "totem"; + attrPath = "gnome.totem"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Videos"; + description = "Movie player for the GNOME desktop based on GStreamer"; + maintainers = teams.gnome.members; + license = licenses.gpl2Plus; # with exception to allow use of non-GPL compatible plug-ins + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/core/yelp-xsl/default.nix b/pkgs/desktops/gnome/core/yelp-xsl/default.nix new file mode 100644 index 0000000000000..7c9b4eb839c03 --- /dev/null +++ b/pkgs/desktops/gnome/core/yelp-xsl/default.nix @@ -0,0 +1,52 @@ +{ lib, stdenv +, gettext +, fetchurl +, pkg-config +, itstool +, libxml2 +, libxslt +, gnome +}: + +stdenv.mkDerivation rec { + pname = "yelp-xsl"; + version = "40.0"; + + src = fetchurl { + url = "mirror://gnome/sources/yelp-xsl/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-Nh7NTTP8zbO7CKaH9g5cPpCdLp47Ai2ETgSYINDPYrA="; + }; + + nativeBuildInputs = [ + pkg-config + gettext + itstool + libxml2 + libxslt + ]; + + doCheck = true; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Yelp"; + description = "Yelp's universal stylesheets for Mallard and DocBook"; + maintainers = teams.gnome.members; + license = with licenses; [ + # See https://gitlab.gnome.org/GNOME/yelp-xsl/blob/master/COPYING + # Stylesheets + lgpl2Plus + # Icons, unclear: https://gitlab.gnome.org/GNOME/yelp-xsl/issues/25 + gpl2 + # highlight.js + bsd3 + ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/desktops/gnome/core/yelp/default.nix b/pkgs/desktops/gnome/core/yelp/default.nix new file mode 100644 index 0000000000000..f4df80f5611f3 --- /dev/null +++ b/pkgs/desktops/gnome/core/yelp/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, gettext, fetchurl, webkitgtk, pkg-config, gtk3, glib +, gnome, sqlite +, itstool, libxml2, libxslt, gst_all_1 +, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "yelp"; + version = "40.0"; + + src = fetchurl { + url = "mirror://gnome/sources/yelp/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-B3dfoGzSg2Xs2Cm7FqhaaCiXqyHYzONFlrvvXNRVquA="; + }; + + nativeBuildInputs = [ pkg-config gettext itstool wrapGAppsHook ]; + buildInputs = [ + gtk3 glib webkitgtk sqlite + libxml2 libxslt gnome.yelp-xsl + gnome.adwaita-icon-theme + gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = "yelp"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Yelp"; + description = "The help viewer in Gnome"; + maintainers = teams.gnome.members; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/core/zenity/default.nix b/pkgs/desktops/gnome/core/zenity/default.nix new file mode 100644 index 0000000000000..51ad81a77a469 --- /dev/null +++ b/pkgs/desktops/gnome/core/zenity/default.nix @@ -0,0 +1,50 @@ +{ lib, stdenv +, fetchurl +, pkg-config +, libxml2 +, gnome +, gtk3 +, yelp-tools +, gettext +, libX11 +, itstool +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "zenity"; + version = "3.32.0"; + + src = fetchurl { + url = "mirror://gnome/sources/zenity/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "15fdh8xfdhnwcynyh4byx3mrjxbyprqnwxzi7qn3g5wwaqryg1p7"; + }; + + nativeBuildInputs = [ + pkg-config + gettext + yelp-tools + itstool + libxml2 + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + libX11 + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = "zenity"; + attrPath = "gnome.zenity"; + }; + }; + + meta = with lib; { + description = "Tool to display dialogs from the commandline and shell scripts"; + homepage = "https://wiki.gnome.org/Projects/Zenity"; + platforms = platforms.linux; + maintainers = teams.gnome.members; + }; +} diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix new file mode 100644 index 0000000000000..b529a65026d71 --- /dev/null +++ b/pkgs/desktops/gnome/default.nix @@ -0,0 +1,366 @@ +{ config, pkgs, lib }: + +lib.makeScope pkgs.newScope (self: with self; { + updateScript = callPackage ./update.nix { }; + + /* Remove packages of packagesToRemove from packages, based on their names + + Type: + removePackagesByName :: [package] -> [package] -> [package] + + Example: + removePackagesByName [ nautilus file-roller ] [ file-roller totem ] + => [ nautilus ] + */ + removePackagesByName = packages: packagesToRemove: + let + namesToRemove = map lib.getName packagesToRemove; + in + lib.filter (x: !(builtins.elem (lib.getName x) namesToRemove)) packages; + + libsoup = pkgs.libsoup.override { gnomeSupport = true; }; + libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; + +# ISO installer +# installerIso = callPackage ./installer.nix {}; + +#### Core (http://ftp.acc.umu.se/pub/GNOME/core/) + + adwaita-icon-theme = callPackage ./core/adwaita-icon-theme { }; + + baobab = callPackage ./core/baobab { }; + + caribou = callPackage ./core/caribou { }; + + dconf-editor = callPackage ./core/dconf-editor { }; + + empathy = callPackage ./core/empathy { }; + + epiphany = callPackage ./core/epiphany { }; + + evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests + + evolution-data-server = callPackage ./core/evolution-data-server { }; + + gdm = callPackage ./core/gdm { }; + + gnome-backgrounds = callPackage ./core/gnome-backgrounds { }; + + gnome-bluetooth = callPackage ./core/gnome-bluetooth { }; + + gnome-color-manager = callPackage ./core/gnome-color-manager { }; + + gnome-contacts = callPackage ./core/gnome-contacts { }; + + gnome-control-center = callPackage ./core/gnome-control-center { }; + + gnome-calculator = callPackage ./core/gnome-calculator { }; + + gnome-common = callPackage ./core/gnome-common { }; + + gnome-desktop = callPackage ./core/gnome-desktop { }; + + gnome-dictionary = callPackage ./core/gnome-dictionary { }; + + gnome-disk-utility = callPackage ./core/gnome-disk-utility { }; + + gnome-font-viewer = callPackage ./core/gnome-font-viewer { }; + + gnome-keyring = callPackage ./core/gnome-keyring { }; + + libgnome-keyring = callPackage ./core/libgnome-keyring { }; + + gnome-initial-setup = callPackage ./core/gnome-initial-setup { }; + + gnome-online-miners = callPackage ./core/gnome-online-miners { }; + + gnome-remote-desktop = callPackage ./core/gnome-remote-desktop { }; + + gnome-session = callPackage ./core/gnome-session { }; + + gnome-session-ctl = callPackage ./core/gnome-session/ctl.nix { }; + + gnome-shell = callPackage ./core/gnome-shell { }; + + gnome-shell-extensions = callPackage ./core/gnome-shell-extensions { }; + + gnome-screenshot = callPackage ./core/gnome-screenshot { }; + + gnome-settings-daemon = callPackage ./core/gnome-settings-daemon { }; + + gnome-software = callPackage ./core/gnome-software { }; + + gnome-system-monitor = callPackage ./core/gnome-system-monitor { }; + + gnome-terminal = callPackage ./core/gnome-terminal { }; + + gnome-themes-extra = callPackage ./core/gnome-themes-extra { }; + + gnome-user-share = callPackage ./core/gnome-user-share { }; + + gucharmap = callPackage ./core/gucharmap { }; + + gvfs = pkgs.gvfs.override { gnomeSupport = true; }; + + eog = callPackage ./core/eog { }; + + mutter = callPackage ./core/mutter { }; + + # Needed for elementary's gala and greeter until 3.36 support has more bugfixes + # https://github.com/elementary/gala/issues/763 + mutter334 = callPackage ./core/mutter/3.34 { }; + + nautilus = callPackage ./core/nautilus { }; + + networkmanager-openvpn = pkgs.networkmanager-openvpn.override { + withGnome = true; + }; + + networkmanager-vpnc = pkgs.networkmanager-vpnc.override { + withGnome = true; + }; + + networkmanager-openconnect = pkgs.networkmanager-openconnect.override { + withGnome = true; + }; + + networkmanager-fortisslvpn = pkgs.networkmanager-fortisslvpn.override { + withGnome = true; + }; + + networkmanager-l2tp = pkgs.networkmanager-l2tp.override { + withGnome = true; + }; + + networkmanager-iodine = pkgs.networkmanager-iodine.override { + withGnome = true; + }; + + rygel = callPackage ./core/rygel { }; + + simple-scan = callPackage ./core/simple-scan { }; + + sushi = callPackage ./core/sushi { }; + + totem = callPackage ./core/totem { }; + + yelp = callPackage ./core/yelp { }; + + yelp-xsl = callPackage ./core/yelp-xsl { }; + + zenity = callPackage ./core/zenity { }; + + +#### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/) + + accerciser = callPackage ./apps/accerciser { }; + + cheese = callPackage ./apps/cheese { }; + + file-roller = callPackage ./apps/file-roller { }; + + gedit = callPackage ./apps/gedit { }; + + ghex = callPackage ./apps/ghex { }; + + gnome-books = callPackage ./apps/gnome-books { }; + + gnome-boxes = callPackage ./apps/gnome-boxes { }; + + gnome-calendar = callPackage ./apps/gnome-calendar { }; + + gnome-characters = callPackage ./apps/gnome-characters { }; + + gnome-clocks = callPackage ./apps/gnome-clocks { }; + + gnome-documents = callPackage ./apps/gnome-documents { }; + + gnome-logs = callPackage ./apps/gnome-logs { }; + + gnome-maps = callPackage ./apps/gnome-maps { }; + + gnome-music = callPackage ./apps/gnome-music { }; + + gnome-nettool = callPackage ./apps/gnome-nettool { }; + + gnome-notes = callPackage ./apps/gnome-notes { }; + + gnome-power-manager = callPackage ./apps/gnome-power-manager { }; + + gnome-sound-recorder = callPackage ./apps/gnome-sound-recorder { }; + + gnome-todo = callPackage ./apps/gnome-todo {}; + + gnome-weather = callPackage ./apps/gnome-weather { }; + + polari = callPackage ./apps/polari { }; + + seahorse = callPackage ./apps/seahorse { }; + + vinagre = callPackage ./apps/vinagre { }; + +#### Dev http://ftp.gnome.org/pub/GNOME/devtools/ + + anjuta = callPackage ./devtools/anjuta { }; + + devhelp = callPackage ./devtools/devhelp { }; + + gnome-devel-docs = callPackage ./devtools/gnome-devel-docs { }; + +#### Games + + aisleriot = callPackage ./games/aisleriot { }; + + atomix = callPackage ./games/atomix { }; + + five-or-more = callPackage ./games/five-or-more { }; + + four-in-a-row = callPackage ./games/four-in-a-row { }; + + gnome-chess = callPackage ./games/gnome-chess { }; + + gnome-klotski = callPackage ./games/gnome-klotski { }; + + gnome-mahjongg = callPackage ./games/gnome-mahjongg { }; + + gnome-mines = callPackage ./games/gnome-mines { }; + + gnome-nibbles = callPackage ./games/gnome-nibbles { }; + + gnome-robots = callPackage ./games/gnome-robots { }; + + gnome-sudoku = callPackage ./games/gnome-sudoku { }; + + gnome-taquin = callPackage ./games/gnome-taquin { }; + + gnome-tetravex = callPackage ./games/gnome-tetravex { }; + + hitori = callPackage ./games/hitori { }; + + iagno = callPackage ./games/iagno { }; + + lightsoff = callPackage ./games/lightsoff { }; + + swell-foop = callPackage ./games/swell-foop { }; + + tali = callPackage ./games/tali { }; + + quadrapassel = callPackage ./games/quadrapassel { }; + +#### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/ + + geary = callPackage ./misc/geary { }; + + gitg = callPackage ./misc/gitg { }; + + libgnome-games-support = callPackage ./misc/libgnome-games-support { }; + + gnome-applets = callPackage ./misc/gnome-applets { }; + + gnome-flashback = callPackage ./misc/gnome-flashback { }; + + gnome-panel = callPackage ./misc/gnome-panel { + autoreconfHook = pkgs.autoreconfHook269; + }; + + gnome-tweaks = callPackage ./misc/gnome-tweaks { }; + + gpaste = callPackage ./misc/gpaste { }; + + metacity = callPackage ./misc/metacity { }; + + nautilus-python = callPackage ./misc/nautilus-python { }; + + gtkhtml = callPackage ./misc/gtkhtml { enchant = pkgs.enchant1; }; + + pomodoro = callPackage ./misc/pomodoro { }; + + gnome-autoar = callPackage ./misc/gnome-autoar { }; + + gnome-packagekit = callPackage ./misc/gnome-packagekit { }; +} // lib.optionalAttrs (config.allowAliases or true) { +#### Legacy aliases + + bijiben = gnome-notes; # added 2018-09-26 + evolution_data_server = evolution-data-server; # added 2018-02-25 + geocode_glib = pkgs.geocode-glib; # added 2018-02-25 + glib_networking = pkgs.glib-networking; # added 2018-02-25 + gnome_common = gnome-common; # added 2018-02-25 + gnome_control_center = gnome-control-center; # added 2018-02-25 + gnome_desktop = gnome-desktop; # added 2018-02-25 + gnome_keyring = gnome-keyring; # added 2018-02-25 + gnome_online_accounts = gnome-online-accounts; # added 2018-02-25 + gnome_session = gnome-session; # added 2018-02-25 + gnome_settings_daemon = gnome-settings-daemon; # added 2018-02-25 + gnome_shell = gnome-shell; # added 2018-02-25 + gnome_terminal = gnome-terminal; # added 2018-02-25 + gnome-themes-standard = gnome-themes-extra; # added 2018-03-14 + gnome_themes_standard = gnome-themes-standard; # added 2018-02-25 + gnome-tweak-tool = gnome-tweaks; # added 2018-03-21 + gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25 + libgames-support = libgnome-games-support; # added 2018-03-14 + libgnome_keyring = libgnome-keyring; # added 2018-02-25 + inherit (pkgs) rarian; # added 2018-04-25 + networkmanager_fortisslvpn = networkmanager-fortisslvpn; # added 2018-02-25 + networkmanager_iodine = networkmanager-iodine; # added 2018-02-25 + networkmanager_l2tp = networkmanager-l2tp; # added 2018-02-25 + networkmanager_openconnect = networkmanager-openconnect; # added 2018-02-25 + networkmanager_openvpn = networkmanager-openvpn; # added 2018-02-25 + networkmanager_vpnc = networkmanager-vpnc; # added 2018-02-25 + yelp_xsl = yelp-xsl; # added 2018-02-25 + yelp_tools = yelp-tools; # added 2018-02-25 + + # added 2019-02-08 + inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3 + libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4 + easytag meld orca rhythmbox shotwell gnome-usage + clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 gnome-menus gdl; + inherit (pkgs) gsettings-desktop-schemas; # added 2019-04-16 + inherit (pkgs) gnome-video-effects; # added 2019-08-19 + inherit (pkgs) gnome-online-accounts grilo grilo-plugins tracker tracker-miners gnome-photos; # added 2019-08-23 + inherit (pkgs) glib-networking; # added 2019-09-02 + inherit (pkgs) nemiver; # added 2019-09-09 + + defaultIconTheme = adwaita-icon-theme; + gtk = gtk3; + gtkmm = gtkmm3; + rest = librest; + + pidgin-im-gnome-shell-extension = pkgs.gnomeExtensions.pidgin-im-integration; # added 2019-08-01 + + # added 2019-08-25 + corePackages = throw "gnome.corePackages is removed since 2019-08-25: please use `services.gnome.core-shell.enable`"; + optionalPackages = throw "gnome.optionalPackages is removed since 2019-08-25: please use `services.gnome.core-utilities.enable`"; + gamesPackages = throw "gnome.gamesPackages is removed since 2019-08-25: please use `services.gnome.games.enable`"; + + nautilus-sendto = throw "nautilus-sendto is removed since 2019-09-17: abandoned upstream"; + + inherit (pkgs) vala; # added 2019-10-10 + + inherit (pkgs) gnome-user-docs; # added 2019-11-20 + + inherit (pkgs) gegl_0_4; # added 2019-10-31 + + inherit (pkgs) gjs; # added 2019-01-05 + + inherit (pkgs) yelp-tools; # added 2019-11-20 + + inherit (pkgs) dconf; # added 2019-11-30 + + inherit (pkgs) networkmanagerapplet; # added 2019-12-12 + + inherit (pkgs) glade; # added 2020-05-15 + + vino = throw "vino is deprecated, use gnome-remote-desktop instead."; # added 2020-03-13 + + gnome-screensaver = throw "gnome-screensaver is deprecated. If you are using GNOME Flashback, it now has a built-in lock screen. If you are using it elsewhere, you can try xscreenlock or other alternatives."; # added 2020-03-19 + + maintainers = lib.teams.gnome.members; + + mutter328 = throw "Removed as Pantheon is upgraded to mutter334."; + + gnome-getting-started-docs = throw "Removed in favour of gnome-tour."; + + # Added 2021-05-07 + gnome3 = self // { recurseForDerivations = false; }; +}) diff --git a/pkgs/desktops/gnome/devtools/anjuta/default.nix b/pkgs/desktops/gnome/devtools/anjuta/default.nix new file mode 100644 index 0000000000000..5b841557b6b20 --- /dev/null +++ b/pkgs/desktops/gnome/devtools/anjuta/default.nix @@ -0,0 +1,44 @@ +{ lib, stdenv, fetchurl, pkg-config, gnome, gtk3, gjs, flex, bison, libxml2, intltool, + gdl, libgda, gtksourceview, gsettings-desktop-schemas, + itstool, python3, ncurses, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "anjuta"; + version = "3.34.0"; + + src = fetchurl { + url = "mirror://gnome/sources/anjuta/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "13ql7axw6zz387s7pa1m7wmh7qps3x7fk53h9832vq1yxlq33aa2"; + }; + + passthru = { + updateScript = gnome.updateScript { packageName = "anjuta"; attrPath = "gnome.anjuta"; }; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ + pkg-config intltool itstool python3 makeWrapper + # Required by python3 + ncurses + ]; + buildInputs = [ + flex bison gtk3 libxml2 gjs gdl + libgda gtksourceview + gsettings-desktop-schemas + ]; + + preFixup = '' + wrapProgram $out/bin/anjuta \ + --prefix XDG_DATA_DIRS : \ + "$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with lib; { + description = "Software development studio"; + homepage = "http://anjuta.org/"; + license = licenses.gpl2; + maintainers = with maintainers; []; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/devtools/devhelp/default.nix b/pkgs/desktops/gnome/devtools/devhelp/default.nix new file mode 100644 index 0000000000000..46491cffc5f68 --- /dev/null +++ b/pkgs/desktops/gnome/devtools/devhelp/default.nix @@ -0,0 +1,80 @@ +{ lib, stdenv +, fetchurl +, meson +, ninja +, pkg-config +, gnome +, gtk3 +, wrapGAppsHook +, glib +, amtk +, appstream-glib +, gobject-introspection +, python3 +, webkitgtk +, gettext +, itstool +, gsettings-desktop-schemas +, shared-mime-info +}: + +stdenv.mkDerivation rec { + pname = "devhelp"; + version = "40.0"; + + src = fetchurl { + url = "mirror://gnome/sources/devhelp/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0zr64qp5c6jcc3x5hmfp7jhzpi96qwr6xplyfkmz4kjzvr9xidjd"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + itstool + wrapGAppsHook + appstream-glib + gobject-introspection + python3 + ]; + + buildInputs = [ + glib + gtk3 + webkitgtk + amtk + gnome.adwaita-icon-theme + gsettings-desktop-schemas + ]; + + doCheck = true; + + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + ''; + + preFixup = '' + gappsWrapperArgs+=( + # Fix pages being blank + # https://gitlab.gnome.org/GNOME/devhelp/issues/14 + --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" + ) + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = "devhelp"; + attrPath = "gnome.devhelp"; + }; + }; + + meta = with lib; { + description = "API documentation browser for GNOME"; + homepage = "https://wiki.gnome.org/Apps/Devhelp"; + license = licenses.gpl3Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome/devtools/gnome-devel-docs/default.nix new file mode 100644 index 0000000000000..501aaa91c978f --- /dev/null +++ b/pkgs/desktops/gnome/devtools/gnome-devel-docs/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchurl, gnome, intltool, itstool, libxml2 }: + +stdenv.mkDerivation rec { + pname = "gnome-devel-docs"; + version = "40.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-devel-docs/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0zqp01ks8m3s6jn5xqd05rw4fwbvxy5qvcfg9g50b2ar2j7v1ar8"; + }; + + passthru = { + updateScript = gnome.updateScript { packageName = "gnome-devel-docs"; attrPath = "gnome.gnome-devel-docs"; }; + }; + + buildInputs = [ intltool itstool libxml2 ]; + + meta = with lib; { + homepage = "https://github.com/GNOME/gnome-devel-docs"; + description = "Developer documentation for GNOME"; + maintainers = teams.gnome.members; + license = licenses.fdl12; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix b/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix new file mode 100644 index 0000000000000..57d78bf756abb --- /dev/null +++ b/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix @@ -0,0 +1,38 @@ +{ lib, stdenv, fetchFromGitHub, substituteAll, glib, gnome, gettext }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-EasyScreenCast"; + version = "unstable-2020-11-25"; + + src = fetchFromGitHub { + # To make it work with gnome 3.38, using effectively: https://github.com/EasyScreenCast/EasyScreenCast/pull/276 + owner = "Ian2020"; + repo = "EasyScreenCast"; + rev = "b1ab4a999bc7110ecbf68b5fe42c37fa67d7cb0d"; + sha256 = "s9b0ITKUzgG6XOd1bK7i3mGxfc+T+UHrTZhBp0Ff8zQ="; + }; + + patches = [ + (substituteAll { + src = ./fix-gi-path.patch; + gnomeShell = gnome.gnome-shell; + }) + ]; + + nativeBuildInputs = [ + glib gettext + ]; + + makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ]; + + uuid = "EasyScreenCast@iacopodeenosee.gmail.com"; + + meta = with lib; { + description = "Simplifies the use of the video recording function integrated in gnome shell"; + homepage = "https://github.com/EasyScreenCast/EasyScreenCast"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ doronbehar ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/desktops/gnome/extensions/EasyScreenCast/fix-gi-path.patch b/pkgs/desktops/gnome/extensions/EasyScreenCast/fix-gi-path.patch new file mode 100644 index 0000000000000..2d32021b6c665 --- /dev/null +++ b/pkgs/desktops/gnome/extensions/EasyScreenCast/fix-gi-path.patch @@ -0,0 +1,16 @@ +diff --git i/utilaudio.js w/utilaudio.js +index 983b29c..7a94de8 100644 +--- i/utilaudio.js ++++ w/utilaudio.js +@@ -11,10 +11,7 @@ + */ + + const GIRepository = imports.gi.GIRepository; +-GIRepository.Repository.prepend_search_path("/usr/lib/gnome-shell"); +-GIRepository.Repository.prepend_library_path("/usr/lib/gnome-shell"); +-GIRepository.Repository.prepend_search_path("/usr/lib64/gnome-shell"); +-GIRepository.Repository.prepend_library_path("/usr/lib64/gnome-shell"); ++GIRepository.Repository.prepend_search_path("@gnomeShell@/lib/gnome-shell"); + const Gvc = imports.gi.Gvc; + const Lang = imports.lang; + diff --git a/pkgs/desktops/gnome/extensions/appindicator/default.nix b/pkgs/desktops/gnome/extensions/appindicator/default.nix new file mode 100644 index 0000000000000..0906d76295632 --- /dev/null +++ b/pkgs/desktops/gnome/extensions/appindicator/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, fetchFromGitHub, gnome }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-appindicator"; + version = "36"; + + src = fetchFromGitHub { + owner = "Ubuntu"; + repo = "gnome-shell-extension-appindicator"; + rev = "v${version}"; + sha256 = "1nx1lgrrp3w5z5hymb91frjdvdkk7x677my5v4jjd330ihqa02dq"; + }; + + # This package has a Makefile, but it's used for building a zip for + # publication to extensions.gnome.org. Disable the build phase so + # installing doesn't build an unnecessary release. + dontBuild = true; + + uuid = "appindicatorsupport@rgcjonas.gmail.com"; + installPhase = '' + runHook preInstall + mkdir -p $out/share/gnome-shell/extensions/${uuid} + cp *.js $out/share/gnome-shell/extensions/${uuid} + cp -r interfaces-xml $out/share/gnome-shell/extensions/${uuid} + cp metadata.json $out/share/gnome-shell/extensions/${uuid} + runHook postInstall + ''; + + meta = with lib; { + description = "AppIndicator/KStatusNotifierItem support for GNOME Shell"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ jonafato ]; + platforms = gnome.gnome-shell.meta.platforms; + homepage = "https://github.com/Ubuntu/gnome-shell-extension-appindicator"; + }; +} diff --git a/pkgs/desktops/gnome/extensions/arcmenu/default.nix b/pkgs/desktops/gnome/extensions/arcmenu/default.nix new file mode 100644 index 0000000000000..851a816c61c73 --- /dev/null +++ b/pkgs/desktops/gnome/extensions/arcmenu/default.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchFromGitLab, glib, gettext, substituteAll, gnome-menus }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-arcmenu"; + version = "5"; + + src = fetchFromGitLab { + owner = "arcmenu"; + repo = "ArcMenu"; + rev = "v${version}"; + sha256 = "1w4avvnp08l7lkf76vc7wvfn1cd81l4r4dhz8qnai49rvrjgqcg3"; + }; + + patches = [ + (substituteAll { + src = ./fix_gmenu.patch; + gmenu_path = "${gnome-menus}/lib/girepository-1.0"; + }) + ]; + + buildInputs = [ + glib gettext + ]; + + makeFlags = [ "INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions" ]; + + uuid = "arcmenu@arcmenu.com"; + + meta = with lib; { + description = "Application menu for GNOME Shell, designed to provide a more traditional user experience and workflow"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ dkabot ]; + homepage = "https://gitlab.com/arcmenu/ArcMenu"; + }; +} diff --git a/pkgs/desktops/gnome/extensions/arcmenu/fix_gmenu.patch b/pkgs/desktops/gnome/extensions/arcmenu/fix_gmenu.patch new file mode 100644 index 0000000000000..5d8584f52a6aa --- /dev/null +++ b/pkgs/desktops/gnome/extensions/arcmenu/fix_gmenu.patch @@ -0,0 +1,11 @@ +--- a/extension.js ++++ b/extension.js +@@ -23,6 +23,8 @@ + + const Me = imports.misc.extensionUtils.getCurrentExtension(); + ++imports.gi.GIRepository.Repository.prepend_search_path('@gmenu_path@'); ++ + const {GLib, Gio, St} = imports.gi; + const Constants = Me.imports.constants; + const Controller = Me.imports.controller; diff --git a/pkgs/desktops/gnome/extensions/caffeine/default.nix b/pkgs/desktops/gnome/extensions/caffeine/default.nix new file mode 100644 index 0000000000000..3085a4461e712 --- /dev/null +++ b/pkgs/desktops/gnome/extensions/caffeine/default.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, fetchFromGitHub, glib, gettext, bash, gnome }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-caffeine"; + version = "37"; + + src = fetchFromGitHub { + owner = "eonpatapon"; + repo = "gnome-shell-extension-caffeine"; + rev = "v${version}"; + sha256 = "1mpa0fbpmv3pblb20dxj8iykn4ayvx89qffpcs67bzlq597zsbkb"; + }; + + uuid = "caffeine@patapon.info"; + + nativeBuildInputs = [ + glib gettext + ]; + + buildPhase = '' + runHook preBuild + ${bash}/bin/bash ./update-locale.sh + glib-compile-schemas --strict --targetdir=caffeine@patapon.info/schemas/ caffeine@patapon.info/schemas + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/gnome-shell/extensions + cp -r ${uuid} $out/share/gnome-shell/extensions + runHook postInstall + ''; + + meta = with lib; { + description = "Fill the cup to inhibit auto suspend and screensaver"; + license = licenses.gpl2; + maintainers = with maintainers; [ eperuffo ]; + homepage = "https://github.com/eonpatapon/gnome-shell-extension-caffeine"; + }; +} diff --git a/pkgs/desktops/gnome/extensions/chrome-gnome-shell/default.nix b/pkgs/desktops/gnome/extensions/chrome-gnome-shell/default.nix new file mode 100644 index 0000000000000..779d7506abf54 --- /dev/null +++ b/pkgs/desktops/gnome/extensions/chrome-gnome-shell/default.nix @@ -0,0 +1,71 @@ +{ lib, stdenv +, fetchurl +, cmake +, ninja +, jq +, python3 +, gnome +, wrapGAppsHook +, gobject-introspection +}: + +let + inherit (python3.pkgs) python pygobject3 requests; +in +stdenv.mkDerivation rec { + pname = "chrome-gnome-shell"; + version = "10.1"; + + src = fetchurl { + url = "mirror://gnome/sources/chrome-gnome-shell/${version}/${pname}-${version}.tar.xz"; + sha256 = "0f54xyamm383ypbh0ndkza0pif6ljddg2f947p265fkqj3p4zban"; + }; + + nativeBuildInputs = [ + cmake + ninja + jq + wrapGAppsHook + gobject-introspection # for setup-hook + ]; + + buildInputs = [ + gnome.gnome-shell + python + pygobject3 + requests + gobject-introspection # for Gio typelib + ]; + + cmakeFlags = [ + "-DBUILD_EXTENSION=OFF" + ]; + + wrapPrefixVariables = [ + "PYTHONPATH" + ]; + + # cmake setup hook changes /etc/opt into /var/empty + dontFixCmake = true; + + preConfigure = '' + substituteInPlace CMakeLists.txt --replace "/etc" "$out/etc" + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = "chrome-gnome-shell"; + }; + }; + + meta = with lib; { + description = "GNOME Shell integration for Chrome"; + homepage = "https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome"; + longDescription = '' + To use the integration, install the browser extension, and then set to true. + ''; + license = licenses.gpl3; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/extensions/clipboard-indicator/default.nix b/pkgs/desktops/gnome/extensions/clipboard-indicator/default.nix new file mode 100644 index 0000000000000..ee64fc5113d05 --- /dev/null +++ b/pkgs/desktops/gnome/extensions/clipboard-indicator/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-clipboard-indicator"; + version = "37"; + + src = fetchFromGitHub { + owner = "Tudmotu"; + repo = "gnome-shell-extension-clipboard-indicator"; + rev = "v${version}"; + sha256 = "0npxhaam2ra2b9zh2gk2q0n5snlhx6glz86m3jf8hz037w920k41"; + }; + + uuid = "clipboard-indicator@tudmotu.com"; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/gnome-shell/extensions/${uuid} + cp -r * $out/share/gnome-shell/extensions/${uuid} + runHook postInstall + ''; + + meta = with lib; { + description = "Adds a clipboard indicator to the top panel and saves clipboard history"; + license = licenses.mit; + maintainers = with maintainers; [ jonafato ]; + platforms = platforms.linux; + homepage = "https://github.com/Tudmotu/gnome-shell-extension-clipboard-indicator"; + }; +} diff --git a/pkgs/desktops/gnome/extensions/clock-override/default.nix b/pkgs/desktops/gnome/extensions/clock-override/default.nix new file mode 100644 index 0000000000000..3e02d33857a69 --- /dev/null +++ b/pkgs/desktops/gnome/extensions/clock-override/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, fetchzip, gnome, gettext, glib }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-clock-override"; + version = "12"; + + src = fetchzip { + url = "https://extensions.gnome.org/extension-data/clock-overridegnomeshell.kryogenix.org.v${version}.shell-extension.zip"; + sha256 = "1cyaszks6bwnbgacqsl1pmr24mbj05mad59d4253la9am8ibb4m6"; + stripRoot = false; + }; + + uuid = "clock-override@gnomeshell.kryogenix.org"; + + nativeBuildInputs = [ gettext glib ]; + + buildPhase = '' + runHook preBuild + glib-compile-schemas --strict --targetdir=schemas schemas + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/gnome-shell/extensions/${uuid} + cp -r {convenience.js,extension.js,format.js,locale,metadata.json,prefs.js,schemas} $out/share/gnome-shell/extensions/${uuid} + runHook postInstall + ''; + + meta = with lib; { + description = "Customize the date and time format displayed in clock in the top bar in GNOME Shell"; + license = licenses.mit; + maintainers = with maintainers; [ rhoriguchi ]; + homepage = "https://github.com/stuartlangridge/gnome-shell-clock-override"; + broken = versionOlder gnome.gnome-shell.version "3.18"; + }; +} diff --git a/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix new file mode 100644 index 0000000000000..45233e52f8932 --- /dev/null +++ b/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix @@ -0,0 +1,35 @@ +{ lib, stdenv +, fetchFromGitHub +, glib +, gettext +}: + +stdenv.mkDerivation rec { + pname = "gnome-shell-dash-to-dock"; + version = "69"; + + src = fetchFromGitHub { + owner = "micheleg"; + repo = "dash-to-dock"; + rev = "extensions.gnome.org-v" + version; + hash = "sha256-YuLtC7E8dK57JSuFdbDQe5Ml+KQfl9qSdrHdVhFaNiE="; + }; + + nativeBuildInputs = [ + glib + gettext + ]; + + makeFlags = [ + "INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions" + ]; + + uuid = "dash-to-dock@micxgx.gmail.com"; + + meta = with lib; { + description = "A dock for the Gnome Shell"; + homepage = "https://micheleg.github.io/dash-to-dock/"; + license = licenses.gpl2; + maintainers = with maintainers; [ eperuffo jtojnar ]; + }; +} diff --git a/pkgs/desktops/gnome/extensions/dash-to-panel/default.nix b/pkgs/desktops/gnome/extensions/dash-to-panel/default.nix new file mode 100644 index 0000000000000..7a9dc066cc77e --- /dev/null +++ b/pkgs/desktops/gnome/extensions/dash-to-panel/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchFromGitHub, glib, gettext }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-dash-to-panel"; + version = "40"; + + src = fetchFromGitHub { + owner = "home-sweet-gnome"; + repo = "dash-to-panel"; + rev = "v${version}"; + sha256 = "07jq8d16nn62ikis896nyfn3q02f5srj754fmiblhz472q4ljc3p"; + }; + + buildInputs = [ + glib gettext + ]; + + makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ]; + + uuid = "dash-to-panel@jderose9.github.com"; + + meta = with lib; { + description = "An icon taskbar for Gnome Shell"; + license = licenses.gpl2; + maintainers = with maintainers; [ mounium ]; + homepage = "https://github.com/jderose9/dash-to-panel"; + }; +} diff --git a/pkgs/desktops/gnome/extensions/disable-unredirect/default.nix b/pkgs/desktops/gnome/extensions/disable-unredirect/default.nix new file mode 100644 index 0000000000000..0a9145de3db35 --- /dev/null +++ b/pkgs/desktops/gnome/extensions/disable-unredirect/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-disable-unredirect"; + version = "unstable-2021-01-17"; + + src = fetchFromGitHub { + owner = "kazysmaster"; + repo = "gnome-shell-extension-disable-unredirect"; + rev = "2ecb2f489ea3316b77d04f03a0c885f322c67e79"; + sha256 = "1rjyrg8qya0asndxr7189a9npww0rcxk02wkxrxjy7fdp5m89p7y"; + }; + + uuid = "unredirect@vaina.lt"; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/gnome-shell/extensions + cp -R ${uuid} $out/share/gnome-shell/extensions/${uuid} + + runHook postInstall + ''; + + meta = with lib; { + description = "Disables unredirect fullscreen windows in gnome-shell to avoid tearing"; + license = licenses.gpl3Only; + homepage = "https://github.com/kazysmaster/gnome-shell-extension-disable-unredirect"; + maintainers = with maintainers; [ eduardosm ]; + }; +} diff --git a/pkgs/desktops/gnome/extensions/draw-on-your-screen/default.nix b/pkgs/desktops/gnome/extensions/draw-on-your-screen/default.nix new file mode 100644 index 0000000000000..90e8bffeec972 --- /dev/null +++ b/pkgs/desktops/gnome/extensions/draw-on-your-screen/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchgit, gettext, gnome }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-draw-on-your-screen"; + version = "10"; + + src = fetchgit { + url = "https://framagit.org/abakkk/DrawOnYourScreen/"; + rev = "v${version}"; + sha256 = "07adzg3mf6k0pmd9lc358w0w3l4pr3p6374day1qhmci2p4zxq6p"; + }; + + uuid = "drawOnYourScreen@abakkk.framagit.org"; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/gnome-shell/extensions/${uuid} + cp -r . $out/share/gnome-shell/extensions/${uuid} + runHook postInstall + ''; + + meta = with lib; { + description = "A drawing extension for GNOME Shell"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ ericdallo ahuzik ]; + platforms = gnome.gnome-shell.meta.platforms; + homepage = "https://framagit.org/abakkk/DrawOnYourScreen"; + }; +} diff --git a/pkgs/desktops/gnome/extensions/drop-down-terminal/default.nix b/pkgs/desktops/gnome/extensions/drop-down-terminal/default.nix new file mode 100644 index 0000000000000..a994e427fb0e8 --- /dev/null +++ b/pkgs/desktops/gnome/extensions/drop-down-terminal/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, fetchFromGitHub, substituteAll, gjs, vte, gnome }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-drop-down-terminal"; + version = "unstable-2020-03-25"; + + src = fetchFromGitHub { + owner = "zzrough"; + repo = "gs-extensions-drop-down-terminal"; + rev = "a59669afdb395b3315619f62c1f740f8b2f0690d"; + sha256 = "0igfxgrjdqq6z6xg4rsawxn261pk25g5dw2pm3bhwz5sqsy4bq3i"; + }; + + uuid = "drop-down-terminal@gs-extensions.zzrough.org"; + + patches = [ + (substituteAll { + src = ./fix_vte_and_gjs.patch; + inherit gjs vte; + }) + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/gnome-shell/extensions + cp -r ${uuid} $out/share/gnome-shell/extensions/ + runHook postInstall + ''; + + meta = with lib; { + description = "Configurable drop down terminal shell"; + license = licenses.gpl3; + maintainers = with maintainers; [ ericdallo ]; + homepage = "https://github.com/zzrough/gs-extensions-drop-down-terminal"; + }; +} diff --git a/pkgs/desktops/gnome/extensions/drop-down-terminal/fix_vte_and_gjs.patch b/pkgs/desktops/gnome/extensions/drop-down-terminal/fix_vte_and_gjs.patch new file mode 100644 index 0000000000000..3544c91ee8958 --- /dev/null +++ b/pkgs/desktops/gnome/extensions/drop-down-terminal/fix_vte_and_gjs.patch @@ -0,0 +1,32 @@ +--- a/drop-down-terminal@gs-extensions.zzrough.org/extension.js ++++ b/drop-down-terminal@gs-extensions.zzrough.org/extension.js +@@ -15,6 +15,8 @@ + + // Author: Stéphane Démurget + ++imports.gi.GIRepository.Repository.prepend_search_path('@vte@/lib/girepository-1.0') ++ + const Lang = imports.lang; + const Gettext = imports.gettext.domain("drop-down-terminal"); + const Mainloop = imports.mainloop; +@@ -653,7 +655,7 @@ const DropDownTerminalExtension = new Lang.Class({ + this._killingChild = false; + + // finds the forking arguments +- let args = ["gjs", GLib.build_filenamev([Me.path, "terminal.js"]), Me.path]; ++ let args = ["@gjs@/bin/gjs", GLib.build_filenamev([Me.path, "terminal.js"]), Me.path]; + + // forks the process + debug("forking '" + args.join(" ") + "'"); +--- a/drop-down-terminal@gs-extensions.zzrough.org/terminal.js ++++ b/drop-down-terminal@gs-extensions.zzrough.org/terminal.js +@@ -14,6 +14,9 @@ + // along with this program. If not, see . + + // Author: Stéphane Démurget ++ ++imports.gi.GIRepository.Repository.prepend_search_path('@vte@/lib/girepository-1.0') ++ + const Lang = imports.lang; + + const Pango = imports.gi.Pango; diff --git a/pkgs/desktops/gnome/extensions/dynamic-panel-transparency/default.nix b/pkgs/desktops/gnome/extensions/dynamic-panel-transparency/default.nix new file mode 100644 index 0000000000000..f31e170b975dd --- /dev/null +++ b/pkgs/desktops/gnome/extensions/dynamic-panel-transparency/default.nix @@ -0,0 +1,38 @@ +{ lib, stdenv, fetchFromGitHub, gnome, glib }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-dynamic-panel-transparency"; + version = "35"; + + src = fetchFromGitHub { + owner = "ewlsh"; + repo = "dynamic-panel-transparency"; + rev = "0800c0a921bb25f51f6a5ca2e6981b1669a69aec"; + sha256 = "0200mx861mlsi9lf7h108yam02jfqqw55r521chkgmk4fy6z99pq"; + }; + + uuid = "dynamic-panel-transparency@rockon999.github.io"; + + nativeBuildInputs = [ glib ]; + + buildPhase = '' + runHook preBuild + glib-compile-schemas --strict --targetdir=${uuid}/schemas/ ${uuid}/schemas + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/gnome-shell/extensions/${uuid} + cp -r ${uuid} $out/share/gnome-shell/extensions + runHook postInstall + ''; + + meta = with lib; { + description = "This extension fades your top panel to nothingness when there are no maximized windows present"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ rhoriguchi ]; + homepage = "https://github.com/ewlsh/dynamic-panel-transparency"; + broken = versionOlder gnome.gnome-shell.version "3.36"; + }; +} diff --git a/pkgs/desktops/gnome/extensions/emoji-selector/default.nix b/pkgs/desktops/gnome/extensions/emoji-selector/default.nix new file mode 100644 index 0000000000000..5470dc996be01 --- /dev/null +++ b/pkgs/desktops/gnome/extensions/emoji-selector/default.nix @@ -0,0 +1,38 @@ +{ lib, stdenv, fetchFromGitHub, glib, gettext }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-emoji-selector"; + version = "19"; + + src = fetchFromGitHub { + owner = "maoschanz"; + repo = "emoji-selector-for-gnome"; + rev = version; + sha256 = "0x60pg5nl5d73av494dg29hyfml7fbf2d03wm053vx1q8a3pxbyb"; + }; + + uuid = "emoji-selector@maestroschan.fr"; + + nativeBuildInputs = [ glib ]; + + buildPhase = '' + runHook preBuild + glib-compile-schemas ./${uuid}/schemas + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/gnome-shell/extensions + cp -r ${uuid} $out/share/gnome-shell/extensions + runHook postInstall + ''; + + meta = with lib; { + description = + "GNOME Shell extension providing a searchable popup menu displaying most emojis"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ rawkode ]; + homepage = "https://github.com/maoschanz/emoji-selector-for-gnome"; + }; +} diff --git a/pkgs/desktops/gnome/extensions/freon/default.nix b/pkgs/desktops/gnome/extensions/freon/default.nix new file mode 100644 index 0000000000000..f30e2f6f8a250 --- /dev/null +++ b/pkgs/desktops/gnome/extensions/freon/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, fetchFromGitHub, glib }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-freon"; + version = "40"; + + uuid = "freon@UshakovVasilii_Github.yahoo.com"; + + src = fetchFromGitHub { + owner = "UshakovVasilii"; + repo = "gnome-shell-extension-freon"; + rev = "EGO-${version}"; + sha256 = "0ak6f5dds9kk3kqww681gs3l1mj3vf22icrvb5m257s299rq8yzl"; + }; + + nativeBuildInputs = [ glib ]; + + buildPhase = '' + runHook preBuild + glib-compile-schemas --strict --targetdir=${uuid}/schemas ${uuid}/schemas + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/gnome-shell/extensions + cp -r ${uuid} $out/share/gnome-shell/extensions + runHook postInstall + ''; + + meta = with lib; { + description = "GNOME Shell extension for displaying CPU, GPU, disk temperatures, voltage and fan RPM in the top panel"; + license = licenses.gpl2; + maintainers = with maintainers; [ justinas ]; + homepage = "https://github.com/UshakovVasilii/gnome-shell-extension-freon"; + }; +} diff --git a/pkgs/desktops/gnome/extensions/fuzzy-app-search/default.nix b/pkgs/desktops/gnome/extensions/fuzzy-app-search/default.nix new file mode 100755 index 0000000000000..302b21f2aefc5 --- /dev/null +++ b/pkgs/desktops/gnome/extensions/fuzzy-app-search/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchFromGitLab, gnome, glib }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-fuzzy-app-search"; + version = "4"; + + src = fetchFromGitLab { + owner = "Czarlie"; + repo = "gnome-fuzzy-app-search"; + rev = "da9c15d39958d9c3b38df3b616fd40b85aed24e5"; + sha256 = "1r3qha530s97x818znn1wi76f4x9bhlgi7jlxfwjnrwys62cv5fn"; + }; + + uuid = "gnome-fuzzy-app-search@gnome-shell-extensions.Czarlie.gitlab.com"; + + nativeBuildInputs = [ glib ]; + + patches = [ ./fix-desktop-file-paths.patch ]; + + makeFlags = [ "INSTALL_PATH=$(out)/share/gnome-shell/extensions" ]; + + meta = with lib; { + description = "Fuzzy application search results for Gnome Search"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ rhoriguchi ]; + homepage = "https://gitlab.com/Czarlie/gnome-fuzzy-app-search"; + broken = versionOlder gnome.gnome-shell.version "3.18"; + }; +} diff --git a/pkgs/desktops/gnome/extensions/fuzzy-app-search/fix-desktop-file-paths.patch b/pkgs/desktops/gnome/extensions/fuzzy-app-search/fix-desktop-file-paths.patch new file mode 100755 index 0000000000000..1795f998c9bde --- /dev/null +++ b/pkgs/desktops/gnome/extensions/fuzzy-app-search/fix-desktop-file-paths.patch @@ -0,0 +1,50 @@ +diff --git a/applicationsUtils.js b/applicationsUtils.js +index 728223b..aa9f291 100644 +--- a/applicationsUtils.js ++++ b/applicationsUtils.js +@@ -44,27 +44,24 @@ var Search = new Lang.Class({ + * @return {Void} + */ + _init: function () { +- let dir = [ +- "/usr/share/applications", +- GLib.get_home_dir() + "/.local/share/applications", +- ]; +- +- // listen object - file/monitor list +- this._listen = dir.map((path) => { +- let file = Gio.File.new_for_path(path); +- let monitor = file.monitor(Gio.FileMonitorFlags.NONE, null); +- +- // refresh on each directory change +- monitor.connect( +- "changed", +- Lang.bind(this, this._handleMonitorChanged) +- ); +- +- return { +- file: file, +- monitor: monitor, +- }; +- }); ++ this._listen = [...new Set(GLib.get_system_data_dirs())] ++ .filter((path) => path.endsWith("/share")) ++ .map((path) => Gio.File.new_for_path(path + "/applications")) ++ .filter((file) => file.query_exists(null)) ++ .map((file) => { ++ let monitor = file.monitor(Gio.FileMonitorFlags.NONE, null); ++ ++ // refresh on each directory change ++ monitor.connect( ++ "changed", ++ Lang.bind(this, this._handleMonitorChanged) ++ ); ++ ++ return { ++ file: file, ++ monitor: monitor, ++ }; ++ }); + this._interval = null; + this._data = {}; + \ No newline at end of file diff --git a/pkgs/desktops/gnome/extensions/gsconnect/default.nix b/pkgs/desktops/gnome/extensions/gsconnect/default.nix new file mode 100644 index 0000000000000..c924b4e3eca05 --- /dev/null +++ b/pkgs/desktops/gnome/extensions/gsconnect/default.nix @@ -0,0 +1,116 @@ +{ lib, stdenv +, fetchFromGitHub +, substituteAll +, openssl +, gsound +, meson +, ninja +, pkg-config +, gobject-introspection +, wrapGAppsHook +, glib +, glib-networking +, gtk3 +, openssh +, gnome +, gjs +, nixosTests +}: + +stdenv.mkDerivation rec { + pname = "gnome-shell-gsconnect"; + version = "46"; + + outputs = [ "out" "installedTests" ]; + + src = fetchFromGitHub { + owner = "andyholmes"; + repo = "gnome-shell-extension-gsconnect"; + rev = "v${version}"; + sha256 = "161379kipr6z6gbhchb5b17djrkg5fbvblyyabzkc2gv05r3h6fw"; + }; + + patches = [ + # Make typelibs available in the extension + (substituteAll { + src = ./fix-paths.patch; + gapplication = "${glib.bin}/bin/gapplication"; + }) + + # Allow installing installed tests to a separate output + ./installed-tests-path.patch + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection # for locating typelibs + wrapGAppsHook # for wrapping daemons + ]; + + buildInputs = [ + glib # libgobject + glib-networking + gtk3 + gsound + gjs # for running daemon + gnome.evolution-data-server # for libebook-contacts typelib + ]; + + mesonFlags = [ + "-Dgnome_shell_libdir=${gnome.gnome-shell}/lib" + "-Dgsettings_schemadir=${glib.makeSchemaPath (placeholder "out") "${pname}-${version}"}" + "-Dchrome_nmhdir=${placeholder "out"}/etc/opt/chrome/native-messaging-hosts" + "-Dchromium_nmhdir=${placeholder "out"}/etc/chromium/native-messaging-hosts" + "-Dopenssl_path=${openssl}/bin/openssl" + "-Dsshadd_path=${openssh}/bin/ssh-add" + "-Dsshkeygen_path=${openssh}/bin/ssh-keygen" + "-Dsession_bus_services_dir=${placeholder "out"}/share/dbus-1/services" + "-Dpost_install=true" + "-Dinstalled_test_prefix=${placeholder "installedTests"}" + ]; + + postPatch = '' + patchShebangs meson/nmh.sh + patchShebangs meson/post-install.sh + patchShebangs installed-tests/prepare-tests.sh + + # TODO: do not include every typelib everywhere + # for example, we definitely do not need nautilus + for file in src/extension.js src/prefs.js; do + substituteInPlace "$file" \ + --subst-var-by typelibPath "$GI_TYPELIB_PATH" + done + ''; + + postFixup = '' + # Let’s wrap the daemons + for file in $out/share/gnome-shell/extensions/gsconnect@andyholmes.github.io/service/{daemon,nativeMessagingHost}.js; do + echo "Wrapping program $file" + wrapGApp "$file" + done + + # Wrap jasmine runner for tests + for file in $installedTests/libexec/installed-tests/gsconnect/minijasmine; do + echo "Wrapping program $file" + wrapGApp "$file" + done + ''; + + uuid = "gsconnect@andyholmes.github.io"; + + passthru = { + tests = { + installedTests = nixosTests.installed-tests.gsconnect; + }; + }; + + meta = with lib; { + description = "KDE Connect implementation for Gnome Shell"; + homepage = "https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ etu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/extensions/gsconnect/fix-paths.patch b/pkgs/desktops/gnome/extensions/gsconnect/fix-paths.patch new file mode 100644 index 0000000000000..58c02a92eb2ef --- /dev/null +++ b/pkgs/desktops/gnome/extensions/gsconnect/fix-paths.patch @@ -0,0 +1,37 @@ +diff --git i/data/org.gnome.Shell.Extensions.GSConnect.desktop.in w/data/org.gnome.Shell.Extensions.GSConnect.desktop.in +index ffb23342..b405c73b 100644 +--- i/data/org.gnome.Shell.Extensions.GSConnect.desktop.in ++++ w/data/org.gnome.Shell.Extensions.GSConnect.desktop.in +@@ -1,7 +1,7 @@ + [Desktop Entry] + Type=Application + Name=GSConnect +-Exec=gapplication launch org.gnome.Shell.Extensions.GSConnect %U ++Exec=@gapplication@ launch org.gnome.Shell.Extensions.GSConnect %U + Terminal=false + NoDisplay=true + Icon=org.gnome.Shell.Extensions.GSConnect +diff --git i/src/extension.js w/src/extension.js +index 5f32aa68..872c0c61 100644 +--- i/src/extension.js ++++ w/src/extension.js +@@ -1,5 +1,7 @@ + 'use strict'; + ++'@typelibPath@'.split(':').forEach(path => imports.gi.GIRepository.Repository.prepend_search_path(path)); ++ + const Gio = imports.gi.Gio; + const GObject = imports.gi.GObject; + const Gtk = imports.gi.Gtk; +diff --git i/src/prefs.js w/src/prefs.js +index 07e93099..1c166710 100644 +--- i/src/prefs.js ++++ w/src/prefs.js +@@ -1,5 +1,7 @@ + 'use strict'; + ++'@typelibPath@'.split(':').forEach(path => imports.gi.GIRepository.Repository.prepend_search_path(path)); ++ + const Gio = imports.gi.Gio; + const GLib = imports.gi.GLib; + const Gtk = imports.gi.Gtk; diff --git a/pkgs/desktops/gnome/extensions/gsconnect/installed-tests-path.patch b/pkgs/desktops/gnome/extensions/gsconnect/installed-tests-path.patch new file mode 100644 index 0000000000000..78e1ad96d74c3 --- /dev/null +++ b/pkgs/desktops/gnome/extensions/gsconnect/installed-tests-path.patch @@ -0,0 +1,30 @@ +diff --git a/installed-tests/meson.build b/installed-tests/meson.build +index c7eff2fb..ef4f6052 100644 +--- a/installed-tests/meson.build ++++ b/installed-tests/meson.build +@@ -1,5 +1,5 @@ +-installed_tests_execdir = join_paths(libexecdir, 'installed-tests', meson.project_name()) +-installed_tests_metadir = join_paths(datadir, 'installed-tests', meson.project_name()) ++installed_tests_execdir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', meson.project_name()) ++installed_tests_metadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', meson.project_name()) + + installed_tests_srcdir = meson.current_source_dir() + installed_tests_builddir = meson.current_build_dir() +diff --git a/meson_options.txt b/meson_options.txt +index 8912e052..ca6ee5eb 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -116,6 +116,13 @@ option( + description: 'Native Messaging Host directory for Mozilla' + ) + ++option( ++ 'installed_test_prefix', ++ type: 'string', ++ value: '', ++ description: 'Prefix for installed tests' ++) ++ + option( + 'installed_tests', + type: 'boolean', diff --git a/pkgs/desktops/gnome/extensions/hot-edge/default.nix b/pkgs/desktops/gnome/extensions/hot-edge/default.nix new file mode 100644 index 0000000000000..aaa5870996aba --- /dev/null +++ b/pkgs/desktops/gnome/extensions/hot-edge/default.nix @@ -0,0 +1,33 @@ +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-hot-edge"; + version = "jdoda"; + + src = fetchFromGitHub { + owner = "jdoda"; + repo = "hotedge"; + rev = "bb7f651becea5287241caf7cda246a68ab07dac8"; + sha256 = "oeTs0kRan6b5relxzhK1IKbV0Yv2d5YdvvUPJ3fM9ik="; + }; + + dontBuild = true; + + uuid = "hotedge@jonathan.jdoda.ca"; + + installPhase = '' + runHook preInstall + install -Dt $out/share/gnome-shell/extensions/${uuid} extension.js metadata.json stylesheet.css + runHook postInstall + ''; + + meta = with lib; { + description = "Replace the top-left hot corner with a bottom hot edge"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ jtojnar ]; + homepage = "https://github.com/jdoda/hotedge"; + }; +} diff --git a/pkgs/desktops/gnome/extensions/icon-hider/default.nix b/pkgs/desktops/gnome/extensions/icon-hider/default.nix new file mode 100644 index 0000000000000..820d96988c9ab --- /dev/null +++ b/pkgs/desktops/gnome/extensions/icon-hider/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromGitHub, gnome }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-icon-hider"; + version = "23"; + + src = fetchFromGitHub { + owner = "ikalnytskyi"; + repo = "gnome-shell-extension-icon-hider"; + rev = "v${version}"; + sha256 = "18c8zkdrmdbghqqz7b450vhgpykgz25mgigwn2nggcb2lxmvm9ks"; + }; + + uuid = "icon-hider@kalnitsky.org"; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/gnome-shell/extensions + cp -r ${uuid} $out/share/gnome-shell/extensions + runHook postInstall + ''; + + meta = with lib; { + description = "Icon Hider is a GNOME Shell extension for managing status area items"; + license = licenses.bsd3; + maintainers = with maintainers; [ jonafato ]; + platforms = gnome.gnome-shell.meta.platforms; + homepage = "https://github.com/ikalnytskyi/gnome-shell-extension-icon-hider"; + broken = versionAtLeast gnome.gnome-shell.version "3.32"; # Doesn't support 3.34 + }; +} diff --git a/pkgs/desktops/gnome/extensions/impatience/default.nix b/pkgs/desktops/gnome/extensions/impatience/default.nix new file mode 100644 index 0000000000000..82551efef3c78 --- /dev/null +++ b/pkgs/desktops/gnome/extensions/impatience/default.nix @@ -0,0 +1,39 @@ +{ lib, stdenv, fetchFromGitHub, glib }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-impatience"; + version = "unstable-2019-09-23"; + + src = fetchFromGitHub { + owner = "timbertson"; + repo = "gnome-shell-impatience"; + rev = "43e4e0a1e0eeb334a2da5224ce3ab4fdddf4f1b2"; + sha256 = "0kvdhlz41fjyqdgcfw6mrr9nali6wg2qwji3dvykzfi0aypljzpx"; + }; + + buildInputs = [ + glib + ]; + + buildPhase = '' + runHook preBuild + make schemas + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/gnome-shell/extensions + cp -r impatience $out/share/gnome-shell/extensions/${uuid} + runHook postInstall + ''; + + uuid = "impatience@gfxmonk.net"; + + meta = with lib; { + description = "Speed up builtin gnome-shell animations"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ timbertson tiramiseb ]; + homepage = "http://gfxmonk.net/dist/0install/gnome-shell-impatience.xml"; + }; +} diff --git a/pkgs/desktops/gnome/extensions/material-shell/default.nix b/pkgs/desktops/gnome/extensions/material-shell/default.nix new file mode 100644 index 0000000000000..9b683c1af6b57 --- /dev/null +++ b/pkgs/desktops/gnome/extensions/material-shell/default.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, fetchFromGitHub, gnome }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-material-shell"; + version = "12"; + + src = fetchFromGitHub { + owner = "material-shell"; + repo = "material-shell"; + rev = version; + sha256 = "0ikrh70drwr0pqjcdz7l1ky8xllpnk7myprjd4s61nqkx9j2iz44"; + }; + + # This package has a Makefile, but it's used for building a zip for + # publication to extensions.gnome.org. Disable the build phase so + # installing doesn't build an unnecessary release. + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/gnome-shell/extensions/${uuid} + cp -r * $out/share/gnome-shell/extensions/${uuid}/ + runHook postInstall + ''; + + uuid = "material-shell@papyelgringo"; + + meta = with lib; { + description = "A modern desktop interface for Linux"; + license = licenses.mit; + maintainers = with maintainers; [ benley ]; + homepage = "https://github.com/material-shell/material-shell"; + platforms = gnome.gnome-shell.meta.platforms; + }; +} diff --git a/pkgs/desktops/gnome/extensions/mpris-indicator-button/default.nix b/pkgs/desktops/gnome/extensions/mpris-indicator-button/default.nix new file mode 100644 index 0000000000000..b0dfc9b8dec8a --- /dev/null +++ b/pkgs/desktops/gnome/extensions/mpris-indicator-button/default.nix @@ -0,0 +1,42 @@ +{ lib, stdenv +, fetchFromGitHub +, nix-update-script +, gnome +}: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-mpris-indicator-button-unstable"; + version = "2020-03-21"; + + src = fetchFromGitHub { + owner = "JasonLG1979"; + repo = "gnome-shell-extension-mpris-indicator-button"; + rev = "de54160e7d905b8c48c0fe30a437f7c51efc1aa3"; + sha256 = "0n5qlx51fxjq1nn10zhdwfy905j20sv7pwh2jc6fns757ac4pwwk"; + }; + + uuid = "mprisindicatorbutton@JasonLG1979.github.io"; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/gnome-shell/extensions + cp -r ${uuid} $out/share/gnome-shell/extensions + runHook postInstall + ''; + + passthru = { + updateScript = nix-update-script { + attrPath = "gnomeExtensions.${pname}"; + }; + }; + + + meta = with lib; { + description = "A simple MPRIS indicator button for GNOME Shell"; + license = licenses.gpl3; + maintainers = with maintainers; [ worldofpeace ]; + platforms = gnome.gnome-shell.meta.platforms; + homepage = "https://github.com/JasonLG1979/gnome-shell-extension-mpris-indicator-button"; + broken = versionOlder gnome.gnome-shell.version "3.34"; + }; +} diff --git a/pkgs/desktops/gnome/extensions/night-theme-switcher/default.nix b/pkgs/desktops/gnome/extensions/night-theme-switcher/default.nix new file mode 100644 index 0000000000000..fd0d2dbb57849 --- /dev/null +++ b/pkgs/desktops/gnome/extensions/night-theme-switcher/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchFromGitLab, glib, gnome, unzip }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-night-theme-switcher"; + version = "40"; + + src = fetchFromGitLab { + owner = "rmnvgr"; + repo = "nightthemeswitcher-gnome-shell-extension"; + rev = "v${version}"; + sha256 = "0z11y18bgdc0y41hrrzzgi4lagm2cg06x12jgdnary1ycng7xja0"; + }; + + nativeBuildInputs = [ unzip ]; + buildInputs = [ glib gnome.gnome-shell ]; + + uuid = "nightthemeswitcher@romainvigier.fr"; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/gnome-shell/extensions/ + unzip build/${uuid}.shell-extension.zip -d $out/share/gnome-shell/extensions/${uuid} + runHook postInstall + ''; + + meta = with lib; { + description = "Automatically change the GTK theme to dark variant when Night Light activates"; + license = licenses.gpl3; + maintainers = with maintainers; [ jonafato ]; + homepage = "https://gitlab.com/rmnvgr/nightthemeswitcher-gnome-shell-extension/"; + }; +} diff --git a/pkgs/desktops/gnome/extensions/no-title-bar/default.nix b/pkgs/desktops/gnome/extensions/no-title-bar/default.nix new file mode 100644 index 0000000000000..ad588be18ce9e --- /dev/null +++ b/pkgs/desktops/gnome/extensions/no-title-bar/default.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchFromGitHub, substituteAll, glib, gettext, xorg }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-no-title-bar"; + version = "11"; + + src = fetchFromGitHub { + owner = "poehlerj"; + repo = "no-title-bar"; + rev = "V_${version}"; + sha256 = "07ddw47binlsbyvgy4xkdjvd40zyp7nwd17r6k7w54d50vmnwhvb"; + }; + + nativeBuildInputs = [ glib gettext ]; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + xprop = "${xorg.xprop}/bin/xprop"; + xwininfo = "${xorg.xwininfo}/bin/xwininfo"; + }) + ]; + + makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ]; + + uuid = "no-title-bar@jonaspoehler.de"; + + meta = with lib; { + description = "Integrates maximized windows with the top panel"; + homepage = "https://github.com/poehlerj/no-title-bar"; + license = licenses.gpl2; + maintainers = with maintainers; [ jonafato svsdep maxeaubrey ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/extensions/no-title-bar/fix-paths.patch b/pkgs/desktops/gnome/extensions/no-title-bar/fix-paths.patch new file mode 100644 index 0000000000000..fb2d3d57e51d3 --- /dev/null +++ b/pkgs/desktops/gnome/extensions/no-title-bar/fix-paths.patch @@ -0,0 +1,56 @@ +diff --git a/decoration.js b/decoration.js +index d1ff3dd..ff4193f 100644 +--- a/decoration.js ++++ b/decoration.js +@@ -223,7 +223,7 @@ var Decoration = class { + + let winId = this._guessWindowXID(win); + +- let xprops = GLib.spawn_command_line_sync(`xprop -id ${winId}`); ++ let xprops = GLib.spawn_command_line_sync(`@xprop@ -id ${winId}`); + if (!xprops[0]) { + Utils.log_debug(`Unable to determine windows '${win.get_title()}' original state`); + return win._noTitleBarOriginalState = WindowState.UNKNOWN; +@@ -237,7 +237,7 @@ var Decoration = class { + let prop = '_MOTIF_WM_HINTS'; + let value = '0x2, 0x0, %s, 0x0, 0x0'.format(hide ? '0x2' : '0x1'); + +- GLib.spawn_command_line_sync(`xprop -id ${windId} -f ${prop} 32c -set ${prop} "${value}"`); ++ GLib.spawn_command_line_sync(`@xprop@ -id ${windId} -f ${prop} 32c -set ${prop} "${value}"`); + if (!hide && !win.titlebar_is_onscreen()) { + Utils.log_debug(`Shoving titlebar onscreen for window '${win.get_title()}'`); + win.shove_titlebar_onscreen(); +@@ -354,7 +354,7 @@ var Decoration = class { + let act = win.get_compositor_private(); + let xwindow = act && act['x-window']; + if (xwindow) { +- let xwininfo = GLib.spawn_command_line_sync('xwininfo -children -id 0x%x'.format(xwindow)); ++ let xwininfo = GLib.spawn_command_line_sync('@xwininfo@ -children -id 0x%x'.format(xwindow)); + if (xwininfo[0]) { + let str = ByteArray.toString(xwininfo[1]); + +@@ -384,7 +384,7 @@ var Decoration = class { + // Try enumerating all available windows and match the title. Note that this + // may be necessary if the title contains special characters and `x-window` + // is not available. +- let result = GLib.spawn_command_line_sync('xprop -root _NET_CLIENT_LIST'); ++ let result = GLib.spawn_command_line_sync('@xprop@ -root _NET_CLIENT_LIST'); + if (result[0]) { + let str = ByteArray.toString(result[1]); + +@@ -395,7 +395,7 @@ var Decoration = class { + + // For each window ID, check if the title matches the desired title. + for (var i = 0; i < windowList.length; ++i) { +- let cmd = 'xprop -id "' + windowList[i] + '" _NET_WM_NAME _NO_TITLE_BAR_ORIGINAL_STATE'; ++ let cmd = '@xprop@ -id "' + windowList[i] + '" _NET_WM_NAME _NO_TITLE_BAR_ORIGINAL_STATE'; + let result = GLib.spawn_command_line_sync(cmd); + + if (result[0]) { +@@ -455,4 +455,4 @@ var Decoration = class { + let styleContent = this._updateUserStyles(); + GLib.file_set_contents(this._userStylesPath, styleContent); + } +-} +\ No newline at end of file ++} diff --git a/pkgs/desktops/gnome/extensions/noannoyance/default.nix b/pkgs/desktops/gnome/extensions/noannoyance/default.nix new file mode 100644 index 0000000000000..4763d90575517 --- /dev/null +++ b/pkgs/desktops/gnome/extensions/noannoyance/default.nix @@ -0,0 +1,31 @@ +{ stdenv +, lib +, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "noannoyance"; + version = "unstable-2021-01-17"; + + src = fetchFromGitHub { + owner = "BjoernDaase"; + repo = "noannoyance"; + rev = "f6e76916336aee2f7c4141796f3c40c870d2b347"; + sha256 = "1iy3nif8rjjcwf83fg9ds93fi7vmhliynmlwqnx036s3msmxvgs3"; + }; + + uuid = "noannoyance@daase.net"; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/share/gnome-shell/extensions/${uuid} + cp metadata.json extension.js $out/share/gnome-shell/extensions/${uuid} + ''; + + meta = with lib; { + description = "Removes the 'Window is ready' notification and puts the window into focus"; + homepage = "https://github.com/BjoernDaase/noannoyance"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ tu-maurice ]; + }; +} diff --git a/pkgs/desktops/gnome/extensions/paperwm/default.nix b/pkgs/desktops/gnome/extensions/paperwm/default.nix new file mode 100644 index 0000000000000..201628b4b424e --- /dev/null +++ b/pkgs/desktops/gnome/extensions/paperwm/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-paperwm"; + version = "38.1"; + + src = fetchFromGitHub { + owner = "paperwm"; + repo = "PaperWM"; + rev = version; + sha256 = "1jq15qrq3khqpjsjbcc17amdr1k53jkvambdacdf56xbqkycvlgs"; + }; + + uuid = "paperwm@hedning:matrix.org"; + + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/gnome-shell/extensions/${uuid} + cp -r . $out/share/gnome-shell/extensions/${uuid} + runHook postInstall + ''; + + meta = with lib; { + description = "Tiled scrollable window management for Gnome Shell"; + homepage = "https://github.com/paperwm/PaperWM"; + license = licenses.gpl3; + maintainers = with maintainers; [ hedning ]; + }; +} diff --git a/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix b/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix new file mode 100644 index 0000000000000..93ffcda830a1e --- /dev/null +++ b/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, fetchFromGitHub, glib, gnome }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-pidgin-im-integration"; + version = "32"; + + src = fetchFromGitHub { + owner = "muffinmad"; + repo = "pidgin-im-gnome-shell-extension"; + rev = "v${version}"; + sha256 = "1jyg8r0s1v83sgg6y0jbsj2v37mglh8rvd8vi27fxnjq9xmg8kpc"; + }; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + share_dir="$prefix/share" + extensions_dir="$share_dir/gnome-shell/extensions/pidgin@muffinmad" + mkdir -p "$extensions_dir" + mv *.js metadata.json dbus.xml schemas locale "$extensions_dir" + runHook postInstall + ''; + + uuid = "pidgin@muffinmad"; + + meta = with lib; { + homepage = "https://github.com/muffinmad/pidgin-im-gnome-shell-extension"; + description = "Make Pidgin IM conversations appear in the Gnome Shell message tray"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ ]; + broken = versionAtLeast gnome.gnome-shell.version "3.32"; # Doesn't support 3.34 + }; +} diff --git a/pkgs/desktops/gnome/extensions/remove-dropdown-arrows/default.nix b/pkgs/desktops/gnome/extensions/remove-dropdown-arrows/default.nix new file mode 100644 index 0000000000000..e310f5dcf10c5 --- /dev/null +++ b/pkgs/desktops/gnome/extensions/remove-dropdown-arrows/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-remove-dropdown-arrows"; + version = "13"; + + src = fetchFromGitHub { + owner = "mpdeimos"; + repo = "gnome-shell-remove-dropdown-arrows"; + rev = "version/${version}"; + sha256 = "09b2hnfbqym20pb1sfc8xiz7gs2kbs6b1s7xl8swc8dydhsbambk"; + }; + + # This package has a Makefile, but it's used for publishing and linting, not + # for building. Disable the build phase so installing doesn't attempt to + # publish the extension. + dontBuild = true; + + uuid = "remove-dropdown-arrows@mpdeimos.com"; + installPhase = '' + runHook preInstall + mkdir -p $out/share/gnome-shell/extensions/${uuid} + cp extension.js $out/share/gnome-shell/extensions/${uuid} + cp metadata.json $out/share/gnome-shell/extensions/${uuid} + runHook postInstall + ''; + + meta = with lib; { + description = "Remove dropdown arrows from GNOME Shell Menus"; + license = licenses.gpl3; + maintainers = with maintainers; [ jonafato ]; + homepage = "https://github.com/mpdeimos/gnome-shell-remove-dropdown-arrows"; + }; +} diff --git a/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix b/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix new file mode 100644 index 0000000000000..e58d8ce6e42f7 --- /dev/null +++ b/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix @@ -0,0 +1,44 @@ +{ lib, stdenv +, substituteAll +, fetchFromGitHub +, libpulseaudio +, python3 +}: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-sound-output-device-chooser"; + version = "35"; + + src = fetchFromGitHub { + owner = "kgshank"; + repo = "gse-sound-output-device-chooser"; + rev = version; + sha256 = "sha256-Yl5ut6kJAkAAdCBiNFpwDgshXCLMmFH3/zhnFGpyKqs="; + }; + + patches = [ + # Fix paths to libpulse and python + (substituteAll { + src = ./fix-paths.patch; + libpulse = "${libpulseaudio}/lib/libpulse.so"; + python = python3.interpreter; + }) + ]; + + dontBuild = true; + + uuid = "sound-output-device-chooser@kgshank.net"; + installPhase = '' + runHook preInstall + mkdir -p $out/share/gnome-shell/extensions + cp -r ${uuid} $out/share/gnome-shell/extensions + runHook postInstall + ''; + + meta = with lib; { + description = "GNOME Shell extension adding audio device chooser to panel"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ jtojnar ]; + homepage = "https://github.com/kgshank/gse-sound-output-device-chooser"; + }; +} diff --git a/pkgs/desktops/gnome/extensions/sound-output-device-chooser/fix-paths.patch b/pkgs/desktops/gnome/extensions/sound-output-device-chooser/fix-paths.patch new file mode 100644 index 0000000000000..1971bf1e5e745 --- /dev/null +++ b/pkgs/desktops/gnome/extensions/sound-output-device-chooser/fix-paths.patch @@ -0,0 +1,26 @@ +diff --git a/sound-output-device-chooser@kgshank.net/convenience.js b/sound-output-device-chooser@kgshank.net/convenience.js +index 54ad06f..0860531 100644 +--- a/sound-output-device-chooser@kgshank.net/convenience.js ++++ b/sound-output-device-chooser@kgshank.net/convenience.js +@@ -142,7 +142,7 @@ function refreshCards() { + if (newProfLogic) { + _log("New logic"); + let pyLocation = Me.dir.get_child("utils/pa_helper.py").get_path(); +- let pythonExec = ["python", "python3", "python2"].find(cmd => isCmdFound(cmd)); ++ let pythonExec = '@python@'; + if (!pythonExec) { + _log("ERROR: Python not found. fallback to default mode"); + _settings.set_boolean(Prefs.NEW_PROFILE_ID, false); +diff --git a/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py b/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py +index c4d2484..262608d 100644 +--- a/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py ++++ b/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py +@@ -82,7 +82,7 @@ else: + + _libraries = {} + +-libpulse_library_name = find_library('pulse') ++libpulse_library_name = '@libpulse@' + if libpulse_library_name is None: + raise Exception('No libpulse.so library found!') + diff --git a/pkgs/desktops/gnome/extensions/system-monitor/default.nix b/pkgs/desktops/gnome/extensions/system-monitor/default.nix new file mode 100644 index 0000000000000..e7b5e8a1a9c18 --- /dev/null +++ b/pkgs/desktops/gnome/extensions/system-monitor/default.nix @@ -0,0 +1,50 @@ +{ lib, stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop, gnome }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-system-monitor"; + version = "unstable-2021-04-08"; + + src = fetchFromGitHub { + owner = "paradoxxxzero"; + repo = "gnome-shell-system-monitor-applet"; + rev = "942603da39de12f50b1f86efbde92d7526d1290e"; + sha256 = "0lzb7064bigw2xsqkzr8qfhp9wfmxyi3823j2782v99jpcz423aw"; + }; + + buildInputs = [ + glib + glib-networking + libgtop + ]; + + patches = [ + (substituteAll { + src = ./paths_and_nonexisting_dirs.patch; + clutter_path = gnome.mutter.libdir; # this should not be used in settings but 🤷‍♀️ + gtop_path = "${libgtop}/lib/girepository-1.0"; + glib_net_path = "${glib-networking}/lib/girepository-1.0"; + }) + ]; + + buildPhase = '' + runHook preBuild + glib-compile-schemas --targetdir=${uuid}/schemas ${uuid}/schemas + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/gnome-shell/extensions + cp -r ${uuid} $out/share/gnome-shell/extensions + runHook postInstall + ''; + + uuid = "system-monitor@paradoxxx.zero.gmail.com"; + + meta = with lib; { + description = "Display system informations in gnome shell status bar"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ tiramiseb ]; + homepage = "https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet"; + }; +} diff --git a/pkgs/desktops/gnome/extensions/system-monitor/paths_and_nonexisting_dirs.patch b/pkgs/desktops/gnome/extensions/system-monitor/paths_and_nonexisting_dirs.patch new file mode 100644 index 0000000000000..280af965af3f6 --- /dev/null +++ b/pkgs/desktops/gnome/extensions/system-monitor/paths_and_nonexisting_dirs.patch @@ -0,0 +1,33 @@ +diff --git a/system-monitor@paradoxxx.zero.gmail.com/extension.js b/system-monitor@paradoxxx.zero.gmail.com/extension.js +index de5e3d7..2d7824d 100644 +--- a/system-monitor@paradoxxx.zero.gmail.com/extension.js ++++ b/system-monitor@paradoxxx.zero.gmail.com/extension.js +@@ -18,6 +18,9 @@ + + // Author: Florian Mounier aka paradoxxxzero + ++imports.gi.GIRepository.Repository.prepend_search_path('@gtop_path@'); ++imports.gi.GIRepository.Repository.prepend_search_path('@glib_net_path@'); ++ + /* Ugly. This is here so that we don't crash old libnm-glib based shells unnecessarily + * by loading the new libnm.so. Should go away eventually */ + +@@ -407,7 +410,7 @@ const smMountsMonitor = class SystemMonitor_smMountsMonitor { + this.connected = false; + + this._volumeMonitor = Gio.VolumeMonitor.get(); +- let sys_mounts = ['/home', '/tmp', '/boot', '/usr', '/usr/local']; ++ let sys_mounts = ['/home', '/tmp', '/boot']; + this.base_mounts = ['/']; + sys_mounts.forEach((sMount) => { + if (this.is_sys_mount(sMount + '/')) { +diff --git a/system-monitor@paradoxxx.zero.gmail.com/prefs.js b/system-monitor@paradoxxx.zero.gmail.com/prefs.js +index 81d667c..0da4809 100644 +--- a/system-monitor@paradoxxx.zero.gmail.com/prefs.js ++++ b/system-monitor@paradoxxx.zero.gmail.com/prefs.js +@@ -1,3 +1,5 @@ ++imports.gi.GIRepository.Repository.prepend_search_path('@clutter_path@'); ++ + const Gtk = imports.gi.Gtk; + const Gio = imports.gi.Gio; + const Gdk = imports.gi.Gdk; diff --git a/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix b/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix new file mode 100644 index 0000000000000..68d07e2d1429a --- /dev/null +++ b/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix @@ -0,0 +1,42 @@ +{ lib, stdenv, substituteAll, fetchFromGitHub, taskwarrior, gettext, runtimeShell }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-taskwhisperer"; + version = "16"; + + src = fetchFromGitHub { + owner = "cinatic"; + repo = "taskwhisperer"; + rev = "v${version}"; + sha256 = "05w2dfpr5vrydb7ij4nd2gb7c31nxix3j48rb798r4jzl1rakyah"; + }; + + nativeBuildInputs = [ + gettext + ]; + + buildInputs = [ + taskwarrior + ]; + + uuid = "taskwhisperer-extension@infinicode.de"; + + makeFlags = [ + "INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions" + ]; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + task = "${taskwarrior}/bin/task"; + shell = runtimeShell; + }) + ]; + + meta = with lib; { + description = "GNOME Shell TaskWarrior GUI"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ jonafato ]; + homepage = "https://github.com/cinatic/taskwhisperer"; + }; +} diff --git a/pkgs/desktops/gnome/extensions/taskwhisperer/fix-paths.patch b/pkgs/desktops/gnome/extensions/taskwhisperer/fix-paths.patch new file mode 100644 index 0000000000000..2ea54f4b0897d --- /dev/null +++ b/pkgs/desktops/gnome/extensions/taskwhisperer/fix-paths.patch @@ -0,0 +1,99 @@ +diff --git a/taskwhisperer-extension@infinicode.de/extra/create.sh b/taskwhisperer-extension@infinicode.de/extra/create.sh +index a69e369..35d5ea1 100755 +--- a/taskwhisperer-extension@infinicode.de/extra/create.sh ++++ b/taskwhisperer-extension@infinicode.de/extra/create.sh +@@ -1 +1 @@ +-bash -c "task add $1" ++bash -c "@task@ add $1" +diff --git a/taskwhisperer-extension@infinicode.de/extra/modify.sh b/taskwhisperer-extension@infinicode.de/extra/modify.sh +index 7964a26..8edd21b 100755 +--- a/taskwhisperer-extension@infinicode.de/extra/modify.sh ++++ b/taskwhisperer-extension@infinicode.de/extra/modify.sh +@@ -1 +1 @@ +-bash -c "task $1 modify $2" ++bash -c "@task@ $1 modify $2" +diff --git a/taskwhisperer-extension@infinicode.de/taskService.js b/taskwhisperer-extension@infinicode.de/taskService.js +index ead7a12..aa36db4 100644 +--- a/taskwhisperer-extension@infinicode.de/taskService.js ++++ b/taskwhisperer-extension@infinicode.de/taskService.js +@@ -182,7 +182,7 @@ const TaskService = class TaskService { + + let project = projectName ? "project:" + projectName : ""; + +- let command = ['task', 'rc.json.array=on', status, project, 'export']; ++ let command = ['@task@', 'rc.json.array=on', status, project, 'export']; + let reader = new SpawnReader.SpawnReader(); + + let buffer = ""; +@@ -220,7 +220,7 @@ const TaskService = class TaskService { + break; + } + +- let shellProc = Gio.Subprocess.new(['task', status, 'projects'], Gio.SubprocessFlags.STDOUT_PIPE); ++ let shellProc = Gio.Subprocess.new(['@task@', status, 'projects'], Gio.SubprocessFlags.STDOUT_PIPE); + + shellProc.wait_async(null, function (obj, result) { + let shellProcExited = true; +@@ -261,7 +261,7 @@ const TaskService = class TaskService { + return; + } + +- let shellProc = Gio.Subprocess.new(['task', taskID.toString(), 'done'], Gio.SubprocessFlags.STDOUT_PIPE); ++ let shellProc = Gio.Subprocess.new(['@task@', taskID.toString(), 'done'], Gio.SubprocessFlags.STDOUT_PIPE); + + shellProc.wait_async(null, function (obj, result) { + let shellProcExited = true; +@@ -290,7 +290,7 @@ const TaskService = class TaskService { + return; + } + +- let shellProc = Gio.Subprocess.new(['task', 'modify', taskID.toString(), 'status:pending'], Gio.SubprocessFlags.STDOUT_PIPE); ++ let shellProc = Gio.Subprocess.new(['@task@', 'modify', taskID.toString(), 'status:pending'], Gio.SubprocessFlags.STDOUT_PIPE); + + shellProc.wait_async(null, function (obj, result) { + let shellProcExited = true; +@@ -318,7 +318,7 @@ const TaskService = class TaskService { + if (!taskID) { + return; + } +- let shellProc = Gio.Subprocess.new(['task', taskID.toString(), 'start'], Gio.SubprocessFlags.STDOUT_PIPE); ++ let shellProc = Gio.Subprocess.new(['@task@', taskID.toString(), 'start'], Gio.SubprocessFlags.STDOUT_PIPE); + shellProc.wait_async(null, function (obj, result) { + let shellProcExited = true; + shellProc.wait_finish(result); +@@ -344,7 +344,7 @@ const TaskService = class TaskService { + if (!taskID) { + return; + } +- let shellProc = Gio.Subprocess.new(['task', taskID.toString(), 'stop'], Gio.SubprocessFlags.STDOUT_PIPE); ++ let shellProc = Gio.Subprocess.new(['@task@', taskID.toString(), 'stop'], Gio.SubprocessFlags.STDOUT_PIPE); + shellProc.wait_async(null, function (obj, result) { + let shellProcExited = true; + shellProc.wait_finish(result); +@@ -374,7 +374,7 @@ const TaskService = class TaskService { + // FIXME: Gio.Subprocess: due to only passing string vector is allowed, it's not possible to directly pass the + // input of the user to subprocess (why & how, if you can answer then please send msg to fh@infinicode.de) + // bypassing problem with own shell script +- let shellProc = Gio.Subprocess.new(['/bin/sh', EXTENSIONDIR + '/extra/modify.sh', taskID.toString(), params], Gio.SubprocessFlags.STDOUT_PIPE + Gio.SubprocessFlags.STDERR_MERGE); ++ let shellProc = Gio.Subprocess.new(['@shell@', EXTENSIONDIR + '/extra/modify.sh', taskID.toString(), params], Gio.SubprocessFlags.STDOUT_PIPE + Gio.SubprocessFlags.STDERR_MERGE); + + shellProc.wait_async(null, function (obj, result) { + let shellProcExited = true; +@@ -403,7 +403,7 @@ const TaskService = class TaskService { + // FIXME: Gio.Subprocess: due to only passing string vector is allowed, it's not possible to directly pass the + // input of the user to subprocess (why & how, if you can answer then please send msg to fh@infinicode.de) + // bypassing problem with own shell script +- let shellProc = Gio.Subprocess.new(['/bin/sh', EXTENSIONDIR + '/extra/create.sh', params], Gio.SubprocessFlags.STDOUT_PIPE + Gio.SubprocessFlags.STDERR_MERGE); ++ let shellProc = Gio.Subprocess.new(['@shell@', EXTENSIONDIR + '/extra/create.sh', params], Gio.SubprocessFlags.STDOUT_PIPE + Gio.SubprocessFlags.STDERR_MERGE); + + shellProc.wait_async(null, function (obj, result) { + let shellProcExited = true; +@@ -432,7 +432,7 @@ const TaskService = class TaskService { + let shellProc; + + try { +- shellProc = Gio.Subprocess.new(['task', 'sync'], Gio.SubprocessFlags.STDOUT_PIPE); ++ shellProc = Gio.Subprocess.new(['@task@', 'sync'], Gio.SubprocessFlags.STDOUT_PIPE); + } catch (err) { + onError(err); + return; diff --git a/pkgs/desktops/gnome/extensions/tilingnome/default.nix b/pkgs/desktops/gnome/extensions/tilingnome/default.nix new file mode 100644 index 0000000000000..c1ca77d9d73f2 --- /dev/null +++ b/pkgs/desktops/gnome/extensions/tilingnome/default.nix @@ -0,0 +1,38 @@ +{ stdenv, lib, fetchFromGitHub, glib, gnome }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-tilingnome-unstable"; + version = "unstable-2019-09-19"; + + src = fetchFromGitHub { + owner = "rliang"; + repo = "gnome-shell-extension-tilingnome"; + rev = "f401c20c9721d85e6b3e30d1e822a200db370407"; + sha256 = "1hq9g9bxqpzqrdj9zm0irld8r6q4w1m4b00jya7wsny8rzb1s0y2"; + }; + + nativeBuildInputs = [ glib ]; + + buildPhase = '' + runHook preBuild + glib-compile-schemas . + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/gnome-shell/extensions/${uuid} + cp -r * $out/share/gnome-shell/extensions/${uuid}/ + runHook postInstall + ''; + + uuid = "tilingnome@rliang.github.com"; + + meta = with lib; { + description = "Tiling window management for GNOME Shell"; + license = licenses.gpl2; + maintainers = with maintainers; [ benley ]; + homepage = "https://github.com/rliang/gnome-shell-extension-tilingnome"; + platforms = gnome.gnome-shell.meta.platforms; + }; +} diff --git a/pkgs/desktops/gnome/extensions/timepp/default.nix b/pkgs/desktops/gnome/extensions/timepp/default.nix new file mode 100644 index 0000000000000..cb4234a2513c2 --- /dev/null +++ b/pkgs/desktops/gnome/extensions/timepp/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchFromGitHub, gnome }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-timepp"; + version = "unstable-2020-03-15"; + + src = fetchFromGitHub { + owner = "zagortenay333"; + repo = "timepp__gnome"; + rev = "34ae477a51267cc1e85992a80cf85a1a7b7005c1"; + sha256 = "1v0xbrp0x5dwizscxh7h984pax4n92bj8iyw3qvjk27ynpxq8ag1"; + }; + + uuid = "timepp@zagortenay333"; + installPhase = '' + runHook preInstall + mkdir -p $out/share/gnome-shell/extensions/${uuid} + cp -r . $out/share/gnome-shell/extensions/${uuid} + runHook postInstall + ''; + + meta = with lib; { + description = "A todo.txt manager, time tracker, timer, stopwatch, pomodoro, and alarms gnome-shell extension."; + homepage = "https://github.com/zagortenay333/timepp__gnome"; + license = licenses.gpl3; + maintainers = with maintainers; [ svsdep ]; + }; +} diff --git a/pkgs/desktops/gnome/extensions/topicons-plus/default.nix b/pkgs/desktops/gnome/extensions/topicons-plus/default.nix new file mode 100644 index 0000000000000..084548e1a1053 --- /dev/null +++ b/pkgs/desktops/gnome/extensions/topicons-plus/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchFromGitHub, glib, gettext }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-topicons-plus"; + version = "27"; + + src = fetchFromGitHub { + owner = "phocean"; + repo = "TopIcons-plus"; + rev = version; + sha256 = "1p3jlvs4zgnrvy8am7myivv4rnnshjp49kg87rd22qqyvcz51ykr"; + }; + + buildInputs = [ glib ]; + + nativeBuildInputs = [ gettext ]; + + makeFlags = [ "INSTALL_PATH=$(out)/share/gnome-shell/extensions" ]; + + uuid = "TopIcons@phocean.net"; + + meta = with lib; { + description = "Brings all icons back to the top panel, so that it's easier to keep track of apps running in the backround"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ eperuffo ]; + homepage = "https://github.com/phocean/TopIcons-plus"; + }; +} diff --git a/pkgs/desktops/gnome/extensions/unite/default.nix b/pkgs/desktops/gnome/extensions/unite/default.nix new file mode 100644 index 0000000000000..1fbd31ec10a53 --- /dev/null +++ b/pkgs/desktops/gnome/extensions/unite/default.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, gnome, fetchFromGitHub, xprop, glib }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-unite"; + version = "53"; + + src = fetchFromGitHub { + owner = "hardpixel"; + repo = "unite-shell"; + rev = "v${version}"; + sha256 = "0fw9wqf362h2yd67fhgbhqx0b2fwcl25wxmb92dqwigxjcj0dnw6"; + }; + + uuid = "unite@hardpixel.eu"; + + nativeBuildInputs = [ glib ]; + + buildInputs = [ xprop ]; + + buildPhase = '' + runHook preBuild + glib-compile-schemas --strict --targetdir=${uuid}/schemas/ ${uuid}/schemas + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/gnome-shell/extensions + cp -r ${uuid} $out/share/gnome-shell/extensions + runHook postInstall + ''; + + meta = with lib; { + description = "Unite is a GNOME Shell extension which makes a few layout tweaks to the top panel and removes window decorations to make it look like Ubuntu Unity Shell"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ rhoriguchi ]; + homepage = "https://github.com/hardpixel/unite-shell"; + broken = versionOlder gnome.gnome-shell.version "3.32"; + }; +} diff --git a/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix b/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix new file mode 100644 index 0000000000000..0e71345bb8a7b --- /dev/null +++ b/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromGitHub, gnome }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-window-corner-preview"; + version = "unstable-2019-04-03"; + + src = fetchFromGitHub { + owner = "medenagan"; + repo = "window-corner-preview"; + rev = "a95bb1389d94474efab7509aac592fb58fff6006"; + sha256 = "03v18j9l0fb64xrg3swf1vcgl0kpgwjlp8ddn068bpvghrsvgfah"; + }; + + dontBuild = true; + + uuid = "window-corner-preview@fabiomereu.it"; + installPhase = '' + runHook preInstall + mkdir -p $out/share/gnome-shell/extensions + cp -r ${uuid} $out/share/gnome-shell/extensions + runHook postInstall + ''; + + meta = with lib; { + description = "GNOME Shell extension showing a video preview on the corner of the screen"; + license = licenses.mit; + maintainers = with maintainers; [ jtojnar ]; + homepage = "https://github.com/medenagan/window-corner-preview"; + broken = lib.versionAtLeast gnome.gnome-shell.version "3.32"; # Doesn't support 3.34 + }; +} diff --git a/pkgs/desktops/gnome/extensions/window-is-ready-remover/default.nix b/pkgs/desktops/gnome/extensions/window-is-ready-remover/default.nix new file mode 100644 index 0000000000000..3f0e9e71b571b --- /dev/null +++ b/pkgs/desktops/gnome/extensions/window-is-ready-remover/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-window-is-ready-remover"; + version = "1.02"; + + src = fetchFromGitHub { + owner = "nunofarruca"; + repo = "WindowIsReady_Remover"; + rev = "v${version}"; + sha256 = "1xaf95gn0if44avvkjxyf8fl29y28idn9shnrks0m9k67jcwv8ns"; + }; + + uuid = "windowIsReady_Remover@nunofarruca@gmail.com"; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/gnome-shell/extensions/ + cp -r ${uuid} $out/share/gnome-shell/extensions/${uuid} + runHook postInstall + ''; + + meta = with lib; { + description = "GNOME Shell extension removing window is ready notification"; + homepage = "https://github.com/nunofarruca/WindowIsReady_Remover"; + license = licenses.asl20; + }; +} diff --git a/pkgs/desktops/gnome/extensions/workspace-matrix/default.nix b/pkgs/desktops/gnome/extensions/workspace-matrix/default.nix new file mode 100644 index 0000000000000..eb1d6e7e319c6 --- /dev/null +++ b/pkgs/desktops/gnome/extensions/workspace-matrix/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, fetchFromGitHub, findutils, glib }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-workspace-matrix"; + version = "4.0.2"; + + src = fetchFromGitHub { + owner = "mzur"; + repo = "gnome-shell-wsmatrix"; + rev = "v${version}"; + sha256 = "0dbn6b3fdd7yblk0mhsmaiqs3mwgcf3khkx1dsnlqn5hcs0a3myd"; + }; + + uuid = "wsmatrix@martin.zurowietz.de"; + + nativeBuildInputs = [ + findutils + glib + ]; + + buildFlags = "schemas"; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/gnome-shell/extensions + cp -r ${uuid} $out/share/gnome-shell/extensions + runHook postInstall + ''; + + meta = with lib; { + description = "Arrange workspaces in a two dimensional grid with workspace thumbnails"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ chkno ]; + homepage = "https://github.com/mzur/gnome-shell-wsmatrix"; + }; +} diff --git a/pkgs/desktops/gnome/find-latest-version.py b/pkgs/desktops/gnome/find-latest-version.py new file mode 100644 index 0000000000000..3078999e3e5bf --- /dev/null +++ b/pkgs/desktops/gnome/find-latest-version.py @@ -0,0 +1,89 @@ +import argparse +import math +import json +import requests +import sys +from libversion import Version +from typing import Optional + + +def version_to_list(version): + return list(map(int, version.split("."))) + + +def odd_unstable(version: Version, selected): + try: + version = version_to_list(version.value) + except: + # Failing to parse as a list of numbers likely means the version contains a string tag like “beta”, therefore it is not a stable release. + return selected != "stable" + + if len(version) < 2: + return True + + even = version[1] % 2 == 0 + prerelease = (version[1] >= 90 and version[1] < 100) or (version[1] >= 900 and version[1] < 1000) + stable = even and not prerelease + if selected == "stable": + return stable + else: + return True + + +def tagged(version: Version, selected): + if selected == "stable": + return not ("alpha" in version.value or "beta" in version.value or "rc" in version.value) + else: + return True + + +def no_policy(version: Version, selected): + return True + + +version_policies = { + "odd-unstable": odd_unstable, + "tagged": tagged, + "none": no_policy, +} + + +def make_version_policy(version_predicate, selected, upper_bound: Optional[Version]): + if not upper_bound: + return lambda version: version_predicate(version, selected) + else: + return lambda version: version_predicate(version, selected) and version < upper_bound + + +parser = argparse.ArgumentParser(description="Find latest version for a GNOME package by crawling their release server.") +parser.add_argument("package-name", help="Name of the directory in https://ftp.gnome.org/pub/GNOME/sources/ containing the package.") +parser.add_argument("version-policy", help="Policy determining which versions are considered stable. GNOME packages usually denote stability by alpha/beta/rc tag in the version. For older packages, odd minor versions are unstable but there are exceptions.", choices=version_policies.keys(), nargs="?", default="tagged") +parser.add_argument("requested-release", help="Most of the time, we will want to update to stable version but sometimes it is useful to test.", choices=["stable", "unstable"], nargs="?", default="stable") +parser.add_argument("--upper-bound", dest="upper-bound", help="Only look for versions older than this one (useful for pinning dependencies).") + + +if __name__ == "__main__": + args = parser.parse_args() + + package_name = getattr(args, "package-name") + requested_release = getattr(args, "requested-release") + upper_bound = getattr(args, "upper-bound") + if upper_bound: + upper_bound = Version(upper_bound) + version_predicate = version_policies[getattr(args, "version-policy")] + version_policy = make_version_policy(version_predicate, requested_release, upper_bound) + + # The structure of cache.json: https://gitlab.gnome.org/Infrastructure/sysadmin-bin/blob/master/ftpadmin#L762 + cache = json.loads(requests.get(f"https://ftp.gnome.org/pub/GNOME/sources/{package_name}/cache.json").text) + if type(cache) != list or cache[0] != 4: + print("Unknown format of cache.json file.", file=sys.stderr) + sys.exit(1) + + versions = map(Version, cache[2][package_name]) + versions = sorted(filter(version_policy, versions)) + + if len(versions) == 0: + print("No versions matched.", file=sys.stderr) + sys.exit(1) + + print(versions[-1].value) diff --git a/pkgs/desktops/gnome/games/aisleriot/default.nix b/pkgs/desktops/gnome/games/aisleriot/default.nix new file mode 100644 index 0000000000000..8893846698e80 --- /dev/null +++ b/pkgs/desktops/gnome/games/aisleriot/default.nix @@ -0,0 +1,77 @@ +{ lib, stdenv +, fetchFromGitLab +, pkg-config +, gnome +, itstool +, gtk3 +, wrapGAppsHook +, meson +, librsvg +, libxml2 +, desktop-file-utils +, pysolfc +, guile +, libcanberra-gtk3 +, ninja +, appstream-glib +, yelp-tools +}: + +stdenv.mkDerivation rec { + pname = "aisleriot"; + version = "3.22.13"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = pname; + rev = version; + sha256 = "05k84bbgrrxchxg08l1jjcz384kpjdmxd24g0wnf731aa9zcnp5k"; + }; + + nativeBuildInputs = [ + wrapGAppsHook + meson + ninja + appstream-glib + pkg-config + itstool + libxml2 + desktop-file-utils + yelp-tools + ]; + + buildInputs = [ + gtk3 + librsvg + guile + libcanberra-gtk3 + pysolfc + ]; + + prePatch = '' + patchShebangs cards/meson_svgz.sh + patchShebangs data/meson_desktopfile.py + patchShebangs data/icons/meson_updateiconcache.py + patchShebangs src/lib/meson_compileschemas.py + ''; + + mesonFlags = [ + "-Dtheme_kde=false" + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Aisleriot"; + description = "A collection of patience games written in guile scheme"; + maintainers = teams.gnome.members; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/games/atomix/default.nix b/pkgs/desktops/gnome/games/atomix/default.nix new file mode 100644 index 0000000000000..43d9aaa7680c5 --- /dev/null +++ b/pkgs/desktops/gnome/games/atomix/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, wrapGAppsHook, python3 +, gettext, gnome, glib, gtk3, libgnome-games-support, gdk-pixbuf }: + +let + pname = "atomix"; + version = "3.34.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; + sha256 = "0h909a4mccf160hi0aimyicqhq2b0gk1dmqp7qwf87qghfrw6m00"; + }; + + nativeBuildInputs = [ meson ninja pkg-config gettext wrapGAppsHook python3 ]; + buildInputs = [ glib gtk3 gdk-pixbuf libgnome-games-support gnome.adwaita-icon-theme ]; + + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + }; + }; + + meta = with lib; { + description = "Puzzle game where you move atoms to build a molecule"; + homepage = "https://wiki.gnome.org/Apps/Atomix"; + license = licenses.gpl2Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/games/five-or-more/default.nix b/pkgs/desktops/gnome/games/five-or-more/default.nix new file mode 100644 index 0000000000000..f01d137979ec1 --- /dev/null +++ b/pkgs/desktops/gnome/games/five-or-more/default.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gnome, gtk3, wrapGAppsHook +, librsvg, libgnome-games-support, gettext, itstool, libxml2, python3, vala }: + +stdenv.mkDerivation rec { + pname = "five-or-more"; + version = "3.32.2"; + + src = fetchurl { + url = "mirror://gnome/sources/five-or-more/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "19pf8wzbf3ciqf2k4bj9sddvyhckfd62x86pnqr6s8h4vn9jc6ii"; + }; + + nativeBuildInputs = [ + meson ninja pkg-config gettext itstool libxml2 python3 wrapGAppsHook + vala + ]; + buildInputs = [ + gtk3 librsvg libgnome-games-support gnome.adwaita-icon-theme + ]; + + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = "five-or-more"; + attrPath = "gnome.five-or-more"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Five_or_more"; + description = "Remove colored balls from the board by forming lines"; + maintainers = teams.gnome.members; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/games/four-in-a-row/default.nix b/pkgs/desktops/gnome/games/four-in-a-row/default.nix new file mode 100644 index 0000000000000..2c6899ee1aa90 --- /dev/null +++ b/pkgs/desktops/gnome/games/four-in-a-row/default.nix @@ -0,0 +1,39 @@ +{ lib, stdenv, fetchurl, pkg-config, gnome, gtk3, wrapGAppsHook +, gettext, meson, gsound, librsvg, itstool, vala +, python3, ninja, desktop-file-utils }: + +stdenv.mkDerivation rec { + pname = "four-in-a-row"; + version = "3.38.1"; + + src = fetchurl { + url = "mirror://gnome/sources/four-in-a-row/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "10ji60bdfdzb6wk5dkwjc3yww7hqi3yjcx1k1z7x2521h2dpdli1"; + }; + + nativeBuildInputs = [ + pkg-config wrapGAppsHook gettext meson itstool vala + ninja python3 desktop-file-utils + ]; + buildInputs = [ gtk3 gsound librsvg gnome.adwaita-icon-theme ]; + + postPatch = '' + chmod +x build-aux/meson_post_install.py + patchShebangs build-aux/meson_post_install.py + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = "four-in-a-row"; + attrPath = "gnome.four-in-a-row"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Four-in-a-row"; + description = "Make lines of the same color to win"; + maintainers = teams.gnome.members; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/games/gnome-chess/default.nix b/pkgs/desktops/gnome/games/gnome-chess/default.nix new file mode 100644 index 0000000000000..c632bce407bc4 --- /dev/null +++ b/pkgs/desktops/gnome/games/gnome-chess/default.nix @@ -0,0 +1,68 @@ +{ lib +, stdenv +, fetchurl +, meson +, ninja +, vala +, pkg-config +, wrapGAppsHook4 +, gobject-introspection +, gettext +, itstool +, libxml2 +, python3 +, gnome +, glib +, gtk4 +, librsvg +}: + +stdenv.mkDerivation rec { + pname = "gnome-chess"; + version = "40.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-chess/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "132nc96z0bryyi9d5gljsbwsa71rl8wm5w57jbhpwiv4fyjhgybk"; + }; + + nativeBuildInputs = [ + meson + ninja + vala + pkg-config + gettext + itstool + libxml2 + python3 + wrapGAppsHook4 + gobject-introspection + ]; + + buildInputs = [ + glib + gtk4 + librsvg + gnome.adwaita-icon-theme + ]; + + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-chess"; + attrPath = "gnome.gnome-chess"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Chess"; + description = "Play the classic two-player boardgame of chess"; + maintainers = teams.gnome.members; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/games/gnome-klotski/default.nix b/pkgs/desktops/gnome/games/gnome-klotski/default.nix new file mode 100644 index 0000000000000..bb4cdae8fa358 --- /dev/null +++ b/pkgs/desktops/gnome/games/gnome-klotski/default.nix @@ -0,0 +1,43 @@ +{ lib, stdenv, fetchurl, pkg-config, vala, gnome, gtk3, wrapGAppsHook, appstream-glib, desktop-file-utils +, glib, librsvg, libxml2, gettext, itstool, libgee, libgnome-games-support +, meson, ninja, python3 +}: + +let + pname = "gnome-klotski"; + version = "3.38.2"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; + sha256 = "1qm01hdd5yp8chig62bj10912vclbdvywwczs84sfg4zci2phqwi"; + }; + + nativeBuildInputs = [ + pkg-config vala meson ninja python3 wrapGAppsHook + gettext itstool libxml2 appstream-glib desktop-file-utils + gnome.adwaita-icon-theme + ]; + buildInputs = [ glib gtk3 librsvg libgee libgnome-games-support ]; + + postPatch = '' + chmod +x build-aux/meson_post_install.py + patchShebangs build-aux/meson_post_install.py + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Klotski"; + description = "Slide blocks to solve the puzzle"; + maintainers = teams.gnome.members; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix new file mode 100644 index 0000000000000..7ef68e470e1d6 --- /dev/null +++ b/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix @@ -0,0 +1,41 @@ +{ lib, stdenv, fetchurl, pkg-config, gnome, gtk3, wrapGAppsHook +, librsvg, gettext, itstool, libxml2 +, meson, ninja, glib, vala, desktop-file-utils +}: + +stdenv.mkDerivation rec { + pname = "gnome-mahjongg"; + version = "3.38.3"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-mahjongg/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "144ia3zn9rhwa1xbdkvsz6m0dsysl6mxvqw9bnrlh845hmyy9cfj"; + }; + + nativeBuildInputs = [ + meson ninja vala desktop-file-utils + pkg-config gnome.adwaita-icon-theme + libxml2 itstool gettext wrapGAppsHook + glib # for glib-compile-schemas + ]; + buildInputs = [ + glib + gtk3 + librsvg + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Mahjongg"; + description = "Disassemble a pile of tiles by removing matching pairs"; + maintainers = teams.gnome.members; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/games/gnome-mines/default.nix b/pkgs/desktops/gnome/games/gnome-mines/default.nix new file mode 100644 index 0000000000000..6a7168badbfee --- /dev/null +++ b/pkgs/desktops/gnome/games/gnome-mines/default.nix @@ -0,0 +1,39 @@ +{ lib, stdenv, fetchurl, meson, ninja, vala, gobject-introspection, pkg-config, gnome, gtk3, wrapGAppsHook +, librsvg, gettext, itstool, python3, libxml2, libgnome-games-support, libgee, desktop-file-utils }: + +stdenv.mkDerivation rec { + pname = "gnome-mines"; + version = "40.0"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0sf6kdvhr4pr3hddnj6ql9larz2wy108sri31id6x9g459nbly8z"; + }; + + # gobject-introspection for finding vapi files + nativeBuildInputs = [ + meson ninja vala gobject-introspection pkg-config gettext itstool python3 + libxml2 wrapGAppsHook desktop-file-utils + ]; + buildInputs = [ gtk3 librsvg gnome.adwaita-icon-theme libgnome-games-support libgee ]; + + postPatch = '' + chmod +x build-aux/meson_post_install.py + patchShebangs build-aux/meson_post_install.py + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-mines"; + attrPath = "gnome.gnome-mines"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Mines"; + description = "Clear hidden mines from a minefield"; + maintainers = teams.gnome.members; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome/games/gnome-nibbles/default.nix new file mode 100644 index 0000000000000..34b50f2244fa9 --- /dev/null +++ b/pkgs/desktops/gnome/games/gnome-nibbles/default.nix @@ -0,0 +1,84 @@ +{ lib +, stdenv +, fetchurl +, fetchpatch +, pkg-config +, gnome +, gtk3 +, wrapGAppsHook +, librsvg +, gsound +, clutter-gtk +, gettext +, itstool +, vala +, python3 +, libxml2 +, libgee +, libgnome-games-support +, meson +, ninja +, desktop-file-utils +, hicolor-icon-theme +}: + +stdenv.mkDerivation rec { + pname = "gnome-nibbles"; + version = "3.38.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-nibbles/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1naknfbciydbym79a0jq039xf0033z8gyln48c0qsbcfr2qn8yj5"; + }; + + patches = [ + # Fix build with recent Vala. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-nibbles/-/commit/62964e9256fcac616109af874dbb2bd8342a9853.patch"; + sha256 = "4VijELRxycS8rwi1HU9U3h9K/VtdQjJntfdtMN9Uz34="; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-nibbles/-/commit/1b48446068608aff9b5edf1fdbd4b8c0d9f0be94.patch"; + sha256 = "X0+Go5ae4F06WTPDYc2HIIax8X4RDgUGO6A6Qp8UifQ="; + }) + ]; + + nativeBuildInputs = [ + meson + ninja + vala + python3 + pkg-config + wrapGAppsHook + gettext + itstool + libxml2 + desktop-file-utils + hicolor-icon-theme + ]; + + buildInputs = [ + gtk3 + librsvg + gsound + clutter-gtk + gnome.adwaita-icon-theme + libgee + libgnome-games-support + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-nibbles"; + attrPath = "gnome.gnome-nibbles"; + }; + }; + + meta = with lib; { + description = "Guide a worm around a maze"; + homepage = "https://wiki.gnome.org/Apps/Nibbles"; + license = licenses.gpl2; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/games/gnome-robots/default.nix b/pkgs/desktops/gnome/games/gnome-robots/default.nix new file mode 100644 index 0000000000000..c9f7cbfc213be --- /dev/null +++ b/pkgs/desktops/gnome/games/gnome-robots/default.nix @@ -0,0 +1,73 @@ +{ lib +, stdenv +, fetchurl +, pkg-config +, gnome +, gtk3 +, wrapGAppsHook +, librsvg +, gsound +, gettext +, itstool +, libxml2 +, libgnome-games-support +, libgee +, meson +, ninja +, vala +, python3 +, desktop-file-utils +, adwaita-icon-theme +}: + +stdenv.mkDerivation rec { + pname = "gnome-robots"; + version = "40.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-robots/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "04fbykj576dq1h6cycgfhh8wd6yxmlsqykvj188sbwahay42zgvg"; + }; + + nativeBuildInputs = [ + pkg-config + meson + ninja + vala + python3 + libxml2 + wrapGAppsHook + gettext + itstool + desktop-file-utils + ]; + + buildInputs = [ + gtk3 + librsvg + gsound + libgnome-games-support + libgee + adwaita-icon-theme + ]; + + postPatch = '' + chmod +x build-aux/meson_post_install.py + patchShebangs build-aux/meson_post_install.py + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-robots"; + attrPath = "gnome.gnome-robots"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Robots"; + description = "Avoid the robots and make them crash into each other"; + maintainers = teams.gnome.members; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome/games/gnome-sudoku/default.nix new file mode 100644 index 0000000000000..3bd0ec3b3cdf2 --- /dev/null +++ b/pkgs/desktops/gnome/games/gnome-sudoku/default.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchurl, meson, ninja, vala, pkg-config, gobject-introspection, gettext, gtk3, gnome, wrapGAppsHook +, libgee, json-glib, qqwing, itstool, libxml2, python3, desktop-file-utils }: + +stdenv.mkDerivation rec { + pname = "gnome-sudoku"; + version = "40.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "1nr1g4q1gxqbzmaz15y3zgssnj7w01cq9l422ja4rglyg0fwjhbm"; + }; + + nativeBuildInputs = [ meson ninja vala pkg-config gobject-introspection gettext itstool libxml2 python3 desktop-file-utils wrapGAppsHook ]; + buildInputs = [ gtk3 libgee json-glib qqwing ]; + + postPatch = '' + chmod +x build-aux/post_install.py + patchShebangs build-aux/post_install.py + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-sudoku"; + attrPath = "gnome.gnome-sudoku"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Sudoku"; + description = "Test your logic skills in this number grid puzzle"; + maintainers = teams.gnome.members; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/games/gnome-taquin/default.nix b/pkgs/desktops/gnome/games/gnome-taquin/default.nix new file mode 100644 index 0000000000000..c3e78ff201446 --- /dev/null +++ b/pkgs/desktops/gnome/games/gnome-taquin/default.nix @@ -0,0 +1,75 @@ +{ lib +, stdenv +, fetchurl +, fetchpatch +, pkg-config +, gnome +, gtk3 +, wrapGAppsHook +, librsvg +, gsound +, gettext +, itstool +, libxml2 +, meson +, ninja +, vala +, python3 +, desktop-file-utils +}: + +stdenv.mkDerivation rec { + pname = "gnome-taquin"; + version = "3.38.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-taquin/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0kw131q0ad0rbsp6qifjc8fjlhvjxyihil8a76kj8ya9mn7kvnwn"; + }; + + patches = [ + # Fix build with recent Vala. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-taquin/-/commit/99dea5e7863e112f33f16e59898c56a4f1a547b3.patch"; + sha256 = "U7djuMhb1XJaKAPyogQjaunOkbBK24r25YD7BgH05P4="; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-taquin/-/commit/66be44dc20d114e449fc33156e3939fd05dfbb16.patch"; + sha256 = "RN41RCLHlJyXTARSH9qjsmpYi1UFeMRssoYxRsbngDQ="; + }) + ]; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook + meson + ninja + python3 + gettext + itstool + libxml2 + vala + desktop-file-utils + ]; + buildInputs = [ + gtk3 + librsvg + gsound + gnome.adwaita-icon-theme + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-taquin"; + attrPath = "gnome.gnome-taquin"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Taquin"; + description = "Move tiles so that they reach their places"; + maintainers = teams.gnome.members; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome/games/gnome-tetravex/default.nix new file mode 100644 index 0000000000000..a1cdf98d9a155 --- /dev/null +++ b/pkgs/desktops/gnome/games/gnome-tetravex/default.nix @@ -0,0 +1,39 @@ +{ lib, stdenv, fetchurl, pkg-config, gnome, gtk3, wrapGAppsHook +, libxml2, gettext, itstool, meson, ninja, python3 +, vala, desktop-file-utils +}: + +stdenv.mkDerivation rec { + pname = "gnome-tetravex"; + version = "3.38.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-tetravex/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "06wihvqp2p52zd2dnknsc3rii69qib4a30yp15h558xrg44z3k8z"; + }; + + passthru = { + updateScript = gnome.updateScript { packageName = "gnome-tetravex"; attrPath = "gnome.gnome-tetravex"; }; + }; + + nativeBuildInputs = [ + wrapGAppsHook itstool libxml2 gnome.adwaita-icon-theme + pkg-config gettext meson ninja python3 vala desktop-file-utils + ]; + buildInputs = [ + gtk3 + ]; + + postPatch = '' + chmod +x build-aux/meson_post_install.py + patchShebangs build-aux/meson_post_install.py + ''; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Tetravex"; + description = "Complete the puzzle by matching numbered tiles"; + maintainers = teams.gnome.members; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/games/hitori/default.nix b/pkgs/desktops/gnome/games/hitori/default.nix new file mode 100644 index 0000000000000..1dc07bae26b12 --- /dev/null +++ b/pkgs/desktops/gnome/games/hitori/default.nix @@ -0,0 +1,66 @@ +{ lib, stdenv +, fetchurl +, meson +, ninja +, pkg-config +, gnome +, glib +, gtk3 +, cairo +, wrapGAppsHook +, libxml2 +, python3 +, gettext +, itstool +, desktop-file-utils +, adwaita-icon-theme +}: + +stdenv.mkDerivation rec { + pname = "hitori"; + version = "3.38.1"; + + src = fetchurl { + url = "mirror://gnome/sources/hitori/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "Ar0sQh1OIYAmVxToVL0S79PG0Vbd8h95599gAR1OQYQ="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + itstool + desktop-file-utils + libxml2 + python3 + wrapGAppsHook + ]; + + buildInputs = [ + glib + gtk3 + cairo + adwaita-icon-theme + ]; + + postPatch = '' + chmod +x build-aux/meson_post_install.py + patchShebangs build-aux/meson_post_install.py + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Hitori"; + description = "GTK application to generate and let you play games of Hitori"; + maintainers = teams.gnome.members; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/games/iagno/default.nix b/pkgs/desktops/gnome/games/iagno/default.nix new file mode 100644 index 0000000000000..d7e3930eae1ec --- /dev/null +++ b/pkgs/desktops/gnome/games/iagno/default.nix @@ -0,0 +1,77 @@ +{ lib, stdenv +, fetchurl +, fetchpatch +, pkg-config +, gtk3 +, gnome +, gdk-pixbuf +, librsvg +, wrapGAppsHook +, itstool +, gsound +, libxml2 +, meson +, ninja +, python3 +, vala +, desktop-file-utils +}: + +stdenv.mkDerivation rec { + pname = "iagno"; + version = "3.38.1"; + + src = fetchurl { + url = "mirror://gnome/sources/iagno/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "097dw1l92l73xah9l56ka5mi3dvx48ffpiv33ni5i5rqw0ng7fc4"; + }; + + patches = [ + # Fix build with recent Vala. + # https://gitlab.gnome.org/GNOME/dconf-editor/-/merge_requests/15 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/iagno/-/commit/e8a0aeec350ea80349582142c0e8e3cd3f1bce38.patch"; + sha256 = "OO1x0Yx56UFzHTBsPAMYAjnJHlnTjdO1Vk7q6XU8wKQ="; + }) + # https://gitlab.gnome.org/GNOME/dconf-editor/-/merge_requests/13 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/iagno/-/commit/508c0f94e5f182e50ff61be6e04f72574dee97cb.patch"; + sha256 = "U7djuMhb1XJaKAPyogQjaunOkbBK24r25YD7BgH05P4="; + }) + ]; + + nativeBuildInputs = [ + meson + ninja + python3 + vala + desktop-file-utils + pkg-config + wrapGAppsHook + itstool + libxml2 + ]; + + buildInputs = [ + gtk3 + gnome.adwaita-icon-theme + gdk-pixbuf + librsvg + gsound + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = "iagno"; + attrPath = "gnome.iagno"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Iagno"; + description = "Computer version of the game Reversi, more popularly called Othello"; + maintainers = teams.gnome.members; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/games/lightsoff/default.nix b/pkgs/desktops/gnome/games/lightsoff/default.nix new file mode 100644 index 0000000000000..94b71f0e8568c --- /dev/null +++ b/pkgs/desktops/gnome/games/lightsoff/default.nix @@ -0,0 +1,39 @@ +{ lib, stdenv, fetchurl, vala, pkg-config, gtk3, gnome, gdk-pixbuf, librsvg, wrapGAppsHook +, gettext, itstool, clutter, clutter-gtk, libxml2, appstream-glib +, meson, ninja, python3 }: + +stdenv.mkDerivation rec { + pname = "lightsoff"; + version = "40.0.1"; + + src = fetchurl { + url = "mirror://gnome/sources/lightsoff/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "1aziy64g15bm83zfn3ifs20z9yvscdvsxbx132xnq77i0r3qvlxc"; + }; + + nativeBuildInputs = [ + vala pkg-config wrapGAppsHook itstool gettext appstream-glib libxml2 + meson ninja python3 + ]; + buildInputs = [ gtk3 gnome.adwaita-icon-theme gdk-pixbuf librsvg clutter clutter-gtk ]; + + postPatch = '' + chmod +x build-aux/meson_post_install.py + patchShebangs build-aux/meson_post_install.py + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = "lightsoff"; + attrPath = "gnome.lightsoff"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Lightsoff"; + description = "Puzzle game, where the objective is to turn off all of the tiles on the board"; + maintainers = teams.gnome.members; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/games/quadrapassel/default.nix b/pkgs/desktops/gnome/games/quadrapassel/default.nix new file mode 100644 index 0000000000000..d54c49eafee28 --- /dev/null +++ b/pkgs/desktops/gnome/games/quadrapassel/default.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, fetchurl, pkg-config, gtk3, gnome, gdk-pixbuf +, librsvg, gsound, libmanette +, gettext, itstool, libxml2, clutter, clutter-gtk, wrapGAppsHook +, meson, ninja, python3, vala, desktop-file-utils +}: + +stdenv.mkDerivation rec { + pname = "quadrapassel"; + version = "3.38.1"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "033plabc6q3sk6qjr5nml8z6p07vcw57gxddxjk9b65wgg0rzzhr"; + }; + + nativeBuildInputs = [ + meson ninja python3 vala desktop-file-utils + pkg-config gnome.adwaita-icon-theme + libxml2 itstool gettext wrapGAppsHook + ]; + buildInputs = [ + gtk3 gdk-pixbuf librsvg libmanette + gsound clutter libxml2 clutter-gtk + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + }; + }; + + meta = with lib; { + description = "Classic falling-block game, Tetris"; + homepage = "https://wiki.gnome.org/Apps/Quadrapassel"; + license = licenses.gpl2; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/games/swell-foop/default.nix b/pkgs/desktops/gnome/games/swell-foop/default.nix new file mode 100644 index 0000000000000..50fab598153ad --- /dev/null +++ b/pkgs/desktops/gnome/games/swell-foop/default.nix @@ -0,0 +1,72 @@ +{ lib +, stdenv +, fetchurl +, meson +, ninja +, pkg-config +, vala +, glib +, gtk3 +, libgnome-games-support +, gnome +, desktop-file-utils +, clutter +, clutter-gtk +, gettext +, itstool +, libxml2 +, wrapGAppsHook +, python3 +}: + +stdenv.mkDerivation rec { + pname = "swell-foop"; + version = "40.1"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "17r4b0g8s7z872wdd7ngk248z7fqx43vm2sym1bdqhzsi250s1y1"; + }; + + nativeBuildInputs = [ + meson + ninja + vala + pkg-config + wrapGAppsHook + python3 + itstool + gettext + libxml2 + desktop-file-utils + ]; + + buildInputs = [ + glib + gtk3 + libgnome-games-support + gnome.adwaita-icon-theme + clutter + clutter-gtk + ]; + + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Swell%20Foop"; + description = "Puzzle game, previously known as Same GNOME"; + maintainers = teams.gnome.members; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/games/tali/default.nix b/pkgs/desktops/gnome/games/tali/default.nix new file mode 100644 index 0000000000000..3e2abc8730468 --- /dev/null +++ b/pkgs/desktops/gnome/games/tali/default.nix @@ -0,0 +1,38 @@ +{ lib, stdenv, fetchurl, pkg-config, gtk3, gnome, gdk-pixbuf +, librsvg, libgnome-games-support, gettext, itstool, libxml2, wrapGAppsHook +, meson, ninja, python3, desktop-file-utils +}: + +stdenv.mkDerivation rec { + pname = "tali"; + version = "40.0"; + + src = fetchurl { + url = "mirror://gnome/sources/tali/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "19gic6yjg3bg6jf87zvhm7ihsz1y58dz86p4x3a16xdhjyrk40q2"; + }; + + passthru = { + updateScript = gnome.updateScript { packageName = "tali"; attrPath = "gnome.tali"; }; + }; + + nativeBuildInputs = [ + meson ninja python3 desktop-file-utils + pkg-config gnome.adwaita-icon-theme + libxml2 itstool gettext wrapGAppsHook + ]; + buildInputs = [ gtk3 gdk-pixbuf librsvg libgnome-games-support ]; + + postPatch = '' + chmod +x build-aux/meson_post_install.py + patchShebangs build-aux/meson_post_install.py + ''; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Tali"; + description = "Sort of poker with dice and less money"; + maintainers = teams.gnome.members; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/installer.nix b/pkgs/desktops/gnome/installer.nix new file mode 100644 index 0000000000000..4999e1f3343cf --- /dev/null +++ b/pkgs/desktops/gnome/installer.nix @@ -0,0 +1,15 @@ +{ isoBaseName ? "nixos-graphical-gnome", system ? builtins.currentSystem +, extraModules ? [] }: + +let + + module = ../../../../nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix; + + config = (import ../../../../nixos/lib/eval-config.nix { + inherit system; + modules = [ module { isoImage.isoBaseName = isoBaseName; } ] ++ extraModules; + }).config; + +in + config.system.build.isoImage + diff --git a/pkgs/desktops/gnome/misc/geary/default.nix b/pkgs/desktops/gnome/misc/geary/default.nix new file mode 100644 index 0000000000000..a40cd30eb8da1 --- /dev/null +++ b/pkgs/desktops/gnome/misc/geary/default.nix @@ -0,0 +1,160 @@ +{ lib +, stdenv +, fetchurl +, pkg-config +, gtk3 +, vala +, enchant2 +, wrapGAppsHook +, meson +, ninja +, desktop-file-utils +, gnome-online-accounts +, gsettings-desktop-schemas +, adwaita-icon-theme +, libpeas +, libsecret +, gmime3 +, isocodes +, icu +, libxml2 +, gettext +, sqlite +, gcr +, json-glib +, itstool +, libgee +, gnome +, webkitgtk +, python3 +, gnutls +, cacert +, xvfb_run +, glibcLocales +, dbus +, shared-mime-info +, libunwind +, folks +, glib-networking +, gobject-introspection +, gspell +, appstream-glib +, libstemmer +, libytnef +, libhandy +, gsound +}: + +stdenv.mkDerivation rec { + pname = "geary"; + version = "40.0"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "1c2nd35500ng28223y5pszc7fh8g16njj34f6p5xc9594lvj0mik"; + }; + + nativeBuildInputs = [ + appstream-glib + desktop-file-utils + gettext + gobject-introspection + itstool + libxml2 + meson + ninja + pkg-config + python3 + vala + wrapGAppsHook + ]; + + buildInputs = [ + adwaita-icon-theme + enchant2 + folks + gcr + glib-networking + gmime3 + gnome-online-accounts + gsettings-desktop-schemas + gsound + gspell + gtk3 + isocodes + icu + json-glib + libgee + libhandy + libpeas + libsecret + libunwind + libstemmer + libytnef + sqlite + webkitgtk + ]; + + checkInputs = [ + dbus + gnutls # for certtool + cacert # trust store for glib-networking + xvfb_run + glibcLocales # required by Geary.ImapDb.DatabaseTest/utf8_case_insensitive_collation + ]; + + mesonFlags = [ + "-Dprofile=release" + "-Dcontractor=enabled" # install the contractor file (Pantheon specific) + ]; + + # NOTE: Remove `build-auxyaml_to_json.py` when no longer needed, see: + # https://gitlab.gnome.org/GNOME/geary/commit/f7f72143e0f00ca5e0e6a798691805c53976ae31#0cc1139e3347f573ae1feee5b73dbc8a8a21fcfa + postPatch = '' + chmod +x build-aux/post_install.py build-aux/git_version.py + + patchShebangs build-aux/post_install.py build-aux/git_version.py + + chmod +x build-aux/yaml_to_json.py + patchShebangs build-aux/yaml_to_json.py + + chmod +x desktop/geary-attach + ''; + + # Some tests time out. + doCheck = false; + + checkPhase = '' + runHook preCheck + + NO_AT_BRIDGE=1 \ + GIO_EXTRA_MODULES=$GIO_EXTRA_MODULES:${glib-networking}/lib/gio/modules \ + HOME=$TMPDIR \ + XDG_DATA_DIRS=$XDG_DATA_DIRS:${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${shared-mime-info}/share:${folks}/share/gsettings-schemas/${folks.name} \ + xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ + --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + meson test -v --no-stdsplit + + runHook postCheck + ''; + + preFixup = '' + # Add geary to path for geary-attach + gappsWrapperArgs+=(--prefix PATH : "$out/bin") + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Geary"; + description = "Mail client for GNOME 3"; + maintainers = teams.gnome.members; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/misc/gitg/default.nix b/pkgs/desktops/gnome/misc/gitg/default.nix new file mode 100644 index 0000000000000..8f73bdaeb7da3 --- /dev/null +++ b/pkgs/desktops/gnome/misc/gitg/default.nix @@ -0,0 +1,95 @@ +{ lib +, stdenv +, fetchurl +, vala +, gettext +, pkg-config +, gtk3 +, glib +, json-glib +, wrapGAppsHook +, libpeas +, bash +, gobject-introspection +, libsoup +, gtksourceview +, gsettings-desktop-schemas +, adwaita-icon-theme +, gnome +, gtkspell3 +, shared-mime-info +, libgee +, libgit2-glib +, libsecret +, meson +, ninja +, python3 +, libdazzle +}: + +stdenv.mkDerivation rec { + pname = "gitg"; + version = "3.32.1"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0npg4kqpwl992fgjd2cn3fh84aiwpdp9kd8z7rw2xaj2iazsm914"; + }; + + nativeBuildInputs = [ + gobject-introspection + gettext + meson + ninja + pkg-config + python3 + vala + wrapGAppsHook + ]; + + buildInputs = [ + adwaita-icon-theme + glib + gsettings-desktop-schemas + gtk3 + gtksourceview + gtkspell3 + json-glib + libdazzle + libgee + libgit2-glib + libpeas + libsecret + libsoup + ]; + + doCheck = false; # FAIL: tests-gitg gtk_style_context_add_provider_for_screen: assertion 'GDK_IS_SCREEN (screen)' failed + + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + + substituteInPlace tests/libgitg/test-commit.vala --replace "/bin/bash" "${bash}/bin/bash" + ''; + + preFixup = '' + gappsWrapperArgs+=( + # Thumbnailers + --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" + ) + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Gitg"; + description = "GNOME GUI client to view git repositories"; + maintainers = with maintainers; [ domenkozar ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/misc/gnome-applets/default.nix b/pkgs/desktops/gnome/misc/gnome-applets/default.nix new file mode 100644 index 0000000000000..d414266a9d9e8 --- /dev/null +++ b/pkgs/desktops/gnome/misc/gnome-applets/default.nix @@ -0,0 +1,80 @@ +{ lib, stdenv +, fetchurl +, gettext +, itstool +, libxml2 +, pkg-config +, gnome-panel +, gtk3 +, glib +, libwnck3 +, libgtop +, libnotify +, upower +, wirelesstools +, linuxPackages +, adwaita-icon-theme +, libgweather +, gucharmap +, tracker +, polkit +, gnome +}: + +stdenv.mkDerivation rec { + pname = "gnome-applets"; + version = "3.40.0"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1k6mdkg16ia29fyg8ikf4dfs51gnrmg0f8xwpvd3192lhfsbsh19"; + }; + + nativeBuildInputs = [ + gettext + itstool + pkg-config + libxml2 + ]; + + buildInputs = [ + gnome-panel + gtk3 + glib + libxml2 + libwnck3 + libgtop + libnotify + upower + adwaita-icon-theme + libgweather + gucharmap + tracker + polkit + wirelesstools + linuxPackages.cpupower + ]; + + enableParallelBuilding = true; + + doCheck = true; + + # Don't try to install modules to gnome panel's directory, as it's read only + PKG_CONFIG_LIBGNOME_PANEL_MODULESDIR = "${placeholder "out"}/lib/gnome-panel/modules"; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + versionPolicy = "odd-unstable"; + }; + }; + + meta = with lib; { + description = "Applets for use with the GNOME panel"; + homepage = "https://wiki.gnome.org/Projects/GnomeApplets"; + license = licenses.gpl2Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome/misc/gnome-autoar/default.nix new file mode 100644 index 0000000000000..8a74c05dfea2a --- /dev/null +++ b/pkgs/desktops/gnome/misc/gnome-autoar/default.nix @@ -0,0 +1,48 @@ +{ lib, stdenv +, fetchurl +, pkg-config +, gnome +, gtk3 +, glib +, gobject-introspection +, libarchive +, vala +}: + +stdenv.mkDerivation rec { + pname = "gnome-autoar"; + version = "0.3.2"; + + outputs = [ "out" "dev" ]; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-autoar/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0wkwix44yg126xn1v4f2j60bv9yiyadfpzf8ifx0bvd9x5f4v354"; + }; + + passthru = { + updateScript = gnome.updateScript { packageName = "gnome-autoar"; attrPath = "gnome.gnome-autoar"; }; + }; + + nativeBuildInputs = [ + gobject-introspection + pkg-config + vala + ]; + + buildInputs = [ + gtk3 + ]; + + propagatedBuildInputs = [ + libarchive + glib + ]; + + meta = with lib; { + platforms = platforms.linux; + maintainers = teams.gnome.members; + license = licenses.lgpl21Plus; + description = "Library to integrate compressed files management with GNOME"; + }; +} diff --git a/pkgs/desktops/gnome/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome/misc/gnome-flashback/default.nix new file mode 100644 index 0000000000000..7e578f27cd29f --- /dev/null +++ b/pkgs/desktops/gnome/misc/gnome-flashback/default.nix @@ -0,0 +1,203 @@ +{ lib, stdenv +, autoreconfHook +, fetchurl +, gettext +, glib +, gnome-bluetooth +, gnome-desktop +, gnome-panel +, gnome-session +, gnome +, gsettings-desktop-schemas +, gtk3 +, ibus +, libcanberra-gtk3 +, libpulseaudio +, libxkbfile +, libxml2 +, pkg-config +, polkit +, gdm +, systemd +, upower +, pam +, wrapGAppsHook +, writeTextFile +, writeShellScriptBin +, xkeyboard_config +, xorg +, runCommand +}: +let + pname = "gnome-flashback"; + version = "3.40.0"; + + # From data/sessions/Makefile.am + requiredComponentsCommon = [ + "gnome-flashback" + "gnome-panel" + ]; + requiredComponentsGsd = [ + "org.gnome.SettingsDaemon.A11ySettings" + "org.gnome.SettingsDaemon.Color" + "org.gnome.SettingsDaemon.Datetime" + "org.gnome.SettingsDaemon.Housekeeping" + "org.gnome.SettingsDaemon.Keyboard" + "org.gnome.SettingsDaemon.MediaKeys" + "org.gnome.SettingsDaemon.Power" + "org.gnome.SettingsDaemon.PrintNotifications" + "org.gnome.SettingsDaemon.Rfkill" + "org.gnome.SettingsDaemon.ScreensaverProxy" + "org.gnome.SettingsDaemon.Sharing" + "org.gnome.SettingsDaemon.Smartcard" + "org.gnome.SettingsDaemon.Sound" + "org.gnome.SettingsDaemon.UsbProtection" + "org.gnome.SettingsDaemon.Wacom" + "org.gnome.SettingsDaemon.XSettings" + ]; + requiredComponents = wmName: "RequiredComponents=${lib.concatStringsSep ";" ([ wmName ] ++ requiredComponentsCommon ++ requiredComponentsGsd)};"; + gnome-flashback = stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; + sha256 = "0fxv13m2q9z1q3i9jbggl35cb7jlckbdrfsr5sf030hr1w836gz0"; + }; + + # make .desktop Execs absolute + postPatch = '' + patch -p0 < 1 && builtins.match "[0-9]+" minorVersion != null; + nextMinor = builtins.fromJSON minorVersion + 1; + upperBound = "${lib.versions.major packageVersion}.${builtins.toString nextMinor}"; + in lib.optionalString (freeze && minorAvailable) ''--upper-bound="${upperBound}"''; + updateScript = writeScript "gnome-update-script" '' + #!${stdenv.shell} + set -o errexit + package_name="$1" + attr_path="$2" + version_policy="$3" + PATH=${lib.makeBinPath [ common-updater-scripts python ]} + latest_tag=$(python "${./find-latest-version.py}" "$package_name" "$version_policy" "stable" ${upperBoundFlag}) + update-source-version "$attr_path" "$latest_tag" + ''; +in [ updateScript packageName attrPath versionPolicy ] diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index 6ac9c3864abd6..8c6df49fd1276 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, libcanberra-gtk3, libgtop -, libXdamage, libXpresent, libstartup_notification, gnome3, gtk3, mate-settings-daemon, wrapGAppsHook, mateUpdateScript }: +, libXdamage, libXpresent, libstartup_notification, gnome, gtk3, mate-settings-daemon, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "marco"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { libXpresent libstartup_notification gtk3 - gnome3.zenity + gnome.zenity mate-settings-daemon ]; diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix index 1046e431a3b8b..ccd20a6b875a0 100644 --- a/pkgs/desktops/mate/mate-applets/default.nix +++ b/pkgs/desktops/mate/mate-applets/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gnome3, glib, gtk3, gtksourceview3, libwnck3 +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gnome, glib, gtk3, gtksourceview3, libwnck3 , libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook , mateUpdateScript }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 gtksourceview3 - gnome3.gucharmap + gnome.gucharmap libwnck3 libgtop libxml2 diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix index b1b59dc6402cb..62e0b5b3195b5 100644 --- a/pkgs/desktops/mate/mate-desktop/default.nix +++ b/pkgs/desktops/mate/mate-desktop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, isocodes, gnome3, gtk3, dconf, wrapGAppsHook, mateUpdateScript }: +{ lib, stdenv, fetchurl, pkg-config, gettext, isocodes, gnome, gtk3, dconf, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-desktop"; diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix index 3a99538d92984..fd7b19e1de37e 100644 --- a/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/pkgs/desktops/mate/mate-power-manager/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate-panel, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, polkit, wrapGAppsHook, mateUpdateScript }: +{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate-panel, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome, gtk3, libtool, polkit, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-power-manager"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { libxml2 libcanberra-gtk3 gtk3 - gnome3.libgnome-keyring + gnome.libgnome-keyring libnotify dbus-glib upower diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix index 4c98c9cf5207e..5e226f4d88691 100644 --- a/pkgs/desktops/mate/pluma/default.nix +++ b/pkgs/desktops/mate/pluma/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, gettext, perl, itstool, isocodes, enchant, libxml2, python3 -, gnome3, gtksourceview3, libpeas, mate, wrapGAppsHook, mateUpdateScript }: +, gnome, gtksourceview3, libpeas, mate, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "pluma"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { python3 gtksourceview3 libpeas - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme mate.mate-desktop ]; diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index e5182807b3f78..0a5f3f09bfb16 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, gnome3 }: +{ config, pkgs, lib, gnome }: lib.makeScope pkgs.newScope (self: with self; { @@ -25,7 +25,7 @@ lib.makeScope pkgs.newScope (self: with self; { maintainers = with pkgs.lib.maintainers; [ worldofpeace ]; - mutter = pkgs.gnome3.mutter334; + mutter = pkgs.gnome.mutter334; elementary-gsettings-schemas = callPackage ./desktop/elementary-gsettings-schemas { }; @@ -72,17 +72,17 @@ lib.makeScope pkgs.newScope (self: with self; { elementary-print-shim = callPackage ./desktop/elementary-print-shim { }; elementary-session-settings = callPackage ./desktop/elementary-session-settings { - inherit (gnome3) gnome-session gnome-keyring; + inherit (gnome) gnome-session gnome-keyring; }; elementary-shortcut-overlay = callPackage ./desktop/elementary-shortcut-overlay { }; extra-elementary-contracts = callPackage ./desktop/extra-elementary-contracts { - inherit (gnome3) file-roller gnome-bluetooth; + inherit (gnome) file-roller gnome-bluetooth; }; gala = callPackage ./desktop/gala { - inherit (gnome3) gnome-desktop; + inherit (gnome) gnome-desktop; }; wingpanel = callPackage ./desktop/wingpanel { }; @@ -109,7 +109,7 @@ lib.makeScope pkgs.newScope (self: with self; { # explained here -> https://github.com/elementary/greeter/issues/92#issuecomment-376215614 # Take note of "I am holding off on "fixing" this bug for as long as possible." elementary-settings-daemon = callPackage ./services/elementary-settings-daemon { - inherit (gnome3) gnome-desktop; + inherit (gnome) gnome-desktop; }; pantheon-agent-geoclue2 = callPackage ./services/pantheon-agent-geoclue2 { }; @@ -169,7 +169,7 @@ lib.makeScope pkgs.newScope (self: with self; { switchboard-plug-onlineaccounts = callPackage ./apps/switchboard-plugs/onlineaccounts { }; switchboard-plug-pantheon-shell = callPackage ./apps/switchboard-plugs/pantheon-shell { - inherit (gnome3) gnome-desktop; + inherit (gnome) gnome-desktop; }; switchboard-plug-power = callPackage ./apps/switchboard-plugs/power { }; diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index a9a310ade8282..43fd7a69e8ad3 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -6,7 +6,7 @@ , meson , ninja , pkg-config -, gnome3 +, gnome , perl , gettext , gtk3 @@ -152,7 +152,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = repoName; attrPath = "pantheon.${pname}"; }; diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 1b7877cd79da3..6ccd2a0c6124b 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -80,7 +80,7 @@ lib.makeScope pkgs.newScope (self: with self; { xfce4-terminal = callPackage ./applications/xfce4-terminal { }; xfce4-screenshooter = callPackage ./applications/xfce4-screenshooter { - inherit (pkgs.gnome3) libsoup; + inherit (pkgs.gnome) libsoup; }; xfdashboard = callPackage ./applications/xfdashboard {}; @@ -211,7 +211,7 @@ lib.makeScope pkgs.newScope (self: with self; { libxfcegui4 = throw "libxfcegui4 is the deprecated Xfce GUI library. It has been superseded by the libxfce4ui library"; xinitrc = xfce4-session.xinitrc; inherit (pkgs.gnome2) libglade; - inherit (pkgs.gnome3) vte gtksourceview; + inherit (pkgs.gnome) vte gtksourceview; xfce4-mixer-pulse = xfce4-mixer; thunar-bare = thunar.override { thunarPlugins = []; diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 55936fd3db23d..58ddf4597e679 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -90,7 +90,7 @@ let # Wait for PR #59372 # passthru = { - # updateScript = gnome3.updateScript { + # updateScript = gnome.updateScript { # attrPath = "${pname}_${lib.versions.major version}_${lib.versions.minor version}"; # packageName = pname; # }; diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 6f38c89088cdc..fbed88ccbdc07 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -307,7 +307,7 @@ self: super: builtins.intersectAttrs super { # Tries to run GUI in tests leksah = dontCheck (overrideCabal super.leksah (drv: { executableSystemDepends = (drv.executableSystemDepends or []) ++ (with pkgs; [ - gnome3.adwaita-icon-theme # Fix error: Icon 'window-close' not present in theme ... + gnome.adwaita-icon-theme # Fix error: Icon 'window-close' not present in theme ... wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system gtk3 # Fix error: GLib-GIO-ERROR **: Settings schema 'org.gtk.Settings.FileChooser' is not installed ]); diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 86afed3a60068..406493133c630 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -107466,7 +107466,7 @@ self: { platforms = [ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" ]; - }) {inherit (pkgs.gnome3) gnome-keyring; + }) {inherit (pkgs.gnome) gnome-keyring; inherit (pkgs) libgnome-keyring;}; "gnomevfs" = callPackage diff --git a/pkgs/development/libraries/amtk/default.nix b/pkgs/development/libraries/amtk/default.nix index 7d51dbd48e722..efea7ef624e90 100644 --- a/pkgs/development/libraries/amtk/default.nix +++ b/pkgs/development/libraries/amtk/default.nix @@ -5,7 +5,7 @@ , ninja , pkg-config , gobject-introspection -, gnome3 +, gnome , dbus , xvfb_run }: @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meson test --print-errorlogs ''; - passthru.updateScript = gnome3.updateScript { + passthru.updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/aravis/default.nix b/pkgs/development/libraries/aravis/default.nix index a915723e2ca7a..67e621ad85979 100644 --- a/pkgs/development/libraries/aravis/default.nix +++ b/pkgs/development/libraries/aravis/default.nix @@ -6,7 +6,7 @@ , gst-plugins-good ? null , gst-plugins-bad ? null , libnotify ? null -, gnome3 ? null +, gnome ? null , gtk3 ? null , enableUsb ? true , enablePacketSocket ? true @@ -26,7 +26,7 @@ in assert enableGstPlugin -> lib.all (pkg: pkg != null) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]; assert enableViewer -> enableGstPlugin; assert enableViewer -> libnotify != null; - assert enableViewer -> gnome3 != null; + assert enableViewer -> gnome != null; assert enableViewer -> gtk3 != null; assert enableViewer -> gstreamerAtLeastVersion1; @@ -56,7 +56,7 @@ in ++ lib.optional enableUsb libusb1 ++ lib.optional enablePacketSocket audit ++ lib.optionals (enableViewer || enableGstPlugin) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ] - ++ lib.optionals (enableViewer) [ libnotify gtk3 gnome3.adwaita-icon-theme ]; + ++ lib.optionals (enableViewer) [ libnotify gtk3 gnome.adwaita-icon-theme ]; preAutoreconf = "./autogen.sh"; diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index 881c411db392c..7989cfd857776 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -11,7 +11,7 @@ , glib , libxml2 -, gnome3 # To pass updateScript +, gnome # To pass updateScript }: stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails with "No test data file provided" passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index 38131b0f357fb..4e85c7a92a640 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -16,7 +16,7 @@ , libXi , libXext -, gnome3 # To pass updateScript +, gnome # To pass updateScript }: stdenv.mkDerivation rec { @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Ddbus_daemon=/run/current-system/sw/bin/dbus-daemon" ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index e0cdb3a9b4c3c..7961211dc63e9 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, meson, ninja, gettext, pkg-config, glib -, fixDarwinDylibNames, gobject-introspection, gnome3 +, fixDarwinDylibNames, gobject-introspection, gnome }: let @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/atkmm/default.nix b/pkgs/development/libraries/atkmm/default.nix index 123e7c984fcf1..b357ed0472592 100644 --- a/pkgs/development/libraries/atkmm/default.nix +++ b/pkgs/development/libraries/atkmm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, atk, glibmm, pkg-config, gnome3 }: +{ lib, stdenv, fetchurl, atk, glibmm, pkg-config, gnome }: stdenv.mkDerivation rec { pname = "atkmm"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix index 95d54993e0699..faee853808ccb 100644 --- a/pkgs/development/libraries/bamf/default.nix +++ b/pkgs/development/libraries/bamf/default.nix @@ -3,7 +3,7 @@ , autoconf , automake , libtool -, gnome3 +, gnome , which , fetchgit , libgtop @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { automake dbus docbook_xsl - gnome3.gnome-common + gnome.gnome-common gobject-introspection gtk-doc libtool diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix index f2caa0bd3d552..db55e9a2789b7 100644 --- a/pkgs/development/libraries/clutter-gst/default.nix +++ b/pkgs/development/libraries/clutter-gst/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, pkg-config, clutter, gtk3, glib, cogl, gnome3, gdk-pixbuf }: +{ fetchurl, lib, stdenv, pkg-config, clutter, gtk3, glib, cogl, gnome, gdk-pixbuf }: stdenv.mkDerivation rec { pname = "clutter-gst"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { postBuild = "rm -rf $out/share/gtk-doc"; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix index 8dfe6781740b1..776dcdf8f23c9 100644 --- a/pkgs/development/libraries/clutter-gtk/default.nix +++ b/pkgs/development/libraries/clutter-gtk/default.nix @@ -1,5 +1,5 @@ { fetchurl, lib, stdenv, pkg-config, meson, ninja -, gobject-introspection, clutter, gtk3, gnome3 }: +, gobject-introspection, clutter, gtk3, gnome }: let pname = "clutter-gtk"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { postBuild = "rm -rf $out/share/gtk-doc"; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index 2d0f57f279a69..0c8ca2d802348 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkg-config, libGLU, libGL, libX11, libXext, libXfixes , libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json-glib -, gobject-introspection, gtk3, gnome3, libinput, libgudev, libxkbcommon +, gobject-introspection, gtk3, gnome, libinput, libgudev, libxkbcommon }: let @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { #doCheck = true; # no tests possible without a display passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index 9962ebf09e88b..75ec2a2acc7f7 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch, pkg-config, libGL, glib, gdk-pixbuf, xorg, libintl -, pangoSupport ? true, pango, cairo, gobject-introspection, wayland, gnome3 +, pangoSupport ? true, pango, cairo, gobject-introspection, wayland, gnome , mesa, automake, autoconf , gstreamerSupport ? true, gst_all_1 }: @@ -59,7 +59,7 @@ in stdenv.mkDerivation rec { #doCheck = true; # all tests fail (no idea why) passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/dconf/default.nix b/pkgs/development/libraries/dconf/default.nix index 26862ee99f019..550940f5a1e78 100644 --- a/pkgs/development/libraries/dconf/default.nix +++ b/pkgs/development/libraries/dconf/default.nix @@ -9,7 +9,7 @@ , glib , bash-completion , dbus -, gnome3 +, gnome , gtk-doc , docbook-xsl-nons , docbook_xml_dtd_42 @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix index c21c14962540f..6cd651e66ebb8 100644 --- a/pkgs/development/libraries/folks/default.nix +++ b/pkgs/development/libraries/folks/default.nix @@ -4,7 +4,7 @@ , meson , ninja , glib -, gnome3 +, gnome , nspr , gettext , gobject-introspection @@ -113,7 +113,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/gcab/default.nix b/pkgs/development/libraries/gcab/default.nix index 0ad9f607dfea6..efc533c55041b 100644 --- a/pkgs/development/libraries/gcab/default.nix +++ b/pkgs/development/libraries/gcab/default.nix @@ -12,7 +12,7 @@ , vala , glib , zlib -, gnome3 +, gnome , nixosTests }: @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix index 57323bbc70dd6..da3a0d31f41e4 100644 --- a/pkgs/development/libraries/gcr/default.nix +++ b/pkgs/development/libraries/gcr/default.nix @@ -15,7 +15,7 @@ , makeWrapper , libxslt , vala -, gnome3 +, gnome , python3 , shared-mime-info }: @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index d7a2604876fd8..fd2d62a032c3e 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -15,7 +15,7 @@ , libtiff , libjpeg , libpng -, gnome3 +, gnome , gobject-introspection , doCheck ? false , makeWrapper @@ -115,7 +115,7 @@ stdenv.mkDerivation rec { separateDebugInfo = stdenv.isLinux; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/gdl/default.nix b/pkgs/development/libraries/gdl/default.nix index f924571deae1c..5b73e3d7a1394 100644 --- a/pkgs/development/libraries/gdl/default.nix +++ b/pkgs/development/libraries/gdl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, libxml2, gtk3, gnome3, intltool }: +{ lib, stdenv, fetchurl, pkg-config, libxml2, gtk3, gnome, intltool }: stdenv.mkDerivation rec { pname = "gdl"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 gtk3 ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gdl"; }; }; diff --git a/pkgs/development/libraries/geocode-glib/default.nix b/pkgs/development/libraries/geocode-glib/default.nix index f401c25aa3942..458e0d59a0d5d 100644 --- a/pkgs/development/libraries/geocode-glib/default.nix +++ b/pkgs/development/libraries/geocode-glib/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, meson, ninja, pkg-config, gettext, gtk-doc, docbook_xsl, gobject-introspection, gnome3, libsoup, json-glib, glib }: +{ fetchurl, lib, stdenv, meson, ninja, pkg-config, gettext, gtk-doc, docbook_xsl, gobject-introspection, gnome, libsoup, json-glib, glib }: stdenv.mkDerivation rec { pname = "geocode-glib"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/development/libraries/gexiv2/default.nix b/pkgs/development/libraries/gexiv2/default.nix index 958e524aa09c9..c46a42049bceb 100644 --- a/pkgs/development/libraries/gexiv2/default.nix +++ b/pkgs/development/libraries/gexiv2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, exiv2, glib, gnome3, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, exiv2, glib, gnome, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: stdenv.mkDerivation rec { pname = "gexiv2"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/gfbgraph/default.nix b/pkgs/development/libraries/gfbgraph/default.nix index 4cbc6f341dc40..7f4625b665121 100644 --- a/pkgs/development/libraries/gfbgraph/default.nix +++ b/pkgs/development/libraries/gfbgraph/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, glib, librest, gnome-online-accounts -, gnome3, libsoup, json-glib, gobject-introspection +, gnome, libsoup, json-glib, gobject-introspection , gtk-doc, pkgs, docbook-xsl-nons, autoconf, automake, libtool }: stdenv.mkDerivation rec { @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index ff61c95a98554..d6920086034a3 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -4,7 +4,7 @@ , meson , ninja , pkg-config -, gnome3 +, gnome , gtk3 , atk , gobject-introspection @@ -124,7 +124,7 @@ in stdenv.mkDerivation rec { installed-tests = nixosTests.installed-tests.gjs; }; - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gjs"; }; }; diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 21321ce9f0c8c..690279fcf2138 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -12,7 +12,7 @@ , gnutls , p11-kit , libproxy -, gnome3 +, gnome , gsettings-desktop-schemas }: @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 15325809eb7f4..ade74a2ff0272 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -1,5 +1,5 @@ { config, lib, stdenv, fetchurl, gettext, meson, ninja, pkg-config, perl, python3 -, libiconv, zlib, libffi, pcre, libelf, gnome3, libselinux, bash, gnum4, gtk-doc, docbook_xsl, docbook_xml_dtd_45 +, libiconv, zlib, libffi, pcre, libelf, gnome, libselinux, bash, gnum4, gtk-doc, docbook_xsl, docbook_xml_dtd_45 # use util-linuxMinimal to avoid circular dependency (util-linux, systemd, glib) , util-linuxMinimal ? null , buildPackages @@ -184,7 +184,7 @@ stdenv.mkDerivation rec { makeSchemaPath = dir: name: "${dir}/share/gsettings-schemas/${name}/glib-2.0/schemas"; getSchemaPath = pkg: makeSchemaPath pkg pkg.name; inherit flattenInclude; - updateScript = gnome3.updateScript { packageName = "glib"; }; + updateScript = gnome.updateScript { packageName = "glib"; }; }; meta = with lib; { diff --git a/pkgs/development/libraries/glibmm/2.68.nix b/pkgs/development/libraries/glibmm/2.68.nix index 18a862e7d76bf..660e3b3b9bd73 100644 --- a/pkgs/development/libraries/glibmm/2.68.nix +++ b/pkgs/development/libraries/glibmm/2.68.nix @@ -5,7 +5,7 @@ , gnum4 , glib , libsigcxx30 -, gnome3 +, gnome , Cocoa , meson , ninja @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails. one test needs the net, another /etc/fstab passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "glibmm_2_68"; versionPolicy = "odd-unstable"; diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index e952ab04cc062..9c4488a04a97a 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gnum4, glib, libsigcxx, gnome3, darwin, meson, ninja }: +{ lib, stdenv, fetchurl, pkg-config, gnum4, glib, libsigcxx, gnome, darwin, meson, ninja }: stdenv.mkDerivation rec { pname = "glibmm"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails. one test needs the net, another /etc/fstab passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/gnome-menus/default.nix b/pkgs/development/libraries/gnome-menus/default.nix index c8e77148c6d80..0b3d6689cb0b9 100644 --- a/pkgs/development/libraries/gnome-menus/default.nix +++ b/pkgs/development/libraries/gnome-menus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, glib, gobject-introspection, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, gettext, glib, gobject-introspection, gnome }: stdenv.mkDerivation rec { pname = "gnome-menus"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib gobject-introspection ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix index ecb4390df269a..2d349181deeda 100644 --- a/pkgs/development/libraries/gnome-online-accounts/default.nix +++ b/pkgs/development/libraries/gnome-online-accounts/default.nix @@ -20,7 +20,7 @@ , libsoup , docbook-xsl-nons , docbook_xml_dtd_412 -, gnome3 +, gnome , gcr , libkrb5 , gvfs @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/development/libraries/gnome-video-effects/default.nix b/pkgs/development/libraries/gnome-video-effects/default.nix index a2206c19b1b43..e8fd3ca7e2c2f 100644 --- a/pkgs/development/libraries/gnome-video-effects/default.nix +++ b/pkgs/development/libraries/gnome-video-effects/default.nix @@ -4,7 +4,7 @@ , meson , ninja , gettext -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index afe4ac4278264..e6a1ad979b91f 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -14,7 +14,7 @@ , python3 , cctools , cairo -, gnome3 +, gnome , substituteAll , nixStoreDir ? builtins.storeDir , x11Support ? true @@ -112,7 +112,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix index f3580e904b854..3a48fa5248421 100644 --- a/pkgs/development/libraries/goffice/default.nix +++ b/pkgs/development/libraries/goffice/default.nix @@ -1,5 +1,5 @@ { fetchurl, lib, stdenv, pkg-config, intltool, glib, gtk3, lasem -, libgsf, libxml2, libxslt, cairo, pango, librsvg, gnome3 }: +, libgsf, libxml2, libxslt, cairo, pango, librsvg, gnome }: stdenv.mkDerivation rec { pname = "goffice"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/gom/default.nix b/pkgs/development/libraries/gom/default.nix index 56036897ad8ef..d11ecc6a29a57 100644 --- a/pkgs/development/libraries/gom/default.nix +++ b/pkgs/development/libraries/gom/default.nix @@ -7,7 +7,7 @@ , python3 , sqlite , gdk-pixbuf -, gnome3 +, gnome , gobject-introspection }: @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { doCheck = stdenv.isx86_64; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/goocanvas/default.nix b/pkgs/development/libraries/goocanvas/default.nix index c9fd5b2634298..1bc763349a869 100644 --- a/pkgs/development/libraries/goocanvas/default.nix +++ b/pkgs/development/libraries/goocanvas/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gtk2, cairo, glib, pkg-config, gnome3 }: +{ lib, stdenv, fetchurl, gtk2, cairo, glib, pkg-config, gnome }: stdenv.mkDerivation rec { pname = "goocanvas"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 cairo glib ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/goocanvasmm/default.nix b/pkgs/development/libraries/goocanvasmm/default.nix index 11ea1e40ab966..4e706f409870d 100644 --- a/pkgs/development/libraries/goocanvasmm/default.nix +++ b/pkgs/development/libraries/goocanvasmm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, goocanvas2, gtkmm3, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, goocanvas2, gtkmm3, gnome }: stdenv.mkDerivation rec { pname = "goocanvasmm"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "goocanvasmm2"; versionPolicy = "odd-unstable"; diff --git a/pkgs/development/libraries/grilo-plugins/default.nix b/pkgs/development/libraries/grilo-plugins/default.nix index d1c00d5882231..13ec503fae0e6 100644 --- a/pkgs/development/libraries/grilo-plugins/default.nix +++ b/pkgs/development/libraries/grilo-plugins/default.nix @@ -10,7 +10,7 @@ , librest , libarchive , libsoup -, gnome3 +, gnome , libxml2 , lua5_3 , liboauth @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/grilo/default.nix b/pkgs/development/libraries/grilo/default.nix index fbab49273e82b..1b8c46394da3a 100644 --- a/pkgs/development/libraries/grilo/default.nix +++ b/pkgs/development/libraries/grilo/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, vala, glib, liboauth, gtk3 , gtk-doc, docbook_xsl, docbook_xml_dtd_43 -, libxml2, gnome3, gobject-introspection, libsoup, totem-pl-parser }: +, libxml2, gnome, gobject-introspection, libsoup, totem-pl-parser }: let pname = "grilo"; @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { buildInputs = [ glib liboauth gtk3 libxml2 libsoup totem-pl-parser ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix index c918e0ededcc3..e9814a43b2443 100644 --- a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix +++ b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix @@ -7,7 +7,7 @@ , ninja , python3 # just for passthru -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/development/libraries/gsound/default.nix b/pkgs/development/libraries/gsound/default.nix index 9f656a428f5b9..bcd39ce22733f 100644 --- a/pkgs/development/libraries/gsound/default.nix +++ b/pkgs/development/libraries/gsound/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, vala, libcanberra, gobject-introspection, libtool, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, glib, vala, libcanberra, gobject-introspection, libtool, gnome }: stdenv.mkDerivation rec { pname = "gsound"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib libcanberra ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix index 890fcb9811819..f591246eaf814 100644 --- a/pkgs/development/libraries/gspell/default.nix +++ b/pkgs/development/libraries/gspell/default.nix @@ -8,7 +8,7 @@ , icu , vala , gobject-introspection -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix index 440caba254761..6a76c07fec7b8 100644 --- a/pkgs/development/libraries/gssdp/default.nix +++ b/pkgs/development/libraries/gssdp/default.nix @@ -11,7 +11,7 @@ , libsoup , gtk3 , glib -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix index ae361366ac1c7..7123aa0d3ac1f 100644 --- a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix +++ b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, file, glibmm, gst_all_1, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, file, glibmm, gst_all_1, gnome }: stdenv.mkDerivation rec { pname = "gstreamermm"; version = "1.10.0"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gst_all_1.gstreamermm"; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 9f7d305052480..f9b5d5f68b569 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -29,7 +29,7 @@ , libxkbcommon , libxml2 , gmp -, gnome3 +, gnome , gsettings-desktop-schemas , sassc , trackerSupport ? stdenv.isLinux @@ -206,7 +206,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gtk+"; attrPath = "gtk3"; }; diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index 455e54ded21c7..2636aea41616b 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -28,7 +28,7 @@ , libsoup , ffmpeg , gmp -, gnome3 +, gnome , gsettings-desktop-schemas , gst_all_1 , sassc @@ -216,7 +216,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gtk"; attrPath = "gtk4"; }; diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix index a3aa18b058a21..eaf8a94d137ea 100644 --- a/pkgs/development/libraries/gtkd/default.nix +++ b/pkgs/development/libraries/gtkd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, fetchpatch, atk, cairo, ldc, gdk-pixbuf, gnome3, gst_all_1, librsvg +{ lib, stdenv, fetchzip, fetchpatch, atk, cairo, ldc, gdk-pixbuf, gnome, gst_all_1, librsvg , glib, gtk3, gtksourceview4, libgda, libpeas, pango, pkg-config, which, vte }: let diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index 20456ffd6d1ba..eb1f5a82d630a 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, meson, ninja, python3, gtk3, glibmm, cairomm, pangomm, atkmm, epoxy, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, meson, ninja, python3, gtk3, glibmm, cairomm, pangomm, atkmm, epoxy, gnome }: stdenv.mkDerivation rec { pname = "gtkmm"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = false; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "${pname}3"; versionPolicy = "odd-unstable"; diff --git a/pkgs/development/libraries/gtkmm/4.x.nix b/pkgs/development/libraries/gtkmm/4.x.nix index f7fca93d87047..5a32b3c2de639 100644 --- a/pkgs/development/libraries/gtkmm/4.x.nix +++ b/pkgs/development/libraries/gtkmm/4.x.nix @@ -10,7 +10,7 @@ , cairomm_1_16 , pangomm_2_48 , epoxy -, gnome3 +, gnome , makeFontsConf , xvfb_run }: @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "${pname}4"; versionPolicy = "odd-unstable"; diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix index 4f144219ce09e..21dc5c3a884d6 100644 --- a/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/pkgs/development/libraries/gtksourceview/4.x.nix @@ -15,7 +15,7 @@ , libxml2 , perl , gettext -, gnome3 +, gnome , gobject-introspection , dbus , xvfb_run @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gtksourceview"; attrPath = "gtksourceview4"; versionPolicy = "odd-unstable"; diff --git a/pkgs/development/libraries/gtksourceview/5.x.nix b/pkgs/development/libraries/gtksourceview/5.x.nix index a1bc60ebc3085..6825b34d0ac1c 100644 --- a/pkgs/development/libraries/gtksourceview/5.x.nix +++ b/pkgs/development/libraries/gtksourceview/5.x.nix @@ -13,7 +13,7 @@ , libxml2 , perl , gettext -, gnome3 +, gnome , gobject-introspection , dbus , xvfb_run @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gtksourceview"; attrPath = "gtksourceview5"; versionPolicy = "odd-unstable"; diff --git a/pkgs/development/libraries/gtksourceviewmm/4.x.nix b/pkgs/development/libraries/gtksourceviewmm/4.x.nix index 5e80f91abc1b3..3011a126c10de 100644 --- a/pkgs/development/libraries/gtksourceviewmm/4.x.nix +++ b/pkgs/development/libraries/gtksourceviewmm/4.x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gtkmm3, glibmm, gtksourceview4, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, gtkmm3, glibmm, gtksourceview4, gnome }: stdenv.mkDerivation rec { pname = "gtksourceviewmm"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/gtksourceviewmm/default.nix b/pkgs/development/libraries/gtksourceviewmm/default.nix index 7ee6b656ead13..fc4439e223eef 100644 --- a/pkgs/development/libraries/gtksourceviewmm/default.nix +++ b/pkgs/development/libraries/gtksourceviewmm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gtkmm3, glibmm, gtksourceview3, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, gtkmm3, glibmm, gtksourceview3, gnome }: stdenv.mkDerivation rec { pname = "gtksourceviewmm"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gtksourceviewmm"; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/gupnp-av/default.nix b/pkgs/development/libraries/gupnp-av/default.nix index 74a5e6c6d45d2..8d800f9794023 100644 --- a/pkgs/development/libraries/gupnp-av/default.nix +++ b/pkgs/development/libraries/gupnp-av/default.nix @@ -8,7 +8,7 @@ , docbook_xml_dtd_412 , glib , libxml2 -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/gupnp-dlna/default.nix b/pkgs/development/libraries/gupnp-dlna/default.nix index be249e0fdcac0..f9efe352a84b4 100644 --- a/pkgs/development/libraries/gupnp-dlna/default.nix +++ b/pkgs/development/libraries/gupnp-dlna/default.nix @@ -8,7 +8,7 @@ , docbook_xml_dtd_412 , libxml2 , gst_all_1 -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/gupnp-igd/default.nix b/pkgs/development/libraries/gupnp-igd/default.nix index 93240fc8b33ff..6eb44b9172abd 100644 --- a/pkgs/development/libraries/gupnp-igd/default.nix +++ b/pkgs/development/libraries/gupnp-igd/default.nix @@ -10,7 +10,7 @@ , docbook_xml_dtd_412 , glib , gupnp -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { #doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix index d6465d71c50f4..bd8151d603e9b 100644 --- a/pkgs/development/libraries/gupnp/default.nix +++ b/pkgs/development/libraries/gupnp/default.nix @@ -14,7 +14,7 @@ , libsoup , libxml2 , libuuid -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index b589775a4dffc..7c8fd5f9cec16 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -23,7 +23,7 @@ , samba , libmtp , gnomeSupport ? false -, gnome3 +, gnome , gcr , glib-networking , gnome-online-accounts @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { gsettings-desktop-schemas # TODO: a ligther version of libsoup to have FTP/HTTP support? ] ++ lib.optionals gnomeSupport [ - gnome3.libsoup + gnome.libsoup gcr glib-networking # TLS support gnome-online-accounts @@ -117,7 +117,7 @@ stdenv.mkDerivation rec { doInstallCheck = doCheck; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index 110dcad16e052..afbb7aaed96f4 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -11,7 +11,7 @@ , gtk-doc , docbook-xsl-nons , docbook_xml_dtd_43 -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/jsonrpc-glib/default.nix b/pkgs/development/libraries/jsonrpc-glib/default.nix index 170ae424dcc64..b43bcd07ca6b6 100644 --- a/pkgs/development/libraries/jsonrpc-glib/default.nix +++ b/pkgs/development/libraries/jsonrpc-glib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, glib, json-glib, pkg-config, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome3 }: +{ lib, stdenv, fetchurl, meson, ninja, glib, json-glib, pkg-config, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome }: stdenv.mkDerivation rec { pname = "jsonrpc-glib"; version = "3.38.0"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = false; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix index 663abb1528046..fb481c19d05f7 100644 --- a/pkgs/development/libraries/keybinder/default.nix +++ b/pkgs/development/libraries/keybinder/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkg-config, gnome3 +{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkg-config, gnome , gtk-doc, gtk2, python2Packages, lua, gobject-introspection }: @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - autoconf automake libtool gnome3.gnome-common gtk-doc gtk2 + autoconf automake libtool gnome.gnome-common gtk-doc gtk2 python pygtk lua gobject-introspection ]; diff --git a/pkgs/development/libraries/keybinder3/default.nix b/pkgs/development/libraries/keybinder3/default.nix index e291ec56bb210..78755a87919d7 100644 --- a/pkgs/development/libraries/keybinder3/default.nix +++ b/pkgs/development/libraries/keybinder3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, gnome3 +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, gnome , gtk-doc, gtk3, libX11, libXext, libXrender, gobject-introspection }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake libtool pkg-config ]; buildInputs = [ - gnome3.gnome-common gtk-doc gtk3 + gnome.gnome-common gtk-doc gtk3 libX11 libXext libXrender gobject-introspection ]; diff --git a/pkgs/development/libraries/lasem/default.nix b/pkgs/development/libraries/lasem/default.nix index 953cf20afdbc1..9c49429ece458 100644 --- a/pkgs/development/libraries/lasem/default.nix +++ b/pkgs/development/libraries/lasem/default.nix @@ -1,5 +1,5 @@ { fetchurl, lib, stdenv, pkg-config, intltool, gobject-introspection, glib, gdk-pixbuf -, libxml2, cairo, pango, gnome3 }: +, libxml2, cairo, pango, gnome }: stdenv.mkDerivation rec { pname = "lasem"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index 3ad01ba871ea1..20609509b66d8 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, meson, ninja, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, pkg-config, glib, gtk3, cairo, sqlite, gnome3 +{ fetchurl, lib, stdenv, meson, ninja, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, pkg-config, glib, gtk3, cairo, sqlite, gnome , clutter-gtk, libsoup, gobject-introspection /*, libmemphis */ }: stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/libcryptui/default.nix b/pkgs/development/libraries/libcryptui/default.nix index 4b60e27a99f73..e816846842f1e 100644 --- a/pkgs/development/libraries/libcryptui/default.nix +++ b/pkgs/development/libraries/libcryptui/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, intltool, glib, gnome3, gtk3, gnupg22, gpgme, dbus-glib, libgnome-keyring }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, intltool, glib, gnome, gtk3, gnupg22, gpgme, dbus-glib, libgnome-keyring }: stdenv.mkDerivation rec { pname = "libcryptui"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix index d929af5d47f13..912e79d541018 100644 --- a/pkgs/development/libraries/libdazzle/default.nix +++ b/pkgs/development/libraries/libdazzle/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, ninja, meson, pkg-config, vala, gobject-introspection, libxml2 -, gtk-doc, docbook_xsl, docbook_xml_dtd_43, dbus, xvfb_run, glib, gtk3, gnome3 }: +, gtk-doc, docbook_xsl, docbook_xml_dtd_43, dbus, xvfb_run, glib, gtk3, gnome }: stdenv.mkDerivation rec { pname = "libdazzle"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/development/libraries/libepc/default.nix b/pkgs/development/libraries/libepc/default.nix index 0656f3a2ee913..9755d0977c85f 100644 --- a/pkgs/development/libraries/libepc/default.nix +++ b/pkgs/development/libraries/libepc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, gtk-doc, glib, avahi, gnutls, libuuid, libsoup, gtk3, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, intltool, gtk-doc, glib, avahi, gnutls, libuuid, libsoup, gtk3, gnome }: let avahiWithGtk = avahi.override { gtk3Support = true; }; @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/libgda/6.x.nix b/pkgs/development/libraries/libgda/6.x.nix index 6474aceb41738..28235d65d98ad 100644 --- a/pkgs/development/libraries/libgda/6.x.nix +++ b/pkgs/development/libraries/libgda/6.x.nix @@ -12,7 +12,7 @@ , json-glib , isocodes , openssl -, gnome3 +, gnome , gobject-introspection , vala , libgee @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "libgda6"; versionPolicy = "odd-unstable"; diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix index 1599a7868712d..b3f6e1a7cdd99 100644 --- a/pkgs/development/libraries/libgda/default.nix +++ b/pkgs/development/libraries/libgda/default.nix @@ -7,7 +7,7 @@ , libxml2 , gtk3 , openssl -, gnome3 +, gnome , gobject-introspection , vala , libgee @@ -84,7 +84,7 @@ assert postgresSupport -> postgresql != null; hardeningDisable = [ "format" ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/libgdamm/default.nix b/pkgs/development/libraries/libgdamm/default.nix index 15ff99f3a5563..ad5e0cbecd6e8 100644 --- a/pkgs/development/libraries/libgdamm/default.nix +++ b/pkgs/development/libraries/libgdamm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, glibmm, libgda, libxml2, gnome3 +{ lib, stdenv, fetchurl, pkg-config, glibmm, libgda, libxml2, gnome , mysqlSupport ? false , postgresSupport ? false }: @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/libgdata/default.nix b/pkgs/development/libraries/libgdata/default.nix index fdaace2dc4f02..cc9080bb0e120 100644 --- a/pkgs/development/libraries/libgdata/default.nix +++ b/pkgs/development/libraries/libgdata/default.nix @@ -12,7 +12,7 @@ , gcr , gnome-online-accounts , gobject-introspection -, gnome3 +, gnome , p11-kit , openssl , uhttpmock @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; # Stable version has not been updated for a long time. }; diff --git a/pkgs/development/libraries/libgee/default.nix b/pkgs/development/libraries/libgee/default.nix index aefb0be84afe0..1a40d1f17b413 100644 --- a/pkgs/development/libraries/libgee/default.nix +++ b/pkgs/development/libraries/libgee/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoconf, vala, pkg-config, glib, gobject-introspection, gnome3 }: +{ lib, stdenv, fetchurl, autoconf, vala, pkg-config, glib, gobject-introspection, gnome }: stdenv.mkDerivation rec { pname = "libgee"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0"; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/libgepub/default.nix b/pkgs/development/libraries/libgepub/default.nix index e058c7ed5af3d..7ae7bff50efa5 100644 --- a/pkgs/development/libraries/libgepub/default.nix +++ b/pkgs/development/libraries/libgepub/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, gnome3 +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, gnome , webkitgtk, libsoup, libxml2, libarchive }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib webkitgtk libsoup libxml2 libarchive ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/libgit2-glib/default.nix b/pkgs/development/libraries/libgit2-glib/default.nix index fe36a9d663f39..56259814d8a51 100644 --- a/pkgs/development/libraries/libgit2-glib/default.nix +++ b/pkgs/development/libraries/libgit2-glib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gnome3, meson, ninja, pkg-config, vala, libssh2 +{ lib, stdenv, fetchurl, gnome, meson, ninja, pkg-config, vala, libssh2 , gtk-doc, gobject-introspection, libgit2, glib, python3 }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix index cf8f5ab487864..b00e7b3245182 100644 --- a/pkgs/development/libraries/libgksu/default.nix +++ b/pkgs/development/libraries/libgksu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, wrapGAppsHook, gtk2, gnome2, gnome3, +{ lib, stdenv, fetchurl, pkg-config, wrapGAppsHook, gtk2, gnome2, gnome, libstartup_notification, libgtop, perlPackages, autoreconfHook, intltool, docbook_xsl, xauth }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 gnome2.GConf libstartup_notification - gnome3.libgnome-keyring libgtop gnome2.libglade + gnome.libgnome-keyring libgtop gnome2.libglade ] ++ (with perlPackages; [ perl XMLParser ]); enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libgnomekbd/default.nix b/pkgs/development/libraries/libgnomekbd/default.nix index 23261020cc11c..957c213425249 100644 --- a/pkgs/development/libraries/libgnomekbd/default.nix +++ b/pkgs/development/libraries/libgnomekbd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, file, intltool, glib, gtk3, libxklavier, wrapGAppsHook, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, file, intltool, glib, gtk3, libxklavier, wrapGAppsHook, gnome }: stdenv.mkDerivation rec { pname = "libgnomekbd"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/libgrss/default.nix b/pkgs/development/libraries/libgrss/default.nix index b8c7c7bc49774..8c5ea73af0b93 100644 --- a/pkgs/development/libraries/libgrss/default.nix +++ b/pkgs/development/libraries/libgrss/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, vala, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, vala, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome }: let version = "0.7.0"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index bfa0b861dd848..1ccc5d7789671 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -1,5 +1,5 @@ { fetchurl, lib, stdenv, pkg-config, intltool, gettext, glib, libxml2, zlib, bzip2 -, perl, gdk-pixbuf, libiconv, libintl, gnome3 }: +, perl, gdk-pixbuf, libiconv, libintl, gnome }: stdenv.mkDerivation rec { pname = "libgsf"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { preCheck = "patchShebangs ./tests/"; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix index c919e667766a8..98b0dc89fee83 100644 --- a/pkgs/development/libraries/libgtop/default.nix +++ b/pkgs/development/libraries/libgtop/default.nix @@ -5,7 +5,7 @@ , perl , gettext , gobject-introspection -, gnome3 +, gnome , gtk-doc }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix index d3482456f2e4c..a35cf51679ce9 100644 --- a/pkgs/development/libraries/libgudev/default.nix +++ b/pkgs/development/libraries/libgudev/default.nix @@ -6,7 +6,7 @@ , udev , glib , gobject-introspection -, gnome3 +, gnome , vala }: @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/libgweather/default.nix b/pkgs/development/libraries/libgweather/default.nix index fd742d5b58b93..fbab67e086520 100644 --- a/pkgs/development/libraries/libgweather/default.nix +++ b/pkgs/development/libraries/libgweather/default.nix @@ -17,7 +17,7 @@ , tzdata , geocode-glib , vala -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/libgxps/default.nix b/pkgs/development/libraries/libgxps/default.nix index be088496f2e1e..fc871f174eb54 100644 --- a/pkgs/development/libraries/libgxps/default.nix +++ b/pkgs/development/libraries/libgxps/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, cairo -, libarchive, freetype, libjpeg, libtiff, gnome3, lcms2 +, libarchive, freetype, libjpeg, libtiff, gnome, lcms2 }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/libhandy/0.x.nix b/pkgs/development/libraries/libhandy/0.x.nix index ff2093255cf07..d836efb1aeb9e 100644 --- a/pkgs/development/libraries/libhandy/0.x.nix +++ b/pkgs/development/libraries/libhandy/0.x.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitLab, meson, ninja, pkg-config, gobject-introspection, vala , gtk-doc, docbook_xsl, docbook_xml_dtd_43 -, gtk3, gnome3 +, gtk3, gnome , dbus, xvfb_run, libxml2 , hicolor-icon-theme }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config gobject-introspection vala libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 ]; - buildInputs = [ gnome3.gnome-desktop gtk3 libxml2 ]; + buildInputs = [ gnome.gnome-desktop gtk3 libxml2 ]; checkInputs = [ dbus xvfb_run hicolor-icon-theme ]; mesonFlags = [ diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 56853b0c3b8ce..65f8ccd39ec3e 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -20,7 +20,7 @@ , hicolor-icon-theme , at-spi2-atk , at-spi2-core -, gnome3 +, gnome , libhandy , runCommand }: @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; } // lib.optionalAttrs (!enableGlade) { diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix index 871aafeafd6ba..975ad22581318 100644 --- a/pkgs/development/libraries/libhttpseverywhere/default.nix +++ b/pkgs/development/libraries/libhttpseverywhere/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, meson, ninja, makeFontsConf, vala, fetchpatch -, gnome3, libgee, glib, json-glib, libarchive, libsoup, gobject-introspection }: +, gnome, libgee, glib, json-glib, libarchive, libsoup, gobject-introspection }: let pname = "libhttpseverywhere"; @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { outputs = [ "out" "devdoc" ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/libmanette/default.nix b/pkgs/development/libraries/libmanette/default.nix index 4e5f44dd15351..645b521b81720 100644 --- a/pkgs/development/libraries/libmanette/default.nix +++ b/pkgs/development/libraries/libmanette/default.nix @@ -11,7 +11,7 @@ , glib , libgudev , libevdev -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/libmediaart/default.nix b/pkgs/development/libraries/libmediaart/default.nix index 28c8ae6db9405..ee1b306c3e51c 100644 --- a/pkgs/development/libraries/libmediaart/default.nix +++ b/pkgs/development/libraries/libmediaart/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gdk-pixbuf, gobject-introspection, gnome3, fetchpatch }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gdk-pixbuf, gobject-introspection, gnome, fetchpatch }: stdenv.mkDerivation rec { pname = "libmediaart"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { doCheck = false; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix index 29b371642280b..b108a5c5eea54 100644 --- a/pkgs/development/libraries/libnotify/default.nix +++ b/pkgs/development/libraries/libnotify/default.nix @@ -8,7 +8,7 @@ , glib , gdk-pixbuf , gobject-introspection -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix index 5d3bad6d6205b..55c884d215fdc 100644 --- a/pkgs/development/libraries/libpeas/default.nix +++ b/pkgs/development/libraries/libpeas/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, gnome3 +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, gnome , glib, gtk3, gobject-introspection, python3, ncurses }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/librest/default.nix b/pkgs/development/libraries/librest/default.nix index a8bcebb533d05..0c885f0764b55 100644 --- a/pkgs/development/libraries/librest/default.nix +++ b/pkgs/development/libraries/librest/default.nix @@ -5,7 +5,7 @@ , glib , libsoup , gobject-introspection -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "librest"; versionPolicy = "odd-unstable"; diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 7047d15c0f05d..02cd9accbaf0a 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -14,7 +14,7 @@ , libobjc , rustc , cargo -, gnome3 +, gnome , vala , gobject-introspection , nixosTests @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index 6c28b7d16c162..8d9011bc575d8 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, fetchpatch, glib, pkg-config, gettext, libxslt, python3 , docbook_xsl, docbook_xml_dtd_42 , libgcrypt, gobject-introspection, vala -, gtk-doc, gnome3, gjs, libintl, dbus, xvfb_run }: +, gtk-doc, gnome, gjs, libintl, dbus, xvfb_run }: stdenv.mkDerivation rec { pname = "libsecret"; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; # Does not seem to use the odd-unstable policy: https://gitlab.gnome.org/GNOME/libsecret/issues/30 versionPolicy = "none"; diff --git a/pkgs/development/libraries/libsigcxx/3.0.nix b/pkgs/development/libraries/libsigcxx/3.0.nix index 3c92d8e13060d..edb74c807bfa2 100644 --- a/pkgs/development/libraries/libsigcxx/3.0.nix +++ b/pkgs/development/libraries/libsigcxx/3.0.nix @@ -4,7 +4,7 @@ , pkg-config , meson , ninja -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "libsigcxx30"; versionPolicy = "odd-unstable"; diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix index cfd161cc9619d..cbc2c8a617b4e 100644 --- a/pkgs/development/libraries/libsigcxx/default.nix +++ b/pkgs/development/libraries/libsigcxx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, meson, ninja, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, meson, ninja, gnome }: stdenv.mkDerivation rec { pname = "libsigc++"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "libsigcxx"; versionPolicy = "odd-unstable"; diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 64519dc355d47..fc805b2db9ec4 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, glib, libxml2, meson, ninja, pkg-config, gnome3, libsysprof-capture +{ stdenv, lib, fetchurl, glib, libxml2, meson, ninja, pkg-config, gnome, libsysprof-capture , gnomeSupport ? true, sqlite, glib-networking, gobject-introspection, vala , libpsl, python3, brotli }: @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { passthru = { propagatedUserEnvPackages = [ glib-networking.out ]; - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/pkgs/development/libraries/libwnck/3.x.nix index 5fb405f880e8a..3333e2d98eb7f 100644 --- a/pkgs/development/libraries/libwnck/3.x.nix +++ b/pkgs/development/libraries/libwnck/3.x.nix @@ -16,7 +16,7 @@ , libstartup_notification , gettext , gobject-introspection -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "${pname}${lib.versions.major version}"; versionPolicy = "odd-unstable"; diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/pkgs/development/libraries/libxmlxx/default.nix index 6db7e1f421b7f..67c5a0794ed5f 100644 --- a/pkgs/development/libraries/libxmlxx/default.nix +++ b/pkgs/development/libraries/libxmlxx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, libxml2, glibmm, perl, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, libxml2, glibmm, perl, gnome }: stdenv.mkDerivation rec { pname = "libxml++"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libxml2 glibmm ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/libzapojit/default.nix b/pkgs/development/libraries/libzapojit/default.nix index 805aaba9773c2..8acb5e858df8b 100644 --- a/pkgs/development/libraries/libzapojit/default.nix +++ b/pkgs/development/libraries/libzapojit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, intltool, json-glib, librest, libsoup, gnome3, gnome-online-accounts, gobject-introspection }: +{ lib, stdenv, fetchurl, pkg-config, glib, intltool, json-glib, librest, libsoup, gnome, gnome-online-accounts, gobject-introspection }: stdenv.mkDerivation rec { pname = "libzapojit"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib json-glib librest libsoup gnome-online-accounts ]; # zapojit-0.0.pc passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/mm-common/default.nix b/pkgs/development/libraries/mm-common/default.nix index a43d99503a3fe..7ce2675e3017f 100644 --- a/pkgs/development/libraries/mm-common/default.nix +++ b/pkgs/development/libraries/mm-common/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, gnome3 +, gnome , meson , python3 , ninja @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/osm-gps-map/default.nix b/pkgs/development/libraries/osm-gps-map/default.nix index 9ba581e3a401c..79bc2421dc997 100644 --- a/pkgs/development/libraries/osm-gps-map/default.nix +++ b/pkgs/development/libraries/osm-gps-map/default.nix @@ -1,4 +1,4 @@ -{ cairo, fetchzip, glib, gnome3, gtk3, gobject-introspection, pkg-config, lib, stdenv }: +{ cairo, fetchzip, glib, gnome, gtk3, gobject-introspection, pkg-config, lib, stdenv }: stdenv.mkDerivation rec { pname = "osm-gps-map"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ cairo glib gobject-introspection - gnome3.gnome-common gtk3 gnome3.libsoup + gnome.gnome-common gtk3 gnome.libsoup ]; meta = with lib; { diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index e181ca45a79ed..f4dba00d3518d 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -9,7 +9,7 @@ , gobject-introspection , darwin , fribidi -, gnome3 +, gnome , gi-docgen , makeFontsConf , freefont_ttf @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/pangomm/2.48.nix b/pkgs/development/libraries/pangomm/2.48.nix index a5d452ac16ffb..3c25d113d727f 100644 --- a/pkgs/development/libraries/pangomm/2.48.nix +++ b/pkgs/development/libraries/pangomm/2.48.nix @@ -8,7 +8,7 @@ , pango , glibmm_2_68 , cairomm_1_16 -, gnome3 +, gnome , ApplicationServices }: @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "${pname}_2_48"; versionPolicy = "odd-unstable"; diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix index d858288af84fc..afb79c7eafed4 100644 --- a/pkgs/development/libraries/pangomm/default.nix +++ b/pkgs/development/libraries/pangomm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, meson, ninja, python3, pango, glibmm, cairomm, gnome3 +{ lib, stdenv, fetchurl, pkg-config, meson, ninja, python3, pango, glibmm, cairomm, gnome , ApplicationServices }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/rarian/default.nix b/pkgs/development/libraries/rarian/default.nix index aa575f7e72aa9..b8995e6a2c484 100644 --- a/pkgs/development/libraries/rarian/default.nix +++ b/pkgs/development/libraries/rarian/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, pkg-config, perlPackages, libxml2, libxslt, docbook_xml_dtd_42, gnome3}: +{lib, stdenv, fetchurl, pkg-config, perlPackages, libxml2, libxslt, docbook_xml_dtd_42, gnome}: let pname = "rarian"; version = "0.8.1"; diff --git a/pkgs/development/libraries/template-glib/default.nix b/pkgs/development/libraries/template-glib/default.nix index e2bf9bbd49a51..c0ee2c1d3506d 100644 --- a/pkgs/development/libraries/template-glib/default.nix +++ b/pkgs/development/libraries/template-glib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, flex, bison, vala, gettext, gnome3, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, flex, bison, vala, gettext, gnome, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: let version = "3.34.0"; pname = "template-glib"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/tepl/default.nix b/pkgs/development/libraries/tepl/default.nix index b6ce86ddff4d4..f561efb473c59 100644 --- a/pkgs/development/libraries/tepl/default.nix +++ b/pkgs/development/libraries/tepl/default.nix @@ -3,7 +3,7 @@ , meson , ninja , amtk -, gnome3 +, gnome , gobject-introspection , gtk3 , gtksourceview4 @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { # correctly installed or GVfs metadata are not supported on this platform. In # the latter case, you should configure Tepl with --disable-gvfs-metadata. - passthru.updateScript = gnome3.updateScript { + passthru.updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/totem-pl-parser/default.nix b/pkgs/development/libraries/totem-pl-parser/default.nix index b559d4f59cf09..08c989b799b6e 100644 --- a/pkgs/development/libraries/totem-pl-parser/default.nix +++ b/pkgs/development/libraries/totem-pl-parser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, libxml2, gobject-introspection, gnome3 }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, libxml2, gobject-introspection, gnome }: stdenv.mkDerivation rec { pname = "totem-pl-parser"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix index fddf9becb2df8..c571e2238447f 100644 --- a/pkgs/development/libraries/tracker-miners/default.nix +++ b/pkgs/development/libraries/tracker-miners/default.nix @@ -20,7 +20,7 @@ , exempi , giflib , glib -, gnome3 +, gnome , gst_all_1 , icu , json-glib @@ -122,7 +122,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index 0af1476e7e26a..0ee5e0fa56721 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -18,7 +18,7 @@ , sqlite , libxslt , libstemmer -, gnome3 +, gnome , icu , libuuid , libsoup @@ -133,7 +133,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index 13d4169cf14af..dcb0b4fdabb48 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -6,7 +6,7 @@ , pkg-config , meson , ninja -, gnome3 +, gnome , glib , gtk3 , gobject-introspection @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix index f94d35fd131c7..93a308a658da4 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix @@ -5,7 +5,7 @@ , libxml2 , xdg-desktop-portal , gtk3 -, gnome3 +, gnome , glib , wrapGAppsHook , gsettings-desktop-schemas @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { glib gsettings-desktop-schemas # settings exposed by settings portal gtk3 - gnome3.gnome-desktop - gnome3.gnome-settings-daemon # schemas needed for settings api (mostly useless now that fonts were moved to g-d-s) + gnome.gnome-desktop + gnome.gnome-settings-daemon # schemas needed for settings api (mostly useless now that fonts were moved to g-d-s) ]; meta = with lib; { diff --git a/pkgs/development/misc/yelp-tools/default.nix b/pkgs/development/misc/yelp-tools/default.nix index ca7050c06781b..fc3be7421adb2 100644 --- a/pkgs/development/misc/yelp-tools/default.nix +++ b/pkgs/development/misc/yelp-tools/default.nix @@ -4,7 +4,7 @@ , libxml2 , libxslt , itstool -, gnome3 +, gnome , pkg-config , meson , ninja @@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ itstool # build script checks for its presence but I am not sure if anything uses it - gnome3.yelp-xsl + gnome.yelp-xsl ]; pythonPath = [ @@ -47,7 +47,7 @@ python3.pkgs.buildPythonApplication rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/development/python-modules/gtimelog/default.nix b/pkgs/development/python-modules/gtimelog/default.nix index bb31baa78880f..15a1ddbf0614b 100644 --- a/pkgs/development/python-modules/gtimelog/default.nix +++ b/pkgs/development/python-modules/gtimelog/default.nix @@ -46,11 +46,11 @@ buildPythonPackage rec { To run gtimelog successfully on a system that does not have full GNOME 3 installed, the following NixOS options should be set: - programs.dconf.enable = true; - - services.gnome3.gnome-keyring.enable = true; + - services.gnome.gnome-keyring.enable = true; In addition, the following packages should be added to the environment: - - gnome3.adwaita-icon-theme - - gnome3.dconf + - gnome.adwaita-icon-theme + - gnome.dconf ''; homepage = "https://gtimelog.org/"; license = licenses.gpl2Plus; diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix index bd4de52294326..b566edef64d1d 100644 --- a/pkgs/development/python-modules/pyatspi/default.nix +++ b/pkgs/development/python-modules/pyatspi/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, pkg-config, buildPythonPackage, isPy3k, at-spi2-core, pygobject3, gnome3 }: +{ lib, fetchurl, pkg-config, buildPythonPackage, isPy3k, at-spi2-core, pygobject3, gnome }: buildPythonPackage rec { pname = "pyatspi"; @@ -20,7 +20,7 @@ buildPythonPackage rec { disabled = !isPy3k; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "python3.pkgs.${pname}"; versionPolicy = "odd-unstable"; diff --git a/pkgs/development/python-modules/pygobject/3.36.nix b/pkgs/development/python-modules/pygobject/3.36.nix index 27bf8762d591c..ce9410eaf8b59 100644 --- a/pkgs/development/python-modules/pygobject/3.36.nix +++ b/pkgs/development/python-modules/pygobject/3.36.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, buildPythonPackage, pkg-config, glib, gobject-introspection, -pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome3 }: +pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome }: buildPythonPackage rec { pname = "pygobject"; diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index 641a30b16277f..373577dc46751 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -12,7 +12,7 @@ , meson , ninja , isPy3k -, gnome3 +, gnome }: buildPythonPackage rec { @@ -50,7 +50,7 @@ buildPythonPackage rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "python3.pkgs.${pname}3"; versionPolicy = "odd-unstable"; diff --git a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix index d031145a9977f..b536dc9406703 100644 --- a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix +++ b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, pkg-config, libxml2Python, libxslt, intltool, gnome3 +{ lib, fetchurl, pkg-config, libxml2Python, libxslt, intltool, gnome , python2Packages }: python2Packages.buildPythonApplication rec { @@ -24,7 +24,7 @@ python2Packages.buildPythonApplication rec { propagatedBuildInputs = [ libxml2Python ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index e74a6b9c3c6a4..a735bdb5fed4d 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -8,7 +8,7 @@ , docbook-xsl-nons , libxslt , gettext -, gnome3 +, gnome , withDblatex ? false, dblatex }: @@ -70,7 +70,7 @@ python3.pkgs.buildPythonApplication rec { passthru = { # Consumers are expected to copy the m4 files to their source tree, let them reuse the patch respect_xml_catalog_files_var_patch = ./respect-xml-catalog-files-var.patch; - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/tools/glade/default.nix b/pkgs/development/tools/glade/default.nix index d77772c32db6f..3e5c7b0438fd3 100644 --- a/pkgs/development/tools/glade/default.nix +++ b/pkgs/development/tools/glade/default.nix @@ -15,7 +15,7 @@ , libxml2 , docbook-xsl-nons , docbook_xml_dtd_42 -, gnome3 +, gnome , gdk-pixbuf , libxslt , gsettings-desktop-schemas @@ -54,11 +54,11 @@ stdenv.mkDerivation rec { python3.pkgs.pygobject3 gsettings-desktop-schemas gdk-pixbuf - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index 5c130a99c9267..73126752b98e6 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -7,7 +7,7 @@ , gtk3 , python3 , wrapGAppsHook -, gnome3 +, gnome , libwnck3 , gobject-introspection , gettext @@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ glib - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gtk3 libwnck3 ]; @@ -61,7 +61,7 @@ python3.pkgs.buildPythonApplication rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "dfeet"; versionPolicy = "none"; diff --git a/pkgs/development/tools/misc/gob2/default.nix b/pkgs/development/tools/misc/gob2/default.nix index b78c111ccbf8d..06487845fb3d1 100644 --- a/pkgs/development/tools/misc/gob2/default.nix +++ b/pkgs/development/tools/misc/gob2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, bison, flex, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, glib, bison, flex, gnome }: stdenv.mkDerivation rec { pname = "gob2"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib bison flex ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/tools/misc/msitools/default.nix b/pkgs/development/tools/misc/msitools/default.nix index 96ce9d4059147..ab196ebc5b34f 100644 --- a/pkgs/development/tools/misc/msitools/default.nix +++ b/pkgs/development/tools/misc/msitools/default.nix @@ -14,7 +14,7 @@ , libgsf , gcab , bzip2 -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/tools/nemiver/default.nix b/pkgs/development/tools/nemiver/default.nix index 58c0f2ed28b1d..7894dfe797d6f 100644 --- a/pkgs/development/tools/nemiver/default.nix +++ b/pkgs/development/tools/nemiver/default.nix @@ -2,7 +2,7 @@ , fetchurl , fetchpatch , pkg-config -, gnome3 +, gnome , gtk3 , libxml2 , intltool @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "nemiver"; versionPolicy = "none"; }; diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index 725d8d10e1182..6ceda016045bd 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -16,7 +16,7 @@ , shared-mime-info , systemd , wrapGAppsHook -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { pkg-config shared-mime-info wrapGAppsHook - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; buildInputs = [ @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix index ae1ac3e39f3e9..ca8359a32a8c2 100644 --- a/pkgs/development/tools/react-native-debugger/default.nix +++ b/pkgs/development/tools/react-native-debugger/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, unzip, cairo, xorg, gdk-pixbuf, fontconfig, pango, gnome3, atk, at-spi2-atk, at-spi2-core +{ lib, stdenv, fetchurl, unzip, cairo, xorg, gdk-pixbuf, fontconfig, pango, gnome, atk, at-spi2-atk, at-spi2-core , gtk3, glib, freetype, dbus, nss, nspr, alsaLib, cups, expat, udev, makeDesktopItem }: diff --git a/pkgs/development/web/cog/default.nix b/pkgs/development/web/cog/default.nix index 5344c1b833ca0..ed94b56e695fc 100644 --- a/pkgs/development/web/cog/default.nix +++ b/pkgs/development/web/cog/default.nix @@ -11,7 +11,7 @@ , webkitgtk , makeWrapper , wrapGAppsHook -, gnome3 +, gnome , gdk-pixbuf }: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { webkitgtk glib-networking gdk-pixbuf - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; nativeBuildInputs = [ diff --git a/pkgs/games/gscrabble/default.nix b/pkgs/games/gscrabble/default.nix index 74411d63d3ebf..f0e4121d8f2c3 100644 --- a/pkgs/games/gscrabble/default.nix +++ b/pkgs/games/gscrabble/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonApplication, fetchFromGitHub , gtk3, wrapGAppsHook, gst_all_1, gobject-introspection -, python3Packages, gnome3 }: +, python3Packages, gnome }: buildPythonApplication { pname = "gscrabble"; @@ -19,7 +19,7 @@ buildPythonApplication { buildInputs = with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad - gnome3.adwaita-icon-theme gtk3 gobject-introspection + gnome.adwaita-icon-theme gtk3 gobject-introspection ]; propagatedBuildInputs = with python3Packages; [ gst-python pygobject3 ]; diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix index c97ea55882b06..5f79b86956cc2 100644 --- a/pkgs/games/megaglest/default.nix +++ b/pkgs/games/megaglest/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, cmake, pkg-config, git, curl, SDL2, xercesc, openal, lua, libvlc , libjpeg, wxGTK, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng -, fontconfig, freetype, xorg, makeWrapper, bash, which, gnome3, libGLU, glib +, fontconfig, freetype, xorg, makeWrapper, bash, which, gnome, libGLU, glib , fetchFromGitHub }: let @@ -13,7 +13,7 @@ let }; path-env = buildEnv { name = "megaglest-path-env"; - paths = [ bash which gnome3.zenity ]; + paths = [ bash which gnome.zenity ]; }; in stdenv.mkDerivation { diff --git a/pkgs/games/openra/default.nix b/pkgs/games/openra/default.nix index 2e8533f7816ec..22d3c6c879ed0 100644 --- a/pkgs/games/openra/default.nix +++ b/pkgs/games/openra/default.nix @@ -25,7 +25,7 @@ let lua = pkgs.lua5_1; # It is not necessary to run the game, but it is nicer to be given an error dialog in the case of failure, # rather than having to look to the logs why it is not starting. - inherit (pkgs.gnome3) zenity; + inherit (pkgs.gnome) zenity; }); /* Building a set of engines or mods requires some dependencies as well, diff --git a/pkgs/games/openra/packages.nix b/pkgs/games/openra/packages.nix index c09b697771a39..2f4c83c7d5a32 100644 --- a/pkgs/games/openra/packages.nix +++ b/pkgs/games/openra/packages.nix @@ -15,7 +15,7 @@ let lua = pkgs.lua5_1; # It is not necessary to run the game, but it is nicer to be given an error dialog in the case of failure, # rather than having to look to the logs why it is not starting. - inherit (pkgs.gnome3) zenity; + inherit (pkgs.gnome) zenity; }); /* Building a set of engines or mods requires some dependencies as well, diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index f17c436cccb5c..de2163d678449 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -85,7 +85,7 @@ in buildFHSUserEnv rec { targetPkgs = pkgs: with pkgs; [ steamPackages.steam # License agreement - gnome3.zenity + gnome.zenity ] ++ commonTargetPkgs pkgs; multiPkgs = pkgs: with pkgs; [ diff --git a/pkgs/misc/emulators/cdemu/analyzer.nix b/pkgs/misc/emulators/cdemu/analyzer.nix index 246dbb7dd3504..dddcc3a746821 100644 --- a/pkgs/misc/emulators/cdemu/analyzer.nix +++ b/pkgs/misc/emulators/cdemu/analyzer.nix @@ -1,5 +1,5 @@ { callPackage, makeWrapper, gobject-introspection, cmake -, python3Packages, gtk3, glib, libxml2, gnuplot, gnome3, gdk-pixbuf, librsvg, intltool, libmirage }: +, python3Packages, gtk3, glib, libxml2, gnuplot, gnome, gdk-pixbuf, librsvg, intltool, libmirage }: let pkg = import ./base.nix { version = "3.2.3"; pkgName = "image-analyzer"; @@ -7,7 +7,7 @@ let pkg = import ./base.nix { }; in callPackage pkg { buildInputs = [ glib gtk3 libxml2 gnuplot libmirage makeWrapper - gnome3.adwaita-icon-theme gdk-pixbuf librsvg intltool + gnome.adwaita-icon-theme gdk-pixbuf librsvg intltool python3Packages.python python3Packages.pygobject3 python3Packages.matplotlib ]; drvParams = { nativeBuildInputs = [ gobject-introspection cmake ]; diff --git a/pkgs/misc/emulators/cdemu/gui.nix b/pkgs/misc/emulators/cdemu/gui.nix index 599531950a214..8ce84ccae204a 100644 --- a/pkgs/misc/emulators/cdemu/gui.nix +++ b/pkgs/misc/emulators/cdemu/gui.nix @@ -1,5 +1,5 @@ { callPackage, makeWrapper, gobject-introspection, cmake -, python3Packages, gtk3, glib, libnotify, intltool, gnome3, gdk-pixbuf, librsvg }: +, python3Packages, gtk3, glib, libnotify, intltool, gnome, gdk-pixbuf, librsvg }: let pkg = import ./base.nix { version = "3.2.3"; @@ -9,7 +9,7 @@ let inherit (python3Packages) python pygobject3; in callPackage pkg { buildInputs = [ python pygobject3 gtk3 glib libnotify intltool makeWrapper - gnome3.adwaita-icon-theme gdk-pixbuf librsvg ]; + gnome.adwaita-icon-theme gdk-pixbuf librsvg ]; drvParams = { nativeBuildInputs = [ gobject-introspection cmake ]; postFixup = '' diff --git a/pkgs/misc/emulators/nestopia/default.nix b/pkgs/misc/emulators/nestopia/default.nix index 70e5d94def6f8..502e5c647237a 100644 --- a/pkgs/misc/emulators/nestopia/default.nix +++ b/pkgs/misc/emulators/nestopia/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, pkg-config, SDL2, alsaLib, gtk3 , makeWrapper, libGLU, libGL, libarchive, libao, unzip, xdg-utils -, epoxy, gdk-pixbuf, gnome3, wrapGAppsHook +, epoxy, gdk-pixbuf, gnome, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { libarchive libao xdg-utils - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; nativeBuildInputs = [ diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index f9801c5895ad2..4e87b7d36cbd0 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -20,7 +20,7 @@ , dasht , direnv , fzf -, gnome3 +, gnome , khard , languagetool , llvmPackages @@ -515,7 +515,7 @@ self: super: { vCoolor-vim = super.vCoolor-vim.overrideAttrs (old: { # on linux can use either Zenity or Yad. - propagatedBuildInputs = [ gnome3.zenity ]; + propagatedBuildInputs = [ gnome.zenity ]; meta = { description = "Simple color selector/picker plugin"; license = lib.licenses.publicDomain; diff --git a/pkgs/os-specific/linux/piper/default.nix b/pkgs/os-specific/linux/piper/default.nix index 839b3f1b78f51..5edcd263f0d93 100644 --- a/pkgs/os-specific/linux/piper/default.nix +++ b/pkgs/os-specific/linux/piper/default.nix @@ -1,5 +1,5 @@ { lib, meson, ninja, pkg-config, gettext, fetchFromGitHub, python3 -, wrapGAppsHook, gtk3, glib, desktop-file-utils, appstream-glib, gnome3 +, wrapGAppsHook, gtk3, glib, desktop-file-utils, appstream-glib, gnome , gobject-introspection }: python3.pkgs.buildPythonApplication rec { @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ meson ninja gettext pkg-config wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ]; buildInputs = [ - gtk3 glib gnome3.adwaita-icon-theme python3 + gtk3 glib gnome.adwaita-icon-theme python3 ]; propagatedBuildInputs = with python3.pkgs; [ lxml evdev pygobject3 ] ++ [ gobject-introspection # fixes https://github.com/NixOS/nixpkgs/issues/56943 for now diff --git a/pkgs/tools/X11/wpgtk/default.nix b/pkgs/tools/X11/wpgtk/default.nix index cf9bbd9bb9880..66464ae0b532c 100644 --- a/pkgs/tools/X11/wpgtk/default.nix +++ b/pkgs/tools/X11/wpgtk/default.nix @@ -1,5 +1,5 @@ { lib, python3Packages, fetchFromGitHub, libxslt, - gobject-introspection, gtk3, wrapGAppsHook, gnome3 }: + gobject-introspection, gtk3, wrapGAppsHook, gnome }: python3Packages.buildPythonApplication rec { pname = "wpgtk"; @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { wrapGAppsHook gtk3 gobject-introspection - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme libxslt ]; diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix index 9f4d4effeeeb1..5e00e487e23e8 100644 --- a/pkgs/tools/admin/gtk-vnc/default.nix +++ b/pkgs/tools/admin/gtk-vnc/default.nix @@ -15,7 +15,7 @@ , vala , gettext , perl -, gnome3 +, gnome , gdk-pixbuf , zlib }: @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix index 312dc62d575e2..03ea3302d262a 100644 --- a/pkgs/tools/audio/gvolicon/default.nix +++ b/pkgs/tools/audio/gvolicon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, makeWrapper, alsaLib, pkg-config, fetchgit, gtk3, gnome3, gdk-pixbuf, librsvg, wrapGAppsHook }: +{ lib, stdenv, makeWrapper, alsaLib, pkg-config, fetchgit, gtk3, gnome, gdk-pixbuf, librsvg, wrapGAppsHook }: stdenv.mkDerivation { name = "gvolicon-2014-04-28"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - makeWrapper alsaLib gtk3 gdk-pixbuf gnome3.adwaita-icon-theme + makeWrapper alsaLib gtk3 gdk-pixbuf gnome.adwaita-icon-theme librsvg wrapGAppsHook ]; diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix index 4a2030d74455c..2bedd2abacddd 100644 --- a/pkgs/tools/audio/pasystray/default.nix +++ b/pkgs/tools/audio/pasystray/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchpatch, fetchFromGitHub, pkg-config, autoreconfHook, wrapGAppsHook -, gnome3, avahi, gtk3, libayatana-appindicator-gtk3, libnotify, libpulseaudio +, gnome, avahi, gtk3, libayatana-appindicator-gtk3, libnotify, libpulseaudio , xlibsWrapper, gsettings-desktop-schemas }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook ]; buildInputs = [ - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme avahi gtk3 libayatana-appindicator-gtk3 libnotify libpulseaudio xlibsWrapper gsettings-desktop-schemas ]; diff --git a/pkgs/tools/bluetooth/blueberry/default.nix b/pkgs/tools/bluetooth/blueberry/default.nix index 71ce9060b255c..b932b8e66c6fe 100644 --- a/pkgs/tools/bluetooth/blueberry/default.nix +++ b/pkgs/tools/bluetooth/blueberry/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , bluez-tools , cinnamon -, gnome3 +, gnome , gobject-introspection , intltool , pavucontrol @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { buildInputs = [ bluez-tools cinnamon.xapps - gnome3.gnome-bluetooth + gnome.gnome-bluetooth python3Packages.python util-linux ]; diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index b30a8763706b7..7b3aa397fc351 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -1,6 +1,6 @@ { config, stdenv, lib, fetchurl, intltool, pkg-config, python3Packages, bluez, gtk3 , obex_data_server, xdg-utils, dnsmasq, dhcp, libappindicator, iproute2 -, gnome3, librsvg, wrapGAppsHook, gobject-introspection, autoreconfHook +, gnome, librsvg, wrapGAppsHook, gobject-introspection, autoreconfHook , networkmanager, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio, fetchpatch }: let @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ bluez gtk3 pythonPackages.python librsvg - gnome3.adwaita-icon-theme iproute2 libappindicator networkmanager ] + gnome.adwaita-icon-theme iproute2 libappindicator networkmanager ] ++ pythonPath ++ lib.optional withPulseAudio libpulseaudio; diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix index 6e0c48d0610c6..3d34dcbac1759 100644 --- a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, pkg-config, cmake, fcitx, gtk3, isocodes, gnome3 }: +{ lib, stdenv, fetchurl, makeWrapper, pkg-config, cmake, fcitx, gtk3, isocodes, gnome }: stdenv.mkDerivation rec { name = "fcitx-configtool-0.4.10"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config makeWrapper ]; - buildInputs = [ fcitx isocodes gtk3 gnome3.adwaita-icon-theme ]; + buildInputs = [ fcitx isocodes gtk3 gnome.adwaita-icon-theme ]; # Patch paths to `fcitx-remote` prePatch = '' diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 3b63d7c02039e..9bbbe1493f763 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, gettext, makeWrapper, coreutils, gnused, gnome3 +{ lib, stdenv, fetchurl, intltool, gettext, makeWrapper, coreutils, gnused, gnome , gnugrep, parted, glib, libuuid, pkg-config, gtkmm3, libxml2 , gpart, hdparm, procps, util-linux, polkit, wrapGAppsHook, substituteAll }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-doc" ]; - buildInputs = [ parted glib libuuid gtkmm3 libxml2 polkit.bin gnome3.adwaita-icon-theme ]; + buildInputs = [ parted glib libuuid gtkmm3 libxml2 polkit.bin gnome.adwaita-icon-theme ]; nativeBuildInputs = [ intltool gettext pkg-config wrapGAppsHook ]; preFixup = '' diff --git a/pkgs/tools/misc/gsmartcontrol/default.nix b/pkgs/tools/misc/gsmartcontrol/default.nix index 2dffada9fe74d..e52ae44a83f9f 100644 --- a/pkgs/tools/misc/gsmartcontrol/default.nix +++ b/pkgs/tools/misc/gsmartcontrol/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, smartmontools, autoreconfHook, gettext, gtkmm3, pkg-config, wrapGAppsHook, pcre-cpp, gnome3 }: +{ fetchurl, lib, stdenv, smartmontools, autoreconfHook, gettext, gtkmm3, pkg-config, wrapGAppsHook, pcre-cpp, gnome }: stdenv.mkDerivation rec { version="1.1.3"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ autoreconfHook gettext pkg-config wrapGAppsHook ]; - buildInputs = [ gtkmm3 pcre-cpp gnome3.adwaita-icon-theme ]; + buildInputs = [ gtkmm3 pcre-cpp gnome.adwaita-icon-theme ]; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/kodi-cli/default.nix b/pkgs/tools/misc/kodi-cli/default.nix index 56795e7c93f31..10b9cea73d762 100644 --- a/pkgs/tools/misc/kodi-cli/default.nix +++ b/pkgs/tools/misc/kodi-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, curl, bash, jq, youtube-dl, gnome3 }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, curl, bash, jq, youtube-dl, gnome }: stdenv.mkDerivation rec { pname = "kodi-cli"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp -a kodi-cli $out/bin wrapProgram $out/bin/kodi-cli --prefix PATH : ${lib.makeBinPath [ curl bash ]} cp -a playlist_to_kodi $out/bin - wrapProgram $out/bin/playlist_to_kodi --prefix PATH : ${lib.makeBinPath [ curl bash gnome3.zenity jq youtube-dl ]} + wrapProgram $out/bin/playlist_to_kodi --prefix PATH : ${lib.makeBinPath [ curl bash gnome.zenity jq youtube-dl ]} ''; meta = with lib; { diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix index 41828d322e850..c1861e33c0815 100644 --- a/pkgs/tools/networking/gupnp-tools/default.nix +++ b/pkgs/tools/networking/gupnp-tools/default.nix @@ -10,7 +10,7 @@ , gettext , gupnp-av , gtksourceview4 -, gnome3 +, gnome , wrapGAppsHook }: @@ -38,11 +38,11 @@ stdenv.mkDerivation rec { gtk3 gupnp-av gtksourceview4 - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/tools/networking/networkmanager/applet/default.nix b/pkgs/tools/networking/networkmanager/applet/default.nix index cffacddf8bd4f..633c932def83d 100644 --- a/pkgs/tools/networking/networkmanager/applet/default.nix +++ b/pkgs/tools/networking/networkmanager/applet/default.nix @@ -5,7 +5,7 @@ , gettext , pkg-config , networkmanager -, gnome3 +, gnome , libnotify , libsecret , polkit @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { glib glib-networking libappindicator-gtk3 - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; nativeBuildInputs = [ @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "networkmanagerapplet"; versionPolicy = "odd-unstable"; diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index c2de2ed8adb9e..ccd16c70a8aff 100644 --- a/pkgs/tools/networking/networkmanager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, substituteAll, intltool, pkg-config, fetchpatch, dbus -, gnome3, systemd, libuuid, polkit, gnutls, ppp, dhcp, iptables, python3, vala +, gnome, systemd, libuuid, polkit, gnutls, ppp, dhcp, iptables, python3, vala , libgcrypt, dnsmasq, bluez5, readline, libselinux, audit , gobject-introspection, modemmanager, openresolv, libndp, newt, libsoup , ethtool, gnused, iputils, kmod, jansson, gtk-doc, libxslt @@ -96,7 +96,7 @@ in stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "networkmanager"; }; diff --git a/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix b/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix index 25554b2796381..f97bac13cf7f1 100644 --- a/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix +++ b/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix @@ -11,7 +11,7 @@ , ppp , libsecret , withGnome ? true -, gnome3 +, gnome , fetchpatch , libnma }: @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "networkmanager-fortisslvpn"; versionPolicy = "odd-unstable"; diff --git a/pkgs/tools/networking/networkmanager/iodine/default.nix b/pkgs/tools/networking/networkmanager/iodine/default.nix index 87069d3c3c808..e56d9411b3933 100644 --- a/pkgs/tools/networking/networkmanager/iodine/default.nix +++ b/pkgs/tools/networking/networkmanager/iodine/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitLab, substituteAll, autoreconfHook, iodine, intltool, pkg-config, networkmanager, libsecret, gtk3 -, withGnome ? true, gnome3, fetchpatch, libnma, glib }: +, withGnome ? true, gnome, fetchpatch, libnma, glib }: let pname = "NetworkManager-iodine"; @@ -44,7 +44,7 @@ in stdenv.mkDerivation { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "networkmanager-iodine"; }; diff --git a/pkgs/tools/networking/networkmanager/libnma/default.nix b/pkgs/tools/networking/networkmanager/libnma/default.nix index 35f79a773c3db..50fc66a8d68b2 100644 --- a/pkgs/tools/networking/networkmanager/libnma/default.nix +++ b/pkgs/tools/networking/networkmanager/libnma/default.nix @@ -7,7 +7,7 @@ , pkg-config , vala , networkmanager -, gnome3 +, gnome , isocodes , libxml2 , docbook_xsl @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/tools/networking/networkmanager/openconnect/default.nix b/pkgs/tools/networking/networkmanager/openconnect/default.nix index 6dbb718a6b64d..c03a698514a8f 100644 --- a/pkgs/tools/networking/networkmanager/openconnect/default.nix +++ b/pkgs/tools/networking/networkmanager/openconnect/default.nix @@ -13,7 +13,7 @@ , file , gtk3 , withGnome ? true -, gnome3 +, gnome , kmod , fetchpatch }: @@ -66,7 +66,7 @@ in stdenv.mkDerivation { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "networkmanager-openconnect"; versionPolicy = "odd-unstable"; diff --git a/pkgs/tools/networking/networkmanager/openvpn/default.nix b/pkgs/tools/networking/networkmanager/openvpn/default.nix index ab87bc8371d27..06df79e470525 100644 --- a/pkgs/tools/networking/networkmanager/openvpn/default.nix +++ b/pkgs/tools/networking/networkmanager/openvpn/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkg-config, file, networkmanager, libsecret -, gtk3, withGnome ? true, gnome3, kmod, libnma }: +, gtk3, withGnome ? true, gnome, kmod, libnma }: let pname = "NetworkManager-openvpn"; @@ -31,7 +31,7 @@ in stdenv.mkDerivation { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "networkmanager-openvpn"; versionPolicy = "odd-unstable"; diff --git a/pkgs/tools/networking/networkmanager/sstp/default.nix b/pkgs/tools/networking/networkmanager/sstp/default.nix index d00c0e3e55f8a..f486623443807 100644 --- a/pkgs/tools/networking/networkmanager/sstp/default.nix +++ b/pkgs/tools/networking/networkmanager/sstp/default.nix @@ -4,7 +4,7 @@ , fetchpatch , file , glib -, gnome3 +, gnome , gtk3 , intltool , libnma @@ -50,7 +50,7 @@ in stdenv.mkDerivation { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "networkmanager-sstp"; }; diff --git a/pkgs/tools/networking/networkmanager/strongswan/default.nix b/pkgs/tools/networking/networkmanager/strongswan/default.nix index c4cb79b4c8c34..cebcec35a314f 100644 --- a/pkgs/tools/networking/networkmanager/strongswan/default.nix +++ b/pkgs/tools/networking/networkmanager/strongswan/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, intltool, pkg-config, networkmanager, strongswanNM -, gtk3, gnome3, libsecret, libnma }: +, gtk3, gnome, libsecret, libnma }: stdenv.mkDerivation rec { pname = "NetworkManager-strongswan"; diff --git a/pkgs/tools/networking/networkmanager/vpnc/default.nix b/pkgs/tools/networking/networkmanager/vpnc/default.nix index 5181e3160e23b..70e7104696ee3 100644 --- a/pkgs/tools/networking/networkmanager/vpnc/default.nix +++ b/pkgs/tools/networking/networkmanager/vpnc/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, substituteAll, vpnc, intltool, pkg-config, networkmanager, libsecret -, gtk3, withGnome ? true, gnome3, glib, kmod, file, fetchpatch, libnma }: +, gtk3, withGnome ? true, gnome, glib, kmod, file, fetchpatch, libnma }: let pname = "NetworkManager-vpnc"; version = "1.2.6"; @@ -35,7 +35,7 @@ in stdenv.mkDerivation { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "networkmanager-vpnc"; versionPolicy = "odd-unstable"; diff --git a/pkgs/tools/security/onioncircuits/default.nix b/pkgs/tools/security/onioncircuits/default.nix index 8c5083ee8af66..f5d9185dc9869 100644 --- a/pkgs/tools/security/onioncircuits/default.nix +++ b/pkgs/tools/security/onioncircuits/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchgit, python3, intltool, gtk3, gobject-introspection, gnome3 }: +{ lib, fetchgit, python3, intltool, gtk3, gobject-introspection, gnome }: python3.pkgs.buildPythonApplication rec { pname = "onioncircuits"; @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { postFixup = '' wrapProgram "$out/bin/onioncircuits" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix XDG_DATA_DIRS : "$out/share:${gnome3.adwaita-icon-theme}/share" + --prefix XDG_DATA_DIRS : "$out/share:${gnome.adwaita-icon-theme}/share" ''; meta = with lib; { diff --git a/pkgs/tools/text/gtranslator/default.nix b/pkgs/tools/text/gtranslator/default.nix index 8408d42da1b20..5bc99724e3faf 100644 --- a/pkgs/tools/text/gtranslator/default.nix +++ b/pkgs/tools/text/gtranslator/default.nix @@ -17,7 +17,7 @@ , libdazzle , gtk3 , gtksourceview4 -, gnome3 +, gnome , gsettings-desktop-schemas }: @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c7f7d36cbf0c0..f535021791d52 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -300,6 +300,7 @@ mapAliases ({ gtk_doc = gtk-doc; # added 2018-02-25 guileCairo = guile-cairo; # added 2017-09-24 guileGnome = guile-gnome; # added 2017-09-24 + gnome3 = gnome; # added 2021-05-07 guileLint = guile-lint; # added 2017-09-27 guile_lib = guile-lib; # added 2017-09-24 guile_ncurses = guile-ncurses; # added 2017-09-24 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b0e720e7509b..8c4d82452e7fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -794,7 +794,7 @@ in aj-snapshot = callPackage ../applications/audio/aj-snapshot { }; ajour = callPackage ../tools/games/ajour { - inherit (gnome3) zenity; + inherit (gnome) zenity; inherit (plasma5Packages) kdialog; }; @@ -3538,7 +3538,7 @@ in libpinyin = callPackage ../development/libraries/libpinyin { }; libskk = callPackage ../development/libraries/libskk { - inherit (gnome3) gnome-common; + inherit (gnome) gnome-common; }; m17n_db = callPackage ../tools/inputmethods/m17n-db { }; @@ -6380,7 +6380,7 @@ in libite = callPackage ../development/libraries/libite { }; liblangtag = callPackage ../development/libraries/liblangtag { - inherit (gnome3) gnome-common; + inherit (gnome) gnome-common; }; liblouis = callPackage ../development/libraries/liblouis { }; @@ -15678,7 +15678,7 @@ in libgig = callPackage ../development/libraries/libgig { }; libgnome-keyring = callPackage ../development/libraries/libgnome-keyring { }; - libgnome-keyring3 = gnome3.libgnome-keyring; + libgnome-keyring3 = gnome.libgnome-keyring; libgnomekbd = callPackage ../development/libraries/libgnomekbd { }; @@ -16180,7 +16180,7 @@ in libopusenc = callPackage ../development/libraries/libopusenc { }; libosinfo = callPackage ../development/libraries/libosinfo { - inherit (gnome3) libsoup; + inherit (gnome) libsoup; }; libosip = callPackage ../development/libraries/osip {}; @@ -21488,7 +21488,7 @@ in kopia = callPackage ../tools/backup/kopia { }; kora-icon-theme = callPackage ../data/icons/kora-icon-theme { - inherit (gnome3) adwaita-icon-theme; + inherit (gnome) adwaita-icon-theme; inherit (libsForQt5.kdeFrameworks) breeze-icons; }; @@ -22251,7 +22251,7 @@ in awesomebump = libsForQt5.callPackage ../applications/graphics/awesomebump { }; - inherit (gnome3) baobab; + inherit (gnome) baobab; backintime-common = callPackage ../applications/networking/sync/backintime/common.nix { }; @@ -22312,7 +22312,7 @@ in (callPackage ../applications/science/electronics/bitscope/packages.nix { }); bitwig-studio1 = callPackage ../applications/audio/bitwig-studio/bitwig-studio1.nix { - inherit (gnome3) zenity; + inherit (gnome) zenity; libxkbcommon = libxkbcommon_7; }; bitwig-studio2 = callPackage ../applications/audio/bitwig-studio/bitwig-studio2.nix { @@ -22856,7 +22856,7 @@ in pkgs' = pkgs; # default pkgs used for bootstrapping the emacs package set }; - inherit (gnome3) empathy; + inherit (gnome) empathy; enhanced-ctorrent = callPackage ../applications/networking/enhanced-ctorrent { }; @@ -22870,7 +22870,7 @@ in epgstation = callPackage ../applications/video/epgstation { }; - inherit (gnome3) epiphany; + inherit (gnome) epiphany; ephemeral = callPackage ../applications/networking/browsers/ephemeral { }; @@ -22925,8 +22925,8 @@ in keeweb = callPackage ../applications/misc/keeweb { }; - inherit (gnome3) evince; - evolution-data-server = gnome3.evolution-data-server; + inherit (gnome) evince; + evolution-data-server = gnome.evolution-data-server; evolution-ews = callPackage ../applications/networking/mailreaders/evolution/evolution-ews { }; evolution = callPackage ../applications/networking/mailreaders/evolution/evolution { }; evolutionWithPlugins = callPackage ../applications/networking/mailreaders/evolution/evolution/wrapper.nix { plugins = [ evolution evolution-ews ]; }; @@ -23204,7 +23204,7 @@ in gtimelog = with python3Packages; toPythonApplication gtimelog; - inherit (gnome3) gucharmap; + inherit (gnome) gucharmap; guitarix = callPackage ../applications/audio/guitarix { fftw = fftwSinglePrec; @@ -23480,7 +23480,7 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - inherit (gnome3) gitg; + inherit (gnome) gitg; gmrun = callPackage ../applications/misc/gmrun {}; @@ -23613,7 +23613,7 @@ in celluloid = callPackage ../applications/video/celluloid { }; gnome-recipes = callPackage ../applications/misc/gnome-recipes { - inherit (gnome3) gnome-autoar; + inherit (gnome) gnome-autoar; }; gollum = callPackage ../applications/misc/gollum { }; @@ -24518,7 +24518,7 @@ in luppp = callPackage ../applications/audio/luppp { }; lutris-unwrapped = python3.pkgs.callPackage ../applications/misc/lutris { - inherit (gnome3) gnome-desktop; + inherit (gnome) gnome-desktop; wine = wineWowPackages.staging; }; lutris = callPackage ../applications/misc/lutris/fhsenv.nix { @@ -25946,7 +25946,7 @@ in shutter = callPackage ../applications/graphics/shutter { }; - simple-scan = gnome3.simple-scan; + simple-scan = gnome.simple-scan; siproxd = callPackage ../applications/networking/siproxd { }; @@ -26219,7 +26219,7 @@ in surf-display = callPackage ../desktops/surf-display { }; surge = callPackage ../applications/audio/surge { - inherit (gnome3) zenity; + inherit (gnome) zenity; git = gitMinimal; }; @@ -27350,7 +27350,7 @@ in yeetgif = callPackage ../applications/graphics/yeetgif { }; - inherit (gnome3) yelp; + inherit (gnome) yelp; yelp-tools = callPackage ../development/misc/yelp-tools { }; @@ -28364,7 +28364,7 @@ in protontricks = python3Packages.callPackage ../tools/package-management/protontricks { inherit steam-run; inherit winetricks; - inherit (gnome3) zenity; + inherit (gnome) zenity; }; sdlpop = callPackage ../games/sdlpop { }; @@ -28636,46 +28636,46 @@ in gnome2 = recurseIntoAttrs (callPackage ../desktops/gnome-2 { }); - gnome3 = recurseIntoAttrs (callPackage ../desktops/gnome-3 { }); + gnome = recurseIntoAttrs (callPackage ../desktops/gnome { }); gnomeExtensions = recurseIntoAttrs { - appindicator = callPackage ../desktops/gnome-3/extensions/appindicator { }; - arcmenu = callPackage ../desktops/gnome-3/extensions/arcmenu { }; - caffeine = callPackage ../desktops/gnome-3/extensions/caffeine { }; - clipboard-indicator = callPackage ../desktops/gnome-3/extensions/clipboard-indicator { }; - clock-override = callPackage ../desktops/gnome-3/extensions/clock-override { }; - dash-to-dock = callPackage ../desktops/gnome-3/extensions/dash-to-dock { }; - dash-to-panel = callPackage ../desktops/gnome-3/extensions/dash-to-panel { }; - disable-unredirect = callPackage ../desktops/gnome-3/extensions/disable-unredirect { }; - draw-on-your-screen = callPackage ../desktops/gnome-3/extensions/draw-on-your-screen { }; - drop-down-terminal = callPackage ../desktops/gnome-3/extensions/drop-down-terminal { }; - dynamic-panel-transparency = callPackage ../desktops/gnome-3/extensions/dynamic-panel-transparency { }; - easyScreenCast = callPackage ../desktops/gnome-3/extensions/EasyScreenCast { }; - emoji-selector = callPackage ../desktops/gnome-3/extensions/emoji-selector { }; - freon = callPackage ../desktops/gnome-3/extensions/freon { }; - fuzzy-app-search = callPackage ../desktops/gnome-3/extensions/fuzzy-app-search { }; - gsconnect = callPackage ../desktops/gnome-3/extensions/gsconnect { }; - hot-edge = callPackage ../desktops/gnome-3/extensions/hot-edge { }; - icon-hider = callPackage ../desktops/gnome-3/extensions/icon-hider { }; - impatience = callPackage ../desktops/gnome-3/extensions/impatience { }; - material-shell = callPackage ../desktops/gnome-3/extensions/material-shell { }; - mpris-indicator-button = callPackage ../desktops/gnome-3/extensions/mpris-indicator-button { }; - night-theme-switcher = callPackage ../desktops/gnome-3/extensions/night-theme-switcher { }; - no-title-bar = callPackage ../desktops/gnome-3/extensions/no-title-bar { }; - noannoyance = callPackage ../desktops/gnome-3/extensions/noannoyance { }; - paperwm = callPackage ../desktops/gnome-3/extensions/paperwm { }; - pidgin-im-integration = callPackage ../desktops/gnome-3/extensions/pidgin-im-integration { }; - remove-dropdown-arrows = callPackage ../desktops/gnome-3/extensions/remove-dropdown-arrows { }; - sound-output-device-chooser = callPackage ../desktops/gnome-3/extensions/sound-output-device-chooser { }; - system-monitor = callPackage ../desktops/gnome-3/extensions/system-monitor { }; - taskwhisperer = callPackage ../desktops/gnome-3/extensions/taskwhisperer { }; - tilingnome = callPackage ../desktops/gnome-3/extensions/tilingnome { }; - timepp = callPackage ../desktops/gnome-3/extensions/timepp { }; - topicons-plus = callPackage ../desktops/gnome-3/extensions/topicons-plus { }; - unite = callPackage ../desktops/gnome-3/extensions/unite { }; - window-corner-preview = callPackage ../desktops/gnome-3/extensions/window-corner-preview { }; - window-is-ready-remover = callPackage ../desktops/gnome-3/extensions/window-is-ready-remover { }; - workspace-matrix = callPackage ../desktops/gnome-3/extensions/workspace-matrix { }; + appindicator = callPackage ../desktops/gnome/extensions/appindicator { }; + arcmenu = callPackage ../desktops/gnome/extensions/arcmenu { }; + caffeine = callPackage ../desktops/gnome/extensions/caffeine { }; + clipboard-indicator = callPackage ../desktops/gnome/extensions/clipboard-indicator { }; + clock-override = callPackage ../desktops/gnome/extensions/clock-override { }; + dash-to-dock = callPackage ../desktops/gnome/extensions/dash-to-dock { }; + dash-to-panel = callPackage ../desktops/gnome/extensions/dash-to-panel { }; + disable-unredirect = callPackage ../desktops/gnome/extensions/disable-unredirect { }; + draw-on-your-screen = callPackage ../desktops/gnome/extensions/draw-on-your-screen { }; + drop-down-terminal = callPackage ../desktops/gnome/extensions/drop-down-terminal { }; + dynamic-panel-transparency = callPackage ../desktops/gnome/extensions/dynamic-panel-transparency { }; + easyScreenCast = callPackage ../desktops/gnome/extensions/EasyScreenCast { }; + emoji-selector = callPackage ../desktops/gnome/extensions/emoji-selector { }; + freon = callPackage ../desktops/gnome/extensions/freon { }; + fuzzy-app-search = callPackage ../desktops/gnome/extensions/fuzzy-app-search { }; + gsconnect = callPackage ../desktops/gnome/extensions/gsconnect { }; + hot-edge = callPackage ../desktops/gnome/extensions/hot-edge { }; + icon-hider = callPackage ../desktops/gnome/extensions/icon-hider { }; + impatience = callPackage ../desktops/gnome/extensions/impatience { }; + material-shell = callPackage ../desktops/gnome/extensions/material-shell { }; + mpris-indicator-button = callPackage ../desktops/gnome/extensions/mpris-indicator-button { }; + night-theme-switcher = callPackage ../desktops/gnome/extensions/night-theme-switcher { }; + no-title-bar = callPackage ../desktops/gnome/extensions/no-title-bar { }; + noannoyance = callPackage ../desktops/gnome/extensions/noannoyance { }; + paperwm = callPackage ../desktops/gnome/extensions/paperwm { }; + pidgin-im-integration = callPackage ../desktops/gnome/extensions/pidgin-im-integration { }; + remove-dropdown-arrows = callPackage ../desktops/gnome/extensions/remove-dropdown-arrows { }; + sound-output-device-chooser = callPackage ../desktops/gnome/extensions/sound-output-device-chooser { }; + system-monitor = callPackage ../desktops/gnome/extensions/system-monitor { }; + taskwhisperer = callPackage ../desktops/gnome/extensions/taskwhisperer { }; + tilingnome = callPackage ../desktops/gnome/extensions/tilingnome { }; + timepp = callPackage ../desktops/gnome/extensions/timepp { }; + topicons-plus = callPackage ../desktops/gnome/extensions/topicons-plus { }; + unite = callPackage ../desktops/gnome/extensions/unite { }; + window-corner-preview = callPackage ../desktops/gnome/extensions/window-corner-preview { }; + window-is-ready-remover = callPackage ../desktops/gnome/extensions/window-is-ready-remover { }; + workspace-matrix = callPackage ../desktops/gnome/extensions/workspace-matrix { }; nohotcorner = throw "gnomeExtensions.nohotcorner removed since 2019-10-09: Since 3.34, it is a part of GNOME Shell configurable through GNOME Tweaks."; mediaplayer = throw "gnomeExtensions.mediaplayer deprecated since 2019-09-23: retired upstream https://github.com/JasonLG1979/gnome-shell-extensions-mediaplayer/blob/master/README.md"; @@ -28684,9 +28684,9 @@ in arc-menu = gnomeExtensions.arcmenu; # added 2021-02-14 }; - gnome-connections = callPackage ../desktops/gnome-3/apps/gnome-connections { }; + gnome-connections = callPackage ../desktops/gnome/apps/gnome-connections { }; - gnome-tour = callPackage ../desktops/gnome-3/core/gnome-tour { }; + gnome-tour = callPackage ../desktops/gnome/core/gnome-tour { }; hhexen = callPackage ../games/hhexen { }; @@ -28722,7 +28722,7 @@ in latte-dock = libsForQt5.callPackage ../applications/misc/latte-dock { }; - gnome-themes-extra = gnome3.gnome-themes-extra; + gnome-themes-extra = gnome.gnome-themes-extra; rox-filer = callPackage ../desktops/rox/rox-filer { gtk = gtk2; @@ -30831,7 +30831,7 @@ in }); winetricks = callPackage ../misc/emulators/wine/winetricks.nix { - inherit (gnome3) zenity; + inherit (gnome) zenity; }; wishbone-tool = callPackage ../development/tools/misc/wishbone-tool { }; @@ -31096,7 +31096,7 @@ in chrome-export = callPackage ../tools/misc/chrome-export {}; - chrome-gnome-shell = callPackage ../desktops/gnome-3/extensions/chrome-gnome-shell {}; + chrome-gnome-shell = callPackage ../desktops/gnome/extensions/chrome-gnome-shell {}; chrome-token-signing = libsForQt5.callPackage ../tools/security/chrome-token-signing {}; -- cgit 1.4.1