diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index fde97c92d61a..c4987f1b6322 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -3,7 +3,7 @@ let cfg = config.services.xserver.displayManager; - gdm = pkgs.gnome.gdm; + gdm = pkgs.gdm; pamCfg = config.security.pam.services; settingsFormat = pkgs.formats.ini { }; configFile = settingsFormat.generate "custom.conf" cfg.gdm.settings; @@ -310,7 +310,7 @@ in auth requisite pam_nologin.so auth required pam_succeed_if.so uid >= 1000 quiet ${lib.optionalString pamCfg.login.enableGnomeKeyring '' - auth [success=ok default=1] ${pkgs.gnome.gdm}/lib/security/pam_gdm.so + auth [success=ok default=1] ${gdm}/lib/security/pam_gdm.so auth optional ${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so ''} auth required pam_permit.so @@ -334,7 +334,7 @@ in auth required ${pkgs.fprintd}/lib/security/pam_fprintd.so auth required pam_env.so ${lib.optionalString pamCfg.login.enableGnomeKeyring '' - auth [success=ok default=1] ${pkgs.gnome.gdm}/lib/security/pam_gdm.so + auth [success=ok default=1] ${gdm}/lib/security/pam_gdm.so auth optional ${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so ''} diff --git a/pkgs/desktops/gnome/core/gdm/fix-paths.patch b/pkgs/by-name/gd/gdm/fix-paths.patch similarity index 100% rename from pkgs/desktops/gnome/core/gdm/fix-paths.patch rename to pkgs/by-name/gd/gdm/fix-paths.patch diff --git a/pkgs/desktops/gnome/core/gdm/gdm-session-worker_forward-vars.patch b/pkgs/by-name/gd/gdm/gdm-session-worker_forward-vars.patch similarity index 100% rename from pkgs/desktops/gnome/core/gdm/gdm-session-worker_forward-vars.patch rename to pkgs/by-name/gd/gdm/gdm-session-worker_forward-vars.patch diff --git a/pkgs/desktops/gnome/core/gdm/gdm-x-session_extra_args.patch b/pkgs/by-name/gd/gdm/gdm-x-session_extra_args.patch similarity index 100% rename from pkgs/desktops/gnome/core/gdm/gdm-x-session_extra_args.patch rename to pkgs/by-name/gd/gdm/gdm-x-session_extra_args.patch diff --git a/pkgs/desktops/gnome/core/gdm/gdm-x-session_session-wrapper.patch b/pkgs/by-name/gd/gdm/gdm-x-session_session-wrapper.patch similarity index 100% rename from pkgs/desktops/gnome/core/gdm/gdm-x-session_session-wrapper.patch rename to pkgs/by-name/gd/gdm/gdm-x-session_session-wrapper.patch diff --git a/pkgs/desktops/gnome/core/gdm/org.gnome.login-screen.gschema.override b/pkgs/by-name/gd/gdm/org.gnome.login-screen.gschema.override similarity index 100% rename from pkgs/desktops/gnome/core/gdm/org.gnome.login-screen.gschema.override rename to pkgs/by-name/gd/gdm/org.gnome.login-screen.gschema.override diff --git a/pkgs/desktops/gnome/core/gdm/default.nix b/pkgs/by-name/gd/gdm/package.nix similarity index 98% rename from pkgs/desktops/gnome/core/gdm/default.nix rename to pkgs/by-name/gd/gdm/package.nix index 23d1a317167f..0055b0cd378b 100644 --- a/pkgs/desktops/gnome/core/gdm/default.nix +++ b/pkgs/by-name/gd/gdm/package.nix @@ -175,10 +175,7 @@ stdenv.mkDerivation (finalAttrs: { separateDebugInfo = true; passthru = { - updateScript = gnome.updateScript { - packageName = "gdm"; - attrPath = "gnome.gdm"; - }; + updateScript = gnome.updateScript { packageName = "gdm"; }; # Used in GDM NixOS module # Don't remove. diff --git a/pkgs/desktops/gnome/core/gdm/reset-environment.patch b/pkgs/by-name/gd/gdm/reset-environment.patch similarity index 100% rename from pkgs/desktops/gnome/core/gdm/reset-environment.patch rename to pkgs/by-name/gd/gdm/reset-environment.patch diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 8714314df445..b0c36527ca80 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -22,8 +22,6 @@ in caribou = callPackage ./core/caribou { }; - gdm = callPackage ./core/gdm { }; - gnome-bluetooth = callPackage ./core/gnome-bluetooth { }; gnome-bluetooth_1_0 = callPackage ./core/gnome-bluetooth/1.0 { }; @@ -112,6 +110,7 @@ in file-roller = lib.warn "The ‘gnome.file-roller’ was moved to top-level. Please use ‘pkgs.file-roller’ directly." pkgs.file-roller; # Added on 2024-06-13. five-or-more = lib.warn "The ‘gnome.five-or-more’ was moved to top-level. Please use ‘pkgs.five-or-more’ directly." pkgs.five-or-more; # Added on 2024-08-11. four-in-a-row = lib.warn "The ‘gnome.four-in-a-row’ was moved to top-level. Please use ‘pkgs.four-in-a-row’ directly." pkgs.four-in-a-row; # Added on 2024-08-11. + gdm = lib.warn "The ‘gnome.gdm’ was moved to top-level. Please use ‘pkgs.gdm’ directly." pkgs.gdm; # Added on 2024-08-11. geary = lib.warn "The ‘gnome.geary’ was moved to top-level. Please use ‘pkgs.geary’ directly." pkgs.geary; # Added on 2024-06-22. ghex = lib.warn "The ‘gnome.ghex’ was moved to top-level. Please use ‘pkgs.ghex’ directly." pkgs.ghex; # Added on 2024-06-22. gitg = lib.warn "The ‘gnome.gitg’ was moved to top-level. Please use ‘pkgs.gitg’ directly." pkgs.gitg; # Added on 2024-06-22.