gnome-desktop: Move into top-level

This commit is contained in:
Jan Tojnar 2022-03-16 22:16:40 +01:00
parent d6e2e39a6e
commit 7d2ded8c0f
16 changed files with 27 additions and 25 deletions

View file

@ -5,6 +5,7 @@
, ninja
, pkg-config
, gnome
, gnome-desktop
, glib
, gtk3
, wayland
@ -54,7 +55,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gtk3
gnome.gnome-desktop
gnome-desktop
wayland
wayland-protocols
libxml2

View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub
, autoconf, autoconf-archive, automake, glib, intltool, libtool, pkg-config
, gnome, gnupg, gtk3, udisks
, gnome-desktop, gnupg, gtk3, udisks
}:
stdenv.mkDerivation rec {
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
autoconf autoconf-archive automake glib intltool libtool pkg-config
];
buildInputs = [ gnome.gnome-desktop gtk3 udisks ];
buildInputs = [ gnome-desktop gtk3 udisks ];
preConfigure = ''
./autogen.sh

View file

@ -7,7 +7,7 @@
let
qt5Deps = pkgs: with pkgs.qt5; [ qtbase qtmultimedia ];
gnomeDeps = pkgs: with pkgs; [ gnome.zenity gtksourceview gnome.gnome-desktop gnome.libgnome-keyring webkitgtk ];
gnomeDeps = pkgs: with pkgs; [ gnome.zenity gtksourceview 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

View file

@ -9,6 +9,7 @@
, wrapGAppsHook
, libinput
, gnome
, gnome-desktop
, glib
, gtk3
, wayland
@ -68,7 +69,7 @@ in stdenv.mkDerivation rec {
libinput
glib
gtk3
gnome.gnome-desktop
gnome-desktop
# For keybindings settings schemas
gnome.mutter
wayland

View file

@ -11,7 +11,7 @@
, evolution-data-server
, feedbackd
, glibmm
, gnome
, gnome-desktop
, gspell
, gtk3
, json-glib
@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
evolution-data-server
feedbackd
glibmm
gnome.gnome-desktop
gnome-desktop
gspell
gtk3
json-glib

View file

@ -25,6 +25,7 @@
, gcr
, sqlite
, gnome
, gnome-desktop
, librsvg
, gdk-pixbuf
, libsecret
@ -68,7 +69,7 @@ stdenv.mkDerivation rec {
gdk-pixbuf
glib
glib-networking
gnome.gnome-desktop
gnome-desktop
gsettings-desktop-schemas
gst_all_1.gst-plugins-base
gst_all_1.gstreamer

View file

@ -12,6 +12,7 @@
, libpeas
, librsvg
, gnome
, gnome-desktop
, libnotify
, gsound
, meson
@ -52,7 +53,7 @@ python3Packages.buildPythonApplication rec {
gtk3
libpeas
librsvg
gnome.gnome-desktop
gnome-desktop
gsound
gnome.adwaita-icon-theme
gsettings-desktop-schemas

View file

@ -14,6 +14,7 @@
, glib
, gtk3
, gnome
, gnome-desktop
, gcr
, pam
, systemd
@ -63,7 +64,7 @@ stdenv.mkDerivation rec {
networkmanager
polkit
gnome.gnome-control-center
gnome.gnome-desktop
gnome-desktop
gnome.gnome-session
gtk3
pam

View file

@ -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

View file

@ -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

View file

@ -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 { };

View file

@ -84,7 +84,6 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome.updateScript {
packageName = "gnome-desktop";
attrPath = "gnome.gnome-desktop";
};
};

View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitLab, meson, ninja, pkg-config, gobject-introspection, vala
, gtk-doc, docbook_xsl, docbook_xml_dtd_43
, gtk3, gnome
, gtk3, gnome-desktop
, 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 = [ gnome.gnome-desktop gtk3 libxml2 ];
buildInputs = [ gnome-desktop gtk3 libxml2 ];
checkInputs = [ dbus xvfb-run hicolor-icon-theme ];
mesonFlags = [

View file

@ -7,6 +7,7 @@
, xdg-desktop-portal
, gtk3
, gnome
, gnome-desktop
, glib
, wrapGAppsHook
, gsettings-desktop-schemas
@ -36,7 +37,7 @@ stdenv.mkDerivation rec {
glib
gsettings-desktop-schemas # settings exposed by settings portal
gtk3
gnome.gnome-desktop
gnome-desktop
gnome.gnome-settings-daemon # schemas needed for settings api (mostly useless now that fonts were moved to g-d-s)
];

View file

@ -6100,6 +6100,8 @@ with pkgs;
gnome-builder = callPackage ../applications/editors/gnome-builder { };
gnome-desktop = callPackage ../development/libraries/gnome-desktop { };
gnome-feeds = callPackage ../applications/networking/feedreaders/gnome-feeds {};
gnome-keysign = callPackage ../tools/security/gnome-keysign { };
@ -27405,7 +27407,6 @@ with pkgs;
luppp = callPackage ../applications/audio/luppp { };
lutris-unwrapped = python3.pkgs.callPackage ../applications/misc/lutris {
inherit (gnome) gnome-desktop;
wine = wineWowPackages.staging;
};
lutris = callPackage ../applications/misc/lutris/fhsenv.nix {