From 7d2ded8c0fa007233be1a76f192fbd389ac41f80 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Mar 2022 22:16:40 +0100 Subject: gnome-desktop: Move into top-level --- .../core/gnome-desktop/bubblewrap-paths.patch | 17 ---- pkgs/desktops/gnome/core/gnome-desktop/default.nix | 98 ---------------------- pkgs/desktops/gnome/default.nix | 5 +- pkgs/desktops/gnome/misc/gnome-tweaks/default.nix | 3 +- pkgs/desktops/pantheon/default.nix | 8 +- 5 files changed, 6 insertions(+), 125 deletions(-) delete mode 100644 pkgs/desktops/gnome/core/gnome-desktop/bubblewrap-paths.patch delete mode 100644 pkgs/desktops/gnome/core/gnome-desktop/default.nix (limited to 'pkgs/desktops') diff --git a/pkgs/desktops/gnome/core/gnome-desktop/bubblewrap-paths.patch b/pkgs/desktops/gnome/core/gnome-desktop/bubblewrap-paths.patch deleted file mode 100644 index c31e093f4b7..00000000000 --- a/pkgs/desktops/gnome/core/gnome-desktop/bubblewrap-paths.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/libgnome-desktop/gnome-desktop-thumbnail-script.c b/libgnome-desktop/gnome-desktop-thumbnail-script.c -index ddcc1511..546c2a36 100644 ---- a/libgnome-desktop/gnome-desktop-thumbnail-script.c -+++ b/libgnome-desktop/gnome-desktop-thumbnail-script.c -@@ -555,9 +555,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-try", "/etc/ld.so.cache", "/etc/ld.so.cache", -+ "@bubblewrap_bin@", -+ "--ro-bind", "@storeDir@", "@storeDir@", -+ "--ro-bind-try", "/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 deleted file mode 100644 index 302d201f234..00000000000 --- a/pkgs/desktops/gnome/core/gnome-desktop/default.nix +++ /dev/null @@ -1,98 +0,0 @@ -{ 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 = "41.3"; - - outputs = [ "out" "dev" "devdoc" ]; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-jNHKq5MRgowEUkaMalBnqbxEY4NbI6FL5E6P2bAwAcY="; - }; - - 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" - "-Ddate_in_gnome_version=false" - "-Dgnome_distributor=NixOS" - ]; - - 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/default.nix b/pkgs/desktops/gnome/default.nix index 9e02b80d9f7..729a6bd16ca 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -58,8 +58,6 @@ lib.makeScope pkgs.newScope (self: with self; { 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 { }; @@ -281,6 +279,7 @@ lib.makeScope pkgs.newScope (self: with self; { }) // lib.optionalAttrs (config.allowAliases or true) { #### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope. + gnome-desktop = pkgs.gnome-desktop; # added 2022-03-16 libgnome-games-support = pkgs.libgnome-games-support; # added 2022-02-19 bijiben = throw "The ‘gnome.bijiben’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-notes’ directly."; # added 2018-09-26 @@ -289,7 +288,7 @@ lib.makeScope pkgs.newScope (self: with self; { glib_networking = throw "The ‘gnome.glib_networking’ alias was removed on 2022-01-13. Please use ‘pkgs.glib-networking’ directly."; # added 2018-02-25 gnome_common = throw "The ‘gnome.gnome_common’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-common’ directly."; # added 2018-02-25 gnome_control_center = throw "The ‘gnome.gnome_control_center’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-control-center’ directly."; # added 2018-02-25 - gnome_desktop = throw "The ‘gnome.gnome_desktop’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-desktop’ directly."; # added 2018-02-25 + gnome_desktop = throw "The ‘gnome.gnome_desktop’ alias was removed on 2022-01-13. Please use pkgs.gnome-desktop’ directly."; # added 2018-02-25 gnome_keyring = throw "The ‘gnome.gnome_keyring’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-keyring’ directly."; # added 2018-02-25 gnome_online_accounts = throw "The ‘gnome.gnome_online_accounts’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-online-accounts’ directly."; # added 2018-02-25 gnome_session = throw "The ‘gnome.gnome_session’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-session’ directly."; # added 2018-02-25 diff --git a/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix index 0725af81c0a..88678ff0113 100644 --- a/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix @@ -6,6 +6,7 @@ , gettext , glib , gnome +, gnome-desktop , gobject-introspection , gsettings-desktop-schemas , gtk3 @@ -43,7 +44,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ gdk-pixbuf glib - gnome.gnome-desktop + gnome-desktop gnome.gnome-settings-daemon gnome.gnome-shell # Makes it possible to select user themes through the `user-theme` extension diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index 29192a4dd80..09ccf8d8f71 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -109,9 +109,7 @@ lib.makeScope pkgs.newScope (self: with self; { inherit (gnome) file-roller; }; - gala = callPackage ./desktop/gala { - inherit (gnome) gnome-desktop; - }; + gala = callPackage ./desktop/gala { }; gnome-bluetooth-contract = callPackage ./desktop/gnome-bluetooth-contract { inherit (gnome) gnome-bluetooth; @@ -199,9 +197,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 (gnome) gnome-desktop; - }; + switchboard-plug-pantheon-shell = callPackage ./apps/switchboard-plugs/pantheon-shell { }; switchboard-plug-power = callPackage ./apps/switchboard-plugs/power { }; -- cgit 1.4.1