public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into staging-next

This commit is contained in:
Martin Weinelt 2021-05-08 14:43:43 +02:00
parent 0388b1a029 b28f0d640f
commit 9651084620
657 changed files with 2572 additions and 1628 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/functions/library/attrsets.xml
View File

@ -855,7 +855,7 @@ lib.attrsets.mapAttrs' (name: value: lib.attrsets.nameValuePair ("foo_" + name)
<title><function>lib.attrsets.mapAttrsToList</function></title> <title><function>lib.attrsets.mapAttrsToList</function></title>
<subtitle><literal>mapAttrsToList :: (String -> Any -> Any) -> <subtitle><literal>mapAttrsToList :: (String -> Any -> Any) ->
AttrSet -> Any</literal> AttrSet -> [Any]</literal>
</subtitle> </subtitle>
<xi:include href="./locations.xml" xpointer="lib.attrsets.mapAttrsToList" /> <xi:include href="./locations.xml" xpointer="lib.attrsets.mapAttrsToList" />

4
doc/languages-frameworks/gnome.section.md
View File

@ -88,7 +88,7 @@ For convenience, it also adds `dconf.lib` for a GIO module implementing a GSetti
The setup hook [currently](https://github.com/NixOS/nixpkgs/issues/56943) does not work in expressions with `strictDeps` enabled, like Python packages. In those cases, you will need to disable it with `strictDeps = false;`. The setup hook [currently](https://github.com/NixOS/nixpkgs/issues/56943) does not work in expressions with `strictDeps` enabled, like Python packages. In those cases, you will need to disable it with `strictDeps = false;`.
::: :::
- []{#ssec-gnome-hooks-gst-grl-plugins} Setup hooks of `gst_all_1.gstreamer` and `gnome3.grilo` will populate the `GST_PLUGIN_SYSTEM_PATH_1_0` and `GRL_PLUGIN_PATH` variables, respectively, which will then be added to the wrapper by `wrapGAppsHook`. - []{#ssec-gnome-hooks-gst-grl-plugins} Setup hooks of `gst_all_1.gstreamer` and `grilo` will populate the `GST_PLUGIN_SYSTEM_PATH_1_0` and `GRL_PLUGIN_PATH` variables, respectively, which will then be added to the wrapper by `wrapGAppsHook`.
You can also pass additional arguments to `makeWrapper` using `gappsWrapperArgs` in `preFixup` hook: You can also pass additional arguments to `makeWrapper` using `gappsWrapperArgs` in `preFixup` hook:
@ -105,7 +105,7 @@ preFixup = ''
## Updating GNOME packages {#ssec-gnome-updating} ## Updating GNOME packages {#ssec-gnome-updating}
Most GNOME package offer [`updateScript`](#var-passthru-updateScript), it is therefore possible to update to latest source tarball by running `nix-shell maintainers/scripts/update.nix --argstr package gnome3.nautilus` or even en masse with `nix-shell maintainers/scripts/update.nix --argstr path gnome3`. Read the package’s `NEWS` file to see what changed. Most GNOME package offer [`updateScript`](#var-passthru-updateScript), it is therefore possible to update to latest source tarball by running `nix-shell maintainers/scripts/update.nix --argstr package gnome.nautilus` or even en masse with `nix-shell maintainers/scripts/update.nix --argstr path gnome`. Read the package’s `NEWS` file to see what changed.
## Frequently encountered issues {#ssec-gnome-common-issues} ## Frequently encountered issues {#ssec-gnome-common-issues}

4
lib/attrsets.nix
View File

@ -243,6 +243,10 @@ rec {
/* Call a function for each attribute in the given set and return /* Call a function for each attribute in the given set and return
the result in a list. the result in a list.
Type:
mapAttrsToList ::
(String -> a -> b) -> AttrSet -> [b]
Example: Example:
mapAttrsToList (name: value: name + value) mapAttrsToList (name: value: name + value)
{ x = "a"; y = "b"; } { x = "a"; y = "b"; }

4
maintainers/scripts/update.nix
View File

@ -143,7 +143,7 @@ let
to run all update scripts for all packages that lists \`garbas\` as a maintainer to run all update scripts for all packages that lists \`garbas\` as a maintainer
and have \`updateScript\` defined, or: and have \`updateScript\` defined, or:
% nix-shell maintainers/scripts/update.nix --argstr package gnome3.nautilus % nix-shell maintainers/scripts/update.nix --argstr package gnome.nautilus
to run update script for specific package, or to run update script for specific package, or
@ -151,7 +151,7 @@ let
to run update script for all packages matching given predicate, or to run update script for all packages matching given predicate, or
% nix-shell maintainers/scripts/update.nix --argstr path gnome3 % nix-shell maintainers/scripts/update.nix --argstr path gnome
to run update script for all package under an attribute path. to run update script for all package under an attribute path.

3
maintainers/team-list.nix
View File

@ -66,7 +66,7 @@ with lib.maintainers; {
}; };
freedesktop = { freedesktop = {
members = [ jtojnar worldofpeace ]; members = [ jtojnar ];
scope = "Maintain Freedesktop.org packages for graphical desktop."; scope = "Maintain Freedesktop.org packages for graphical desktop.";
}; };
@ -89,7 +89,6 @@ with lib.maintainers; {
members = [ members = [
hedning hedning
jtojnar jtojnar
worldofpeace
dasj19 dasj19
maxeaubrey maxeaubrey
]; ];

2
nixos/doc/manual/configuration/x-windows.xml
View File

@ -25,7 +25,7 @@
<programlisting> <programlisting>
<xref linkend="opt-services.xserver.desktopManager.plasma5.enable"/> = true; <xref linkend="opt-services.xserver.desktopManager.plasma5.enable"/> = true;
<xref linkend="opt-services.xserver.desktopManager.xfce.enable"/> = true; <xref linkend="opt-services.xserver.desktopManager.xfce.enable"/> = true;
<xref linkend="opt-services.xserver.desktopManager.gnome3.enable"/> = true; <xref linkend="opt-services.xserver.desktopManager.gnome.enable"/> = true;
<xref linkend="opt-services.xserver.desktopManager.mate.enable"/> = true; <xref linkend="opt-services.xserver.desktopManager.mate.enable"/> = true;
<xref linkend="opt-services.xserver.windowManager.xmonad.enable"/> = true; <xref linkend="opt-services.xserver.windowManager.xmonad.enable"/> = true;
<xref linkend="opt-services.xserver.windowManager.twm.enable"/> = true; <xref linkend="opt-services.xserver.windowManager.twm.enable"/> = true;

8
nixos/doc/manual/release-notes/rl-1909.xml
View File

@ -83,10 +83,10 @@
like games. like games.
<itemizedlist> <itemizedlist>
<para>This can be achieved with the following options which the desktop manager default enables, excluding <literal>games</literal>.</para> <para>This can be achieved with the following options which the desktop manager default enables, excluding <literal>games</literal>.</para>
<listitem><para><xref linkend="opt-services.gnome3.core-os-services.enable"/></para></listitem> <listitem><para><option>services.gnome3.core-os-services.enable</option></para></listitem>
<listitem><para><xref linkend="opt-services.gnome3.core-shell.enable"/></para></listitem> <listitem><para><option>services.gnome3.core-shell.enable</option></para></listitem>
<listitem><para><xref linkend="opt-services.gnome3.core-utilities.enable"/></para></listitem> <listitem><para><option>services.gnome3.core-utilities.enable</option></para></listitem>
<listitem><para><xref linkend="opt-services.gnome3.games.enable"/></para></listitem> <listitem><para><option>services.gnome3.games.enable</option></para></listitem>
</itemizedlist> </itemizedlist>
With these options we hope to give users finer grained control over their systems. Prior to this change you'd either have to manually With these options we hope to give users finer grained control over their systems. Prior to this change you'd either have to manually
disable options or use <option>environment.gnome3.excludePackages</option> which only excluded the optional applications. disable options or use <option>environment.gnome3.excludePackages</option> which only excluded the optional applications.

4
nixos/doc/manual/release-notes/rl-2105.xml
View File

@ -27,7 +27,7 @@
<para>The default Linux kernel was updated to the 5.10 LTS series, coming from the 5.4 LTS series.</para> <para>The default Linux kernel was updated to the 5.10 LTS series, coming from the 5.4 LTS series.</para>
</listitem> </listitem>
<listitem> <listitem>
<para>GNOME desktop environment was upgraded to 40, see the release notes for <link xlink:href="https://help.gnome.org/misc/release-notes/40.0/">40.0</link> and <link xlink:href="https://help.gnome.org/misc/release-notes/3.38/">3.38</link>.</para> <para>GNOME desktop environment was upgraded to 40, see the release notes for <link xlink:href="https://help.gnome.org/misc/release-notes/40.0/">40.0</link> and <link xlink:href="https://help.gnome.org/misc/release-notes/3.38/">3.38</link>. The <code>gnome3</code> attribute set has been renamed to <code>gnome</code> and so have been the NixOS options.</para>
</listitem> </listitem>
<listitem> <listitem>
<para> <para>
@ -939,7 +939,7 @@ environment.systemPackages = [
</listitem> </listitem>
<listitem> <listitem>
<para> <para>
The GNOME desktop manager once again installs <package>gnome3.epiphany</package> by default. The GNOME desktop manager once again installs <package>gnome.epiphany</package> by default.
</para> </para>
</listitem> </listitem>
<listitem> <listitem>

2
nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix
View File

@ -9,7 +9,7 @@ with lib;
isoImage.edition = "gnome"; isoImage.edition = "gnome";
services.xserver.desktopManager.gnome3 = { services.xserver.desktopManager.gnome = {
# Add firefox to favorite-apps # Add firefox to favorite-apps
favoriteAppsOverride = '' favoriteAppsOverride = ''
[org.gnome.shell] [org.gnome.shell]

2
nixos/modules/installer/virtualbox-demo.nix
View File

@ -44,7 +44,7 @@ with lib;
# Enable GDM/GNOME by uncommenting above two lines and two lines below. # Enable GDM/GNOME by uncommenting above two lines and two lines below.
# services.xserver.displayManager.gdm.enable = true; # services.xserver.displayManager.gdm.enable = true;
# services.xserver.desktopManager.gnome3.enable = true; # services.xserver.desktopManager.gnome.enable = true;
# Set your time zone. # Set your time zone.
# time.timeZone = "Europe/Amsterdam"; # time.timeZone = "Europe/Amsterdam";

30
nixos/modules/module-list.nix
View File

@ -338,21 +338,21 @@
./services/desktops/malcontent.nix ./services/desktops/malcontent.nix
./services/desktops/pipewire/pipewire.nix ./services/desktops/pipewire/pipewire.nix
./services/desktops/pipewire/pipewire-media-session.nix ./services/desktops/pipewire/pipewire-media-session.nix
./services/desktops/gnome3/at-spi2-core.nix ./services/desktops/gnome/at-spi2-core.nix
./services/desktops/gnome3/chrome-gnome-shell.nix ./services/desktops/gnome/chrome-gnome-shell.nix
./services/desktops/gnome3/evolution-data-server.nix ./services/desktops/gnome/evolution-data-server.nix
./services/desktops/gnome3/glib-networking.nix ./services/desktops/gnome/glib-networking.nix
./services/desktops/gnome3/gnome-initial-setup.nix ./services/desktops/gnome/gnome-initial-setup.nix
./services/desktops/gnome3/gnome-keyring.nix ./services/desktops/gnome/gnome-keyring.nix
./services/desktops/gnome3/gnome-online-accounts.nix ./services/desktops/gnome/gnome-online-accounts.nix
./services/desktops/gnome3/gnome-online-miners.nix ./services/desktops/gnome/gnome-online-miners.nix
./services/desktops/gnome3/gnome-remote-desktop.nix ./services/desktops/gnome/gnome-remote-desktop.nix
./services/desktops/gnome3/gnome-settings-daemon.nix ./services/desktops/gnome/gnome-settings-daemon.nix
./services/desktops/gnome3/gnome-user-share.nix ./services/desktops/gnome/gnome-user-share.nix
./services/desktops/gnome3/rygel.nix ./services/desktops/gnome/rygel.nix
./services/desktops/gnome3/sushi.nix ./services/desktops/gnome/sushi.nix
./services/desktops/gnome3/tracker.nix ./services/desktops/gnome/tracker.nix
./services/desktops/gnome3/tracker-miners.nix ./services/desktops/gnome/tracker-miners.nix
./services/desktops/neard.nix ./services/desktops/neard.nix
./services/desktops/profile-sync-daemon.nix ./services/desktops/profile-sync-daemon.nix
./services/desktops/system-config-printer.nix ./services/desktops/system-config-printer.nix

4
nixos/modules/programs/file-roller.nix
View File

@ -30,9 +30,9 @@ with lib;
config = mkIf config.programs.file-roller.enable { config = mkIf config.programs.file-roller.enable {
environment.systemPackages = [ pkgs.gnome3.file-roller ]; environment.systemPackages = [ pkgs.gnome.file-roller ];
services.dbus.packages = [ pkgs.gnome3.file-roller ]; services.dbus.packages = [ pkgs.gnome.file-roller ];
}; };

6
nixos/modules/programs/geary.nix
View File

@ -15,10 +15,10 @@ in {
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
environment.systemPackages = [ pkgs.gnome3.geary ]; environment.systemPackages = [ pkgs.gnome.geary ];
programs.dconf.enable = true; programs.dconf.enable = true;
services.gnome3.gnome-keyring.enable = true; services.gnome.gnome-keyring.enable = true;
services.gnome3.gnome-online-accounts.enable = true; services.gnome.gnome-online-accounts.enable = true;
}; };
} }

4
nixos/modules/programs/gnome-disks.nix
View File

@ -41,9 +41,9 @@ with lib;
config = mkIf config.programs.gnome-disks.enable { config = mkIf config.programs.gnome-disks.enable {
environment.systemPackages = [ pkgs.gnome3.gnome-disk-utility ]; environment.systemPackages = [ pkgs.gnome.gnome-disk-utility ];
services.dbus.packages = [ pkgs.gnome3.gnome-disk-utility ]; services.dbus.packages = [ pkgs.gnome.gnome-disk-utility ];
}; };

10
nixos/modules/programs/gnome-documents.nix
View File

@ -13,7 +13,7 @@ with lib;
# Added 2019-08-09 # Added 2019-08-09
imports = [ imports = [
(mkRenamedOptionModule (mkRenamedOptionModule
[ "services" "gnome3" "gnome-documents" "enable" ] [ "services" "gnome" "gnome-documents" "enable" ]
[ "programs" "gnome-documents" "enable" ]) [ "programs" "gnome-documents" "enable" ])
]; ];
@ -41,13 +41,13 @@ with lib;
config = mkIf config.programs.gnome-documents.enable { config = mkIf config.programs.gnome-documents.enable {
environment.systemPackages = [ pkgs.gnome3.gnome-documents ]; environment.systemPackages = [ pkgs.gnome.gnome-documents ];
services.dbus.packages = [ pkgs.gnome3.gnome-documents ]; services.dbus.packages = [ pkgs.gnome.gnome-documents ];
services.gnome3.gnome-online-accounts.enable = true; services.gnome.gnome-online-accounts.enable = true;
services.gnome3.gnome-online-miners.enable = true; services.gnome.gnome-online-miners.enable = true;
}; };

6
nixos/modules/programs/gnome-terminal.nix
View File

@ -28,9 +28,9 @@ in
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
environment.systemPackages = [ pkgs.gnome3.gnome-terminal ]; environment.systemPackages = [ pkgs.gnome.gnome-terminal ];
services.dbus.packages = [ pkgs.gnome3.gnome-terminal ]; services.dbus.packages = [ pkgs.gnome.gnome-terminal ];
systemd.packages = [ pkgs.gnome3.gnome-terminal ]; systemd.packages = [ pkgs.gnome.gnome-terminal ];
programs.bash.vteIntegration = true; programs.bash.vteIntegration = true;
programs.zsh.vteIntegration = true; programs.zsh.vteIntegration = true;

8
nixos/modules/programs/gpaste.nix
View File

@ -27,10 +27,10 @@ with lib;
###### implementation ###### implementation
config = mkIf config.programs.gpaste.enable { config = mkIf config.programs.gpaste.enable {
environment.systemPackages = [ pkgs.gnome3.gpaste ]; environment.systemPackages = [ pkgs.gnome.gpaste ];
services.dbus.packages = [ pkgs.gnome3.gpaste ]; services.dbus.packages = [ pkgs.gnome.gpaste ];
systemd.packages = [ pkgs.gnome3.gpaste ]; systemd.packages = [ pkgs.gnome.gpaste ];
# gnome-control-center crashes in Keyboard Shortcuts pane without the GSettings schemas. # gnome-control-center crashes in Keyboard Shortcuts pane without the GSettings schemas.
services.xserver.desktopManager.gnome3.sessionPath = [ pkgs.gnome3.gpaste ]; services.xserver.desktopManager.gnome.sessionPath = [ pkgs.gnome.gpaste ];
}; };
} }

4
nixos/modules/programs/phosh.nix
View File

@ -155,8 +155,8 @@ in {
''; '';
}; };
services.gnome3.core-shell.enable = true; services.gnome.core-shell.enable = true;
services.gnome3.core-os-services.enable = true; services.gnome.core-os-services.enable = true;
services.xserver.displayManager.sessionPackages = [ pkgs.phosh ]; services.xserver.displayManager.sessionPackages = [ pkgs.phosh ];
environment.etc."phosh/phoc.ini".source = environment.etc."phosh/phoc.ini".source =

6
nixos/modules/programs/seahorse.nix
View File

@ -31,14 +31,14 @@ with lib;
config = mkIf config.programs.seahorse.enable { config = mkIf config.programs.seahorse.enable {
programs.ssh.askPassword = mkDefault "${pkgs.gnome3.seahorse}/libexec/seahorse/ssh-askpass"; programs.ssh.askPassword = mkDefault "${pkgs.gnome.seahorse}/libexec/seahorse/ssh-askpass";
environment.systemPackages = [ environment.systemPackages = [
pkgs.gnome3.seahorse pkgs.gnome.seahorse
]; ];
services.dbus.packages = [ services.dbus.packages = [
pkgs.gnome3.seahorse pkgs.gnome.seahorse
]; ];
}; };

6
nixos/modules/security/pam.nix
View File

@ -433,7 +433,7 @@ let
("auth optional ${pkgs.plasma5Packages.kwallet-pam}/lib/security/pam_kwallet5.so" + ("auth optional ${pkgs.plasma5Packages.kwallet-pam}/lib/security/pam_kwallet5.so" +
" kwalletd=${pkgs.plasma5Packages.kwallet.bin}/bin/kwalletd5")} " kwalletd=${pkgs.plasma5Packages.kwallet.bin}/bin/kwalletd5")}
${optionalString cfg.enableGnomeKeyring ${optionalString cfg.enableGnomeKeyring
"auth optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so"} "auth optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so"}
${optionalString cfg.gnupg.enable ${optionalString cfg.gnupg.enable
"auth optional ${pkgs.pam_gnupg}/lib/security/pam_gnupg.so" "auth optional ${pkgs.pam_gnupg}/lib/security/pam_gnupg.so"
+ optionalString cfg.gnupg.storeOnly " store-only" + optionalString cfg.gnupg.storeOnly " store-only"
@ -471,7 +471,7 @@ let
${optionalString config.krb5.enable ${optionalString config.krb5.enable
"password sufficient ${pam_krb5}/lib/security/pam_krb5.so use_first_pass"} "password sufficient ${pam_krb5}/lib/security/pam_krb5.so use_first_pass"}
${optionalString cfg.enableGnomeKeyring ${optionalString cfg.enableGnomeKeyring
"password optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so use_authtok"} "password optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so use_authtok"}
# Session management. # Session management.
${optionalString cfg.setEnvironment '' ${optionalString cfg.setEnvironment ''
@ -512,7 +512,7 @@ let
("session optional ${pkgs.plasma5Packages.kwallet-pam}/lib/security/pam_kwallet5.so" + ("session optional ${pkgs.plasma5Packages.kwallet-pam}/lib/security/pam_kwallet5.so" +
" kwalletd=${pkgs.plasma5Packages.kwallet.bin}/bin/kwalletd5")} " kwalletd=${pkgs.plasma5Packages.kwallet.bin}/bin/kwalletd5")}
${optionalString (cfg.enableGnomeKeyring) ${optionalString (cfg.enableGnomeKeyring)
"session optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start"} "session optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start"}
${optionalString cfg.gnupg.enable ${optionalString cfg.gnupg.enable
"session optional ${pkgs.pam_gnupg}/lib/security/pam_gnupg.so" "session optional ${pkgs.pam_gnupg}/lib/security/pam_gnupg.so"
+ optionalString cfg.gnupg.noAutostart " no-autostart" + optionalString cfg.gnupg.noAutostart " no-autostart"

2
nixos/modules/services/desktops/bamf.nix
View File

@ -6,7 +6,7 @@ with lib;
{ {
meta = { meta = {
maintainers = with maintainers; [ worldofpeace ]; maintainers = with maintainers; [ ];
}; };
###### interface ###### interface

2
nixos/modules/services/desktops/flatpak.nix
View File

@ -20,7 +20,7 @@ in {
internal = true; internal = true;
type = types.listOf types.package; type = types.listOf types.package;
default = []; default = [];
example = literalExample "[ pkgs.gnome3.gnome-software ]"; example = literalExample "[ pkgs.gnome.gnome-software ]";
description = '' description = ''
Packages that provide an interface for flatpak Packages that provide an interface for flatpak
(like gnome-software) that will be automatically available (like gnome-software) that will be automatically available

2
nixos/modules/services/desktops/geoclue2.nix
View File

@ -266,5 +266,5 @@ in
} // mapAttrs' appConfigToINICompatible cfg.appConfig); } // mapAttrs' appConfigToINICompatible cfg.appConfig);
}; };
meta.maintainers = with lib.maintainers; [ worldofpeace ]; meta.maintainers = with lib.maintainers; [ ];
} }

14
nixos/modules/services/desktops/gnome3/at-spi2-core.nix → nixos/modules/services/desktops/gnome/at-spi2-core.nix
View File

@ -12,9 +12,17 @@ with lib;
###### interface ###### interface
# Added 2021-05-07
imports = [
(mkRenamedOptionModule
[ "services" "gnome3" "at-spi2-core" "enable" ]
[ "services" "gnome" "at-spi2-core" "enable" ]
)
];
options = { options = {
services.gnome3.at-spi2-core = { services.gnome.at-spi2-core = {
enable = mkOption { enable = mkOption {
type = types.bool; type = types.bool;
@ -36,13 +44,13 @@ with lib;
###### implementation ###### implementation
config = mkMerge [ config = mkMerge [
(mkIf config.services.gnome3.at-spi2-core.enable { (mkIf config.services.gnome.at-spi2-core.enable {
environment.systemPackages = [ pkgs.at-spi2-core ]; environment.systemPackages = [ pkgs.at-spi2-core ];
services.dbus.packages = [ pkgs.at-spi2-core ]; services.dbus.packages = [ pkgs.at-spi2-core ];
systemd.packages = [ pkgs.at-spi2-core ]; systemd.packages = [ pkgs.at-spi2-core ];
}) })
(mkIf (!config.services.gnome3.at-spi2-core.enable) { (mkIf (!config.services.gnome.at-spi2-core.enable) {
environment.variables.NO_AT_BRIDGE = "1"; environment.variables.NO_AT_BRIDGE = "1";
}) })
]; ];

12
nixos/modules/services/desktops/gnome3/chrome-gnome-shell.nix → nixos/modules/services/desktops/gnome/chrome-gnome-shell.nix
View File

@ -8,9 +8,17 @@ with lib;
maintainers = teams.gnome.members; maintainers = teams.gnome.members;
}; };
# Added 2021-05-07
imports = [
(mkRenamedOptionModule
[ "services" "gnome3" "chrome-gnome-shell" "enable" ]
[ "services" "gnome" "chrome-gnome-shell" "enable" ]
)
];
###### interface ###### interface
options = { options = {
services.gnome3.chrome-gnome-shell.enable = mkEnableOption '' services.gnome.chrome-gnome-shell.enable = mkEnableOption ''
Chrome GNOME Shell native host connector, a DBus service Chrome GNOME Shell native host connector, a DBus service
allowing to install GNOME Shell extensions from a web browser. allowing to install GNOME Shell extensions from a web browser.
''; '';
@ -18,7 +26,7 @@ with lib;
###### implementation ###### implementation
config = mkIf config.services.gnome3.chrome-gnome-shell.enable { config = mkIf config.services.gnome.chrome-gnome-shell.enable {
environment.etc = { environment.etc = {
"chromium/native-messaging-hosts/org.gnome.chrome_gnome_shell.json".source = "${pkgs.chrome-gnome-shell}/etc/chromium/native-messaging-hosts/org.gnome.chrome_gnome_shell.json"; "chromium/native-messaging-hosts/org.gnome.chrome_gnome_shell.json".source = "${pkgs.chrome-gnome-shell}/etc/chromium/native-messaging-hosts/org.gnome.chrome_gnome_shell.json";
"opt/chrome/native-messaging-hosts/org.gnome.chrome_gnome_shell.json".source = "${pkgs.chrome-gnome-shell}/etc/opt/chrome/native-messaging-hosts/org.gnome.chrome_gnome_shell.json"; "opt/chrome/native-messaging-hosts/org.gnome.chrome_gnome_shell.json".source = "${pkgs.chrome-gnome-shell}/etc/opt/chrome/native-messaging-hosts/org.gnome.chrome_gnome_shell.json";

22
nixos/modules/services/desktops/gnome3/evolution-data-server.nix → nixos/modules/services/desktops/gnome/evolution-data-server.nix
View File

@ -10,11 +10,23 @@ with lib;
maintainers = teams.gnome.members; maintainers = teams.gnome.members;
}; };
# Added 2021-05-07
imports = [
(mkRenamedOptionModule
[ "services" "gnome3" "evolution-data-server" "enable" ]
[ "services" "gnome" "evolution-data-server" "enable" ]
)
(mkRenamedOptionModule
[ "services" "gnome3" "evolution-data-server" "plugins" ]
[ "services" "gnome" "evolution-data-server" "plugins" ]
)
];
###### interface ###### interface
options = { options = {
services.gnome3.evolution-data-server = { services.gnome.evolution-data-server = {
enable = mkEnableOption "Evolution Data Server, a collection of services for storing addressbooks and calendars."; enable = mkEnableOption "Evolution Data Server, a collection of services for storing addressbooks and calendars.";
plugins = mkOption { plugins = mkOption {
type = types.listOf types.package; type = types.listOf types.package;
@ -38,10 +50,10 @@ with lib;
config = config =
let let
bundle = pkgs.evolutionWithPlugins.override { inherit (config.services.gnome3.evolution-data-server) plugins; }; bundle = pkgs.evolutionWithPlugins.override { inherit (config.services.gnome.evolution-data-server) plugins; };
in in
mkMerge [ mkMerge [
(mkIf config.services.gnome3.evolution-data-server.enable { (mkIf config.services.gnome.evolution-data-server.enable {
environment.systemPackages = [ bundle ]; environment.systemPackages = [ bundle ];
services.dbus.packages = [ bundle ]; services.dbus.packages = [ bundle ];
@ -49,11 +61,11 @@ with lib;
systemd.packages = [ bundle ]; systemd.packages = [ bundle ];
}) })
(mkIf config.programs.evolution.enable { (mkIf config.programs.evolution.enable {
services.gnome3.evolution-data-server = { services.gnome.evolution-data-server = {
enable = true; enable = true;
plugins = [ pkgs.evolution ] ++ config.programs.evolution.plugins; plugins = [ pkgs.evolution ] ++ config.programs.evolution.plugins;
}; };
services.gnome3.gnome-keyring.enable = true; services.gnome.gnome-keyring.enable = true;
}) })
]; ];
} }

12
nixos/modules/services/desktops/gnome3/glib-networking.nix → nixos/modules/services/desktops/gnome/glib-networking.nix
View File

@ -10,11 +10,19 @@ with lib;
maintainers = teams.gnome.members; maintainers = teams.gnome.members;
}; };
# Added 2021-05-07
imports = [
(mkRenamedOptionModule
[ "services" "gnome3" "glib-networking" "enable" ]
[ "services" "gnome" "glib-networking" "enable" ]
)
];
###### interface ###### interface
options = { options = {
services.gnome3.glib-networking = { services.gnome.glib-networking = {
enable = mkEnableOption "network extensions for GLib"; enable = mkEnableOption "network extensions for GLib";
@ -24,7 +32,7 @@ with lib;
###### implementation ###### implementation
config = mkIf config.services.gnome3.glib-networking.enable { config = mkIf config.services.gnome.glib-networking.enable {
services.dbus.packages = [ pkgs.glib-networking ]; services.dbus.packages = [ pkgs.glib-networking ];

16
nixos/modules/services/desktops/gnome3/gnome-initial-setup.nix → nixos/modules/services/desktops/gnome/gnome-initial-setup.nix
View File

@ -48,11 +48,19 @@ in
maintainers = teams.gnome.members; maintainers = teams.gnome.members;
}; };
# Added 2021-05-07
imports = [
(mkRenamedOptionModule
[ "services" "gnome3" "gnome-initial-setup" "enable" ]
[ "services" "gnome" "gnome-initial-setup" "enable" ]
)
];
###### interface ###### interface
options = { options = {
services.gnome3.gnome-initial-setup = { services.gnome.gnome-initial-setup = {
enable = mkEnableOption "GNOME Initial Setup, a Simple, easy, and safe way to prepare a new system"; enable = mkEnableOption "GNOME Initial Setup, a Simple, easy, and safe way to prepare a new system";
@ -63,16 +71,16 @@ in
###### implementation ###### implementation
config = mkIf config.services.gnome3.gnome-initial-setup.enable { config = mkIf config.services.gnome.gnome-initial-setup.enable {
environment.systemPackages = [ environment.systemPackages = [
pkgs.gnome3.gnome-initial-setup pkgs.gnome.gnome-initial-setup
] ]
++ optional (versionOlder config.system.stateVersion "20.03") createGisStampFilesAutostart ++ optional (versionOlder config.system.stateVersion "20.03") createGisStampFilesAutostart
; ;
systemd.packages = [ systemd.packages = [
pkgs.gnome3.gnome-initial-setup pkgs.gnome.gnome-initial-setup
]; ];
systemd.user.targets."gnome-session".wants = [ systemd.user.targets."gnome-session".wants = [

20
nixos/modules/services/desktops/gnome3/gnome-keyring.nix → nixos/modules/services/desktops/gnome/gnome-keyring.nix
View File

@ -10,11 +10,19 @@ with lib;
maintainers = teams.gnome.members; maintainers = teams.gnome.members;
}; };
# Added 2021-05-07
imports = [
(mkRenamedOptionModule
[ "services" "gnome3" "gnome-keyring" "enable" ]
[ "services" "gnome" "gnome-keyring" "enable" ]
)
];
###### interface ###### interface
options = { options = {
services.gnome3.gnome-keyring = { services.gnome.gnome-keyring = {
enable = mkOption { enable = mkOption {
type = types.bool; type = types.bool;
@ -33,18 +41,18 @@ with lib;
###### implementation ###### implementation
config = mkIf config.services.gnome3.gnome-keyring.enable { config = mkIf config.services.gnome.gnome-keyring.enable {
environment.systemPackages = [ pkgs.gnome3.gnome-keyring ]; environment.systemPackages = [ pkgs.gnome.gnome-keyring ];
services.dbus.packages = [ pkgs.gnome3.gnome-keyring pkgs.gcr ]; services.dbus.packages = [ pkgs.gnome.gnome-keyring pkgs.gcr ];
xdg.portal.extraPortals = [ pkgs.gnome3.gnome-keyring ]; xdg.portal.extraPortals = [ pkgs.gnome.gnome-keyring ];
security.pam.services.login.enableGnomeKeyring = true; security.pam.services.login.enableGnomeKeyring = true;
security.wrappers.gnome-keyring-daemon = { security.wrappers.gnome-keyring-daemon = {
source = "${pkgs.gnome3.gnome-keyring}/bin/gnome-keyring-daemon"; source = "${pkgs.gnome.gnome-keyring}/bin/gnome-keyring-daemon";
capabilities = "cap_ipc_lock=ep"; capabilities = "cap_ipc_lock=ep";
}; };

12
nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix → nixos/modules/services/desktops/gnome/gnome-online-accounts.nix
View File

@ -10,11 +10,19 @@ with lib;
maintainers = teams.gnome.members; maintainers = teams.gnome.members;
}; };
# Added 2021-05-07
imports = [
(mkRenamedOptionModule
[ "services" "gnome3" "gnome-online-accounts" "enable" ]
[ "services" "gnome" "gnome-online-accounts" "enable" ]
)
];
###### interface ###### interface
options = { options = {
services.gnome3.gnome-online-accounts = { services.gnome.gnome-online-accounts = {
enable = mkOption { enable = mkOption {
type = types.bool; type = types.bool;
@ -32,7 +40,7 @@ with lib;
###### implementation ###### implementation
config = mkIf config.services.gnome3.gnome-online-accounts.enable { config = mkIf config.services.gnome.gnome-online-accounts.enable {
environment.systemPackages = [ pkgs.gnome-online-accounts ]; environment.systemPackages = [ pkgs.gnome-online-accounts ];

16
nixos/modules/services/desktops/gnome3/gnome-online-miners.nix → nixos/modules/services/desktops/gnome/gnome-online-miners.nix
View File

@ -10,11 +10,19 @@ with lib;
maintainers = teams.gnome.members; maintainers = teams.gnome.members;
}; };
# Added 2021-05-07
imports = [
(mkRenamedOptionModule
[ "services" "gnome3" "gnome-online-miners" "enable" ]
[ "services" "gnome" "gnome-online-miners" "enable" ]
)
];
###### interface ###### interface
options = { options = {
services.gnome3.gnome-online-miners = { services.gnome.gnome-online-miners = {
enable = mkOption { enable = mkOption {
type = types.bool; type = types.bool;
@ -32,11 +40,11 @@ with lib;
###### implementation ###### implementation
config = mkIf config.services.gnome3.gnome-online-miners.enable { config = mkIf config.services.gnome.gnome-online-miners.enable {
environment.systemPackages = [ pkgs.gnome3.gnome-online-miners ]; environment.systemPackages = [ pkgs.gnome.gnome-online-miners ];
services.dbus.packages = [ pkgs.gnome3.gnome-online-miners ]; services.dbus.packages = [ pkgs.gnome.gnome-online-miners ];
}; };

32
nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix Normal file
View File

@ -0,0 +1,32 @@
# Remote desktop daemon using Pipewire.
{ config, lib, pkgs, ... }:
with lib;
{
meta = {
maintainers = teams.gnome.members;
};
# Added 2021-05-07
imports = [
(mkRenamedOptionModule
[ "services" "gnome3" "gnome-remote-desktop" "enable" ]
[ "services" "gnome" "gnome-remote-desktop" "enable" ]
)
];
###### interface
options = {
services.gnome.gnome-remote-desktop = {
enable = mkEnableOption "Remote Desktop support using Pipewire";
};
};
###### implementation
config = mkIf config.services.gnome.gnome-remote-desktop.enable {
services.pipewire.enable = true;
systemd.packages = [ pkgs.gnome.gnome-remote-desktop ];
};
}

16
nixos/modules/services/desktops/gnome3/gnome-settings-daemon.nix → nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix
View File

@ -6,7 +6,7 @@ with lib;
let let
cfg = config.services.gnome3.gnome-settings-daemon; cfg = config.services.gnome.gnome-settings-daemon;
in in
@ -20,13 +20,19 @@ in
(mkRemovedOptionModule (mkRemovedOptionModule
["services" "gnome3" "gnome-settings-daemon" "package"] ["services" "gnome3" "gnome-settings-daemon" "package"]
"") "")
# Added 2021-05-07
(mkRenamedOptionModule
[ "services" "gnome3" "gnome-settings-daemon" "enable" ]
[ "services" "gnome" "gnome-settings-daemon" "enable" ]
)
]; ];
###### interface ###### interface
options = { options = {
services.gnome3.gnome-settings-daemon = { services.gnome.gnome-settings-daemon = {
enable = mkEnableOption "GNOME Settings Daemon"; enable = mkEnableOption "GNOME Settings Daemon";
@ -40,15 +46,15 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
environment.systemPackages = [ environment.systemPackages = [
pkgs.gnome3.gnome-settings-daemon pkgs.gnome.gnome-settings-daemon
]; ];
services.udev.packages = [ services.udev.packages = [
pkgs.gnome3.gnome-settings-daemon pkgs.gnome.gnome-settings-daemon
]; ];
systemd.packages = [ systemd.packages = [
pkgs.gnome3.gnome-settings-daemon pkgs.gnome.gnome-settings-daemon
]; ];
systemd.user.targets."gnome-session-initialized".wants = [ systemd.user.targets."gnome-session-initialized".wants = [

16
nixos/modules/services/desktops/gnome3/gnome-user-share.nix → nixos/modules/services/desktops/gnome/gnome-user-share.nix
View File

@ -10,11 +10,19 @@ with lib;
maintainers = teams.gnome.members; maintainers = teams.gnome.members;
}; };
imports = [
# Added 2021-05-07
(mkRenamedOptionModule
[ "services" "gnome3" "gnome-user-share" "enable" ]
[ "services" "gnome" "gnome-user-share" "enable" ]
)
];
###### interface ###### interface
options = { options = {
services.gnome3.gnome-user-share = { services.gnome.gnome-user-share = {
enable = mkEnableOption "GNOME User Share, a user-level file sharing service for GNOME"; enable = mkEnableOption "GNOME User Share, a user-level file sharing service for GNOME";
@ -25,14 +33,14 @@ with lib;
###### implementation ###### implementation
config = mkIf config.services.gnome3.gnome-user-share.enable { config = mkIf config.services.gnome.gnome-user-share.enable {
environment.systemPackages = [ environment.systemPackages = [
pkgs.gnome3.gnome-user-share pkgs.gnome.gnome-user-share
]; ];
systemd.packages = [ systemd.packages = [
pkgs.gnome3.gnome-user-share pkgs.gnome.gnome-user-share
]; ];
}; };

20
nixos/modules/services/desktops/gnome3/rygel.nix → nixos/modules/services/desktops/gnome/rygel.nix
View File

@ -8,9 +8,17 @@ with lib;
maintainers = teams.gnome.members; maintainers = teams.gnome.members;
}; };
imports = [
# Added 2021-05-07
(mkRenamedOptionModule
[ "services" "gnome3" "rygel" "enable" ]
[ "services" "gnome" "rygel" "enable" ]
)
];
###### interface ###### interface
options = { options = {
services.gnome3.rygel = { services.gnome.rygel = {
enable = mkOption { enable = mkOption {
default = false; default = false;
description = '' description = ''
@ -24,13 +32,13 @@ with lib;
}; };
###### implementation ###### implementation
config = mkIf config.services.gnome3.rygel.enable { config = mkIf config.services.gnome.rygel.enable {
environment.systemPackages = [ pkgs.gnome3.rygel ]; environment.systemPackages = [ pkgs.gnome.rygel ];
services.dbus.packages = [ pkgs.gnome3.rygel ]; services.dbus.packages = [ pkgs.gnome.rygel ];
systemd.packages = [ pkgs.gnome3.rygel ]; systemd.packages = [ pkgs.gnome.rygel ];
environment.etc."rygel.conf".source = "${pkgs.gnome3.rygel}/etc/rygel.conf"; environment.etc."rygel.conf".source = "${pkgs.gnome.rygel}/etc/rygel.conf";
}; };
} }

16
nixos/modules/services/desktops/gnome3/sushi.nix → nixos/modules/services/desktops/gnome/sushi.nix
View File

@ -10,11 +10,19 @@ with lib;
maintainers = teams.gnome.members; maintainers = teams.gnome.members;
}; };
imports = [
# Added 2021-05-07
(mkRenamedOptionModule
[ "services" "gnome3" "sushi" "enable" ]
[ "services" "gnome" "sushi" "enable" ]
)
];
###### interface ###### interface
options = { options = {
services.gnome3.sushi = { services.gnome.sushi = {
enable = mkOption { enable = mkOption {
type = types.bool; type = types.bool;
@ -31,11 +39,11 @@ with lib;
###### implementation ###### implementation
config = mkIf config.services.gnome3.sushi.enable { config = mkIf config.services.gnome.sushi.enable {
environment.systemPackages = [ pkgs.gnome3.sushi ]; environment.systemPackages = [ pkgs.gnome.sushi ];
services.dbus.packages = [ pkgs.gnome3.sushi ]; services.dbus.packages = [ pkgs.gnome.sushi ];
}; };

12
nixos/modules/services/desktops/gnome3/tracker-miners.nix → nixos/modules/services/desktops/gnome/tracker-miners.nix
View File

@ -10,11 +10,19 @@ with lib;
maintainers = teams.gnome.members; maintainers = teams.gnome.members;
}; };
imports = [
# Added 2021-05-07
(mkRenamedOptionModule
[ "services" "gnome3" "tracker-miners" "enable" ]
[ "services" "gnome" "tracker-miners" "enable" ]
)
];
###### interface ###### interface
options = { options = {
services.gnome3.tracker-miners = { services.gnome.tracker-miners = {
enable = mkOption { enable = mkOption {
type = types.bool; type = types.bool;
@ -31,7 +39,7 @@ with lib;
###### implementation ###### implementation
config = mkIf config.services.gnome3.tracker-miners.enable { config = mkIf config.services.gnome.tracker-miners.enable {
environment.systemPackages = [ pkgs.tracker-miners ]; environment.systemPackages = [ pkgs.tracker-miners ];

12
nixos/modules/services/desktops/gnome3/tracker.nix → nixos/modules/services/desktops/gnome/tracker.nix
View File

@ -10,11 +10,19 @@ with lib;
maintainers = teams.gnome.members; maintainers = teams.gnome.members;
}; };
imports = [
# Added 2021-05-07
(mkRenamedOptionModule
[ "services" "gnome3" "tracker" "enable" ]
[ "services" "gnome" "tracker" "enable" ]
)
];
###### interface ###### interface
options = { options = {
services.gnome3.tracker = { services.gnome.tracker = {
enable = mkOption { enable = mkOption {
type = types.bool; type = types.bool;
@ -32,7 +40,7 @@ with lib;
###### implementation ###### implementation
config = mkIf config.services.gnome3.tracker.enable { config = mkIf config.services.gnome.tracker.enable {
environment.systemPackages = [ pkgs.tracker ]; environment.systemPackages = [ pkgs.tracker ];

24
nixos/modules/services/desktops/gnome3/gnome-remote-desktop.nix
View File

@ -1,24 +0,0 @@
# Remote desktop daemon using Pipewire.
{ config, lib, pkgs, ... }:
with lib;
{
meta = {
maintainers = teams.gnome.members;
};
###### interface
options = {
services.gnome3.gnome-remote-desktop = {
enable = mkEnableOption "Remote Desktop support using Pipewire";
};
};
###### implementation
config = mkIf config.services.gnome3.gnome-remote-desktop.enable {
services.pipewire.enable = true;
systemd.packages = [ pkgs.gnome3.gnome-remote-desktop ];
};
}

2
nixos/modules/services/desktops/gvfs.nix
View File

@ -34,7 +34,7 @@ in
# gvfs can be built with multiple configurations # gvfs can be built with multiple configurations
package = mkOption { package = mkOption {
type = types.package; type = types.package;
default = pkgs.gnome3.gvfs; default = pkgs.gnome.gvfs;
description = "Which GVfs package to use."; description = "Which GVfs package to use.";
}; };

2
nixos/modules/services/desktops/telepathy.nix
View File

@ -39,7 +39,7 @@ with lib;
services.dbus.packages = [ pkgs.telepathy-mission-control ]; services.dbus.packages = [ pkgs.telepathy-mission-control ];
# Enable runtime optional telepathy in gnome-shell # Enable runtime optional telepathy in gnome-shell
services.xserver.desktopManager.gnome3.sessionPath = with pkgs; [ services.xserver.desktopManager.gnome.sessionPath = with pkgs; [
telepathy-glib telepathy-glib
telepathy-logger telepathy-logger
]; ];

2
nixos/modules/services/desktops/tumbler.nix
View File

@ -19,7 +19,7 @@ in
]; ];
meta = { meta = {
maintainers = with maintainers; [ worldofpeace ]; maintainers = with maintainers; [ ];
}; };
###### interface ###### interface

2
nixos/modules/services/desktops/zeitgeist.nix
View File

@ -7,7 +7,7 @@ with lib;
{ {
meta = { meta = {
maintainers = with maintainers; [ worldofpeace ]; maintainers = with maintainers; [ ];
}; };
###### interface ###### interface

5
nixos/modules/services/networking/yggdrasil.nix
View File

@ -64,7 +64,7 @@ in {
type = types.str; type = types.str;
default = "root"; default = "root";
example = "wheel"; example = "wheel";
description = "Group to grant acces to the Yggdrasil control socket."; description = "Group to grant access to the Yggdrasil control socket.";
}; };
openMulticastPort = mkOption { openMulticastPort = mkOption {
@ -122,12 +122,11 @@ in {
system.activationScripts.yggdrasil = mkIf cfg.persistentKeys '' system.activationScripts.yggdrasil = mkIf cfg.persistentKeys ''
if [ ! -e ${keysPath} ] if [ ! -e ${keysPath} ]
then then
mkdir -p ${builtins.dirOf keysPath} mkdir --mode=700 -p ${builtins.dirOf keysPath}
${binYggdrasil} -genconf -json \ ${binYggdrasil} -genconf -json \
| ${pkgs.jq}/bin/jq \ | ${pkgs.jq}/bin/jq \
'to_entries|map(select(.key|endswith("Key")))|from_entries' \ 'to_entries|map(select(.key|endswith("Key")))|from_entries' \
> ${keysPath} > ${keysPath}
chmod 600 ${keysPath}
fi fi
''; '';

18
nixos/modules/services/x11/desktop-managers/cinnamon.nix
View File

@ -26,7 +26,7 @@ in
sessionPath = mkOption { sessionPath = mkOption {
default = []; default = [];
type = types.listOf types.package; type = types.listOf types.package;
example = literalExample "[ pkgs.gnome3.gpaste ]"; example = literalExample "[ pkgs.gnome.gpaste ]";
description = '' description = ''
Additional list of packages to be added to the session search path. Additional list of packages to be added to the session search path.
Useful for GSettings-conditional autostart. Useful for GSettings-conditional autostart.
@ -94,8 +94,8 @@ in
xapps xapps
]; ];
services.cinnamon.apps.enable = mkDefault true; services.cinnamon.apps.enable = mkDefault true;
services.gnome3.glib-networking.enable = true; services.gnome.glib-networking.enable = true;
services.gnome3.gnome-keyring.enable = true; services.gnome.gnome-keyring.enable = true;
services.gvfs.enable = true; services.gvfs.enable = true;
services.udisks2.enable = true; services.udisks2.enable = true;
services.upower.enable = mkDefault config.powerManagement.enable; services.upower.enable = mkDefault config.powerManagement.enable;
@ -110,7 +110,7 @@ in
programs.dconf.enable = true; programs.dconf.enable = true;
# Enable org.a11y.Bus # Enable org.a11y.Bus
services.gnome3.at-spi2-core.enable = true; services.gnome.at-spi2-core.enable = true;
# Fix lockscreen # Fix lockscreen
security.pam.services = { security.pam.services = {
@ -135,19 +135,19 @@ in
# session requirements # session requirements
cinnamon-screensaver cinnamon-screensaver
# cinnamon-killer-daemon: provided by cinnamon-common # cinnamon-killer-daemon: provided by cinnamon-common
gnome3.networkmanagerapplet # session requirement - also nm-applet not needed gnome.networkmanagerapplet # session requirement - also nm-applet not needed
# packages # packages
nemo nemo
cinnamon-control-center cinnamon-control-center
cinnamon-settings-daemon cinnamon-settings-daemon
gnome3.libgnomekbd gnome.libgnomekbd
orca orca
# theme # theme
gnome3.adwaita-icon-theme gnome.adwaita-icon-theme
hicolor-icon-theme hicolor-icon-theme
gnome3.gnome-themes-extra gnome.gnome-themes-extra
gtk3.out gtk3.out
mint-artwork mint-artwork
mint-themes mint-themes
@ -192,7 +192,7 @@ in
programs.evince.enable = mkDefault true; programs.evince.enable = mkDefault true;
programs.file-roller.enable = mkDefault true; programs.file-roller.enable = mkDefault true;
environment.systemPackages = (with pkgs // pkgs.gnome3 // pkgs.cinnamon; pkgs.gnome3.removePackagesByName [ environment.systemPackages = (with pkgs // pkgs.gnome // pkgs.cinnamon; pkgs.gnome.removePackagesByName [
# cinnamon team apps # cinnamon team apps
blueberry blueberry
warpinator warpinator

2
nixos/modules/services/x11/desktop-managers/default.nix
View File

@ -19,7 +19,7 @@ in
# E.g., if Plasma 5 is enabled, it supersedes xterm. # E.g., if Plasma 5 is enabled, it supersedes xterm.
imports = [ imports = [
./none.nix ./xterm.nix ./xfce.nix ./plasma5.nix ./lumina.nix ./none.nix ./xterm.nix ./xfce.nix ./plasma5.nix ./lumina.nix
./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix ./lxqt.nix ./enlightenment.nix ./gnome.nix ./kodi.nix
./mate.nix ./pantheon.nix ./surf-display.nix ./cde.nix ./mate.nix ./pantheon.nix ./surf-display.nix ./cde.nix
./cinnamon.nix ./cinnamon.nix
]; ];

176
nixos/modules/services/x11/desktop-managers/gnome3.nix → nixos/modules/services/x11/desktop-managers/gnome.nix
View File

@ -4,8 +4,8 @@ with lib;
let let
cfg = config.services.xserver.desktopManager.gnome3; cfg = config.services.xserver.desktopManager.gnome;
serviceCfg = config.services.gnome3; serviceCfg = config.services.gnome;
# Prioritize nautilus by default when opening directories # Prioritize nautilus by default when opening directories
mimeAppsList = pkgs.writeTextFile { mimeAppsList = pkgs.writeTextFile {
@ -23,7 +23,7 @@ let
''; '';
nixos-gsettings-desktop-schemas = let nixos-gsettings-desktop-schemas = let
defaultPackages = with pkgs; [ gsettings-desktop-schemas gnome3.gnome-shell ]; defaultPackages = with pkgs; [ gsettings-desktop-schemas gnome.gnome-shell ];
in in
pkgs.runCommand "nixos-gsettings-desktop-schemas" { preferLocalBuild = true; } pkgs.runCommand "nixos-gsettings-desktop-schemas" { preferLocalBuild = true; }
'' ''
@ -33,10 +33,10 @@ let
(pkg: "cp -rf ${pkg}/share/gsettings-schemas/*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas\n") (pkg: "cp -rf ${pkg}/share/gsettings-schemas/*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas\n")
(defaultPackages ++ cfg.extraGSettingsOverridePackages)} (defaultPackages ++ cfg.extraGSettingsOverridePackages)}
cp -f ${pkgs.gnome3.gnome-shell}/share/gsettings-schemas/*/glib-2.0/schemas/*.gschema.override $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas cp -f ${pkgs.gnome.gnome-shell}/share/gsettings-schemas/*/glib-2.0/schemas/*.gschema.override $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
${optionalString flashbackEnabled '' ${optionalString flashbackEnabled ''
cp -f ${pkgs.gnome3.gnome-flashback}/share/gsettings-schemas/*/glib-2.0/schemas/*.gschema.override $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas cp -f ${pkgs.gnome.gnome-flashback}/share/gsettings-schemas/*/glib-2.0/schemas/*.gschema.override $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
''} ''}
chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides
@ -57,7 +57,7 @@ let
flashbackEnabled = cfg.flashback.enableMetacity || length cfg.flashback.customSessions > 0; flashbackEnabled = cfg.flashback.enableMetacity || length cfg.flashback.customSessions > 0;
notExcluded = pkg: mkDefault (!(lib.elem pkg config.environment.gnome3.excludePackages)); notExcluded = pkg: mkDefault (!(lib.elem pkg config.environment.gnome.excludePackages));
in in
@ -67,9 +67,69 @@ in
maintainers = teams.gnome.members; maintainers = teams.gnome.members;
}; };
imports = [
# Added 2021-05-07
(mkRenamedOptionModule
[ "services" "gnome3" "core-os-services" "enable" ]
[ "services" "gnome" "core-os-services" "enable" ]
)
(mkRenamedOptionModule
[ "services" "gnome3" "core-shell" "enable" ]
[ "services" "gnome" "core-shell" "enable" ]
)
(mkRenamedOptionModule
[ "services" "gnome3" "core-utilities" "enable" ]
[ "services" "gnome" "core-utilities" "enable" ]
)
(mkRenamedOptionModule
[ "services" "gnome3" "core-developer-tools" "enable" ]
[ "services" "gnome" "core-developer-tools" "enable" ]
)
(mkRenamedOptionModule
[ "services" "gnome3" "games" "enable" ]
[ "services" "gnome" "games" "enable" ]
)
(mkRenamedOptionModule
[ "services" "gnome3" "experimental-features" "realtime-scheduling" ]
[ "services" "gnome" "experimental-features" "realtime-scheduling" ]
)
(mkRenamedOptionModule
[ "services" "xserver" "desktopManager" "gnome3" "enable" ]
[ "services" "xserver" "desktopManager" "gnome" "enable" ]
)
(mkRenamedOptionModule
[ "services" "xserver" "desktopManager" "gnome3" "sessionPath" ]
[ "services" "xserver" "desktopManager" "gnome" "sessionPath" ]
)
(mkRenamedOptionModule
[ "services" "xserver" "desktopManager" "gnome3" "favoriteAppsOverride" ]
[ "services" "xserver" "desktopManager" "gnome" "favoriteAppsOverride" ]
)
(mkRenamedOptionModule
[ "services" "xserver" "desktopManager" "gnome3" "extraGSettingsOverrides" ]
[ "services" "xserver" "desktopManager" "gnome" "extraGSettingsOverrides" ]
)
(mkRenamedOptionModule
[ "services" "xserver" "desktopManager" "gnome3" "extraGSettingsOverridePackages" ]
[ "services" "xserver" "desktopManager" "gnome" "extraGSettingsOverridePackages" ]
)
(mkRenamedOptionModule
[ "services" "xserver" "desktopManager" "gnome3" "debug" ]
[ "services" "xserver" "desktopManager" "gnome" "debug" ]
)
(mkRenamedOptionModule
[ "services" "xserver" "desktopManager" "gnome3" "flashback" ]
[ "services" "xserver" "desktopManager" "gnome" "flashback" ]
)
(mkRenamedOptionModule
[ "environment" "gnome3" "excludePackages" ]
[ "environment" "gnome" "excludePackages" ]
)
];
options = { options = {
services.gnome3 = { services.gnome = {
core-os-services.enable = mkEnableOption "essential services for GNOME3"; core-os-services.enable = mkEnableOption "essential services for GNOME3";
core-shell.enable = mkEnableOption "GNOME Shell services"; core-shell.enable = mkEnableOption "GNOME Shell services";
core-utilities.enable = mkEnableOption "GNOME core utilities"; core-utilities.enable = mkEnableOption "GNOME core utilities";
@ -109,7 +169,7 @@ in
}; };
}; };
services.xserver.desktopManager.gnome3 = { services.xserver.desktopManager.gnome = {
enable = mkOption { enable = mkOption {
type = types.bool; type = types.bool;
default = false; default = false;
@ -119,14 +179,14 @@ in
sessionPath = mkOption { sessionPath = mkOption {
default = []; default = [];
type = types.listOf types.package; type = types.listOf types.package;
example = literalExample "[ pkgs.gnome3.gpaste ]"; example = literalExample "[ pkgs.gnome.gpaste ]";
description = '' description = ''
Additional list of packages to be added to the session search path. Additional list of packages to be added to the session search path.
Useful for GNOME Shell extensions or GSettings-conditional autostart. Useful for GNOME Shell extensions or GSettings-conditional autostart.
Note that this should be a last resort; patching the package is preferred (see GPaste). Note that this should be a last resort; patching the package is preferred (see GPaste).
''; '';
apply = list: list ++ [ pkgs.gnome3.gnome-shell pkgs.gnome3.gnome-shell-extensions ]; apply = list: list ++ [ pkgs.gnome.gnome-shell pkgs.gnome.gnome-shell-extensions ];
}; };
favoriteAppsOverride = mkOption { favoriteAppsOverride = mkOption {
@ -185,9 +245,9 @@ in
}; };
}; };
environment.gnome3.excludePackages = mkOption { environment.gnome.excludePackages = mkOption {
default = []; default = [];
example = literalExample "[ pkgs.gnome3.totem ]"; example = literalExample "[ pkgs.gnome.totem ]";
type = types.listOf types.package; type = types.listOf types.package;
description = "Which packages gnome should exclude from the default environment"; description = "Which packages gnome should exclude from the default environment";
}; };
@ -200,14 +260,14 @@ in
system.nixos-generate-config.desktopConfiguration = ['' system.nixos-generate-config.desktopConfiguration = [''
# Enable the GNOME 3 Desktop Environment. # Enable the GNOME 3 Desktop Environment.
services.xserver.displayManager.gdm.enable = true; services.xserver.displayManager.gdm.enable = true;
services.xserver.desktopManager.gnome3.enable = true; services.xserver.desktopManager.gnome.enable = true;
'']; ''];
services.gnome3.core-os-services.enable = true; services.gnome.core-os-services.enable = true;
services.gnome3.core-shell.enable = true; services.gnome.core-shell.enable = true;
services.gnome3.core-utilities.enable = mkDefault true; services.gnome.core-utilities.enable = mkDefault true;
services.xserver.displayManager.sessionPackages = [ pkgs.gnome3.gnome-session.sessions ]; services.xserver.displayManager.sessionPackages = [ pkgs.gnome.gnome-session.sessions ];
environment.extraInit = '' environment.extraInit = ''
${concatMapStrings (p: '' ${concatMapStrings (p: ''
@ -229,30 +289,30 @@ in
# Override GSettings schemas # Override GSettings schemas
environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas"; environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
# If gnome3 is installed, build vim for gtk3 too. # If gnome is installed, build vim for gtk3 too.
nixpkgs.config.vim.gui = "gtk3"; nixpkgs.config.vim.gui = "gtk3";
# Install gnome-software if flatpak is enabled # Install gnome-software if flatpak is enabled
services.flatpak.guiPackages = [ services.flatpak.guiPackages = [
pkgs.gnome3.gnome-software pkgs.gnome.gnome-software
]; ];
}) })
(mkIf flashbackEnabled { (mkIf flashbackEnabled {
services.xserver.displayManager.sessionPackages = map services.xserver.displayManager.sessionPackages = map
(wm: pkgs.gnome3.gnome-flashback.mkSessionForWm { (wm: pkgs.gnome.gnome-flashback.mkSessionForWm {
inherit (wm) wmName wmLabel wmCommand; inherit (wm) wmName wmLabel wmCommand;
}) (optional cfg.flashback.enableMetacity { }) (optional cfg.flashback.enableMetacity {
wmName = "metacity"; wmName = "metacity";
wmLabel = "Metacity"; wmLabel = "Metacity";
wmCommand = "${pkgs.gnome3.metacity}/bin/metacity"; wmCommand = "${pkgs.gnome.metacity}/bin/metacity";
} ++ cfg.flashback.customSessions); } ++ cfg.flashback.customSessions);
security.pam.services.gnome-flashback = { security.pam.services.gnome-flashback = {
enableGnomeKeyring = true; enableGnomeKeyring = true;
}; };
systemd.packages = with pkgs.gnome3; [ systemd.packages = with pkgs.gnome; [
gnome-flashback gnome-flashback
] ++ (map ] ++ (map
(wm: gnome-flashback.mkSystemdTargetForWm { (wm: gnome-flashback.mkSystemdTargetForWm {
@ -260,9 +320,9 @@ in
}) cfg.flashback.customSessions); }) cfg.flashback.customSessions);
# gnome-panel needs these for menu applet # gnome-panel needs these for menu applet
environment.sessionVariables.XDG_DATA_DIRS = [ "${pkgs.gnome3.gnome-flashback}/share" ]; environment.sessionVariables.XDG_DATA_DIRS = [ "${pkgs.gnome.gnome-flashback}/share" ];
# TODO: switch to sessionVariables (resolve conflict) # TODO: switch to sessionVariables (resolve conflict)
environment.variables.XDG_CONFIG_DIRS = [ "${pkgs.gnome3.gnome-flashback}/etc/xdg" ]; environment.variables.XDG_CONFIG_DIRS = [ "${pkgs.gnome.gnome-flashback}/etc/xdg" ];
}) })
(mkIf serviceCfg.core-os-services.enable { (mkIf serviceCfg.core-os-services.enable {
@ -274,13 +334,13 @@ in
services.dleyna-renderer.enable = mkDefault true; services.dleyna-renderer.enable = mkDefault true;
services.dleyna-server.enable = mkDefault true; services.dleyna-server.enable = mkDefault true;
services.power-profiles-daemon.enable = mkDefault true; services.power-profiles-daemon.enable = mkDefault true;
services.gnome3.at-spi2-core.enable = true; services.gnome.at-spi2-core.enable = true;
services.gnome3.evolution-data-server.enable = true; services.gnome.evolution-data-server.enable = true;
services.gnome3.gnome-keyring.enable = true; services.gnome.gnome-keyring.enable = true;
services.gnome3.gnome-online-accounts.enable = mkDefault true; services.gnome.gnome-online-accounts.enable = mkDefault true;
services.gnome3.gnome-online-miners.enable = true; services.gnome.gnome-online-miners.enable = true;
services.gnome3.tracker-miners.enable = mkDefault true; services.gnome.tracker-miners.enable = mkDefault true;
services.gnome3.tracker.enable = mkDefault true; services.gnome.tracker.enable = mkDefault true;
services.hardware.bolt.enable = mkDefault true; services.hardware.bolt.enable = mkDefault true;
services.packagekit.enable = mkDefault true; services.packagekit.enable = mkDefault true;
services.udisks2.enable = true; services.udisks2.enable = true;
@ -308,23 +368,23 @@ in
(mkIf serviceCfg.core-shell.enable { (mkIf serviceCfg.core-shell.enable {
services.colord.enable = mkDefault true; services.colord.enable = mkDefault true;
services.gnome3.chrome-gnome-shell.enable = mkDefault true; services.gnome.chrome-gnome-shell.enable = mkDefault true;
services.gnome3.glib-networking.enable = true; services.gnome.glib-networking.enable = true;
services.gnome3.gnome-initial-setup.enable = mkDefault true; services.gnome.gnome-initial-setup.enable = mkDefault true;
services.gnome3.gnome-remote-desktop.enable = mkDefault true; services.gnome.gnome-remote-desktop.enable = mkDefault true;
services.gnome3.gnome-settings-daemon.enable = true; services.gnome.gnome-settings-daemon.enable = true;
services.gnome3.gnome-user-share.enable = mkDefault true; services.gnome.gnome-user-share.enable = mkDefault true;
services.gnome3.rygel.enable = mkDefault true; services.gnome.rygel.enable = mkDefault true;
services.gvfs.enable = true; services.gvfs.enable = true;
services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
services.telepathy.enable = mkDefault true; services.telepathy.enable = mkDefault true;
systemd.packages = with pkgs.gnome3; [ systemd.packages = with pkgs.gnome; [
gnome-session gnome-session
gnome-shell gnome-shell
]; ];
services.udev.packages = with pkgs.gnome3; [ services.udev.packages = with pkgs.gnome; [
# Force enable KMS modifiers for devices that require them. # Force enable KMS modifiers for devices that require them.
# https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1443 # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1443
mutter mutter
@ -333,7 +393,7 @@ in
services.avahi.enable = mkDefault true; services.avahi.enable = mkDefault true;
xdg.portal.extraPortals = [ xdg.portal.extraPortals = [
pkgs.gnome3.gnome-shell pkgs.gnome.gnome-shell
]; ];
services.geoclue2.enable = mkDefault true; services.geoclue2.enable = mkDefault true;
@ -360,7 +420,7 @@ in
]; ];
# Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-38/elements/core/meta-gnome-core-shell.bst # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-38/elements/core/meta-gnome-core-shell.bst
environment.systemPackages = with pkgs.gnome3; [ environment.systemPackages = with pkgs.gnome; [
adwaita-icon-theme adwaita-icon-theme
gnome-backgrounds gnome-backgrounds
gnome-bluetooth gnome-bluetooth
@ -386,12 +446,12 @@ in
# Enable soft realtime scheduling, only supported on wayland # Enable soft realtime scheduling, only supported on wayland
(mkIf serviceCfg.experimental-features.realtime-scheduling { (mkIf serviceCfg.experimental-features.realtime-scheduling {
security.wrappers.".gnome-shell-wrapped" = { security.wrappers.".gnome-shell-wrapped" = {
source = "${pkgs.gnome3.gnome-shell}/bin/.gnome-shell-wrapped"; source = "${pkgs.gnome.gnome-shell}/bin/.gnome-shell-wrapped";
capabilities = "cap_sys_nice=ep"; capabilities = "cap_sys_nice=ep";
}; };
systemd.user.services.gnome-shell-wayland = let systemd.user.services.gnome-shell-wayland = let
gnomeShellRT = with pkgs.gnome3; pkgs.runCommand "gnome-shell-rt" {} '' gnomeShellRT = with pkgs.gnome; pkgs.runCommand "gnome-shell-rt" {} ''
mkdir -p $out/bin/ mkdir -p $out/bin/
cp ${gnome-shell}/bin/gnome-shell $out/bin cp ${gnome-shell}/bin/gnome-shell $out/bin
sed -i "s@${gnome-shell}/bin/@${config.security.wrapperDir}/@" $out/bin/gnome-shell sed -i "s@${gnome-shell}/bin/@${config.security.wrapperDir}/@" $out/bin/gnome-shell
@ -406,7 +466,7 @@ in
# Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-38/elements/core/meta-gnome-core-utilities.bst # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-38/elements/core/meta-gnome-core-utilities.bst
(mkIf serviceCfg.core-utilities.enable { (mkIf serviceCfg.core-utilities.enable {
environment.systemPackages = (with pkgs.gnome3; removePackagesByName [ environment.systemPackages = (with pkgs.gnome; removePackagesByName [
baobab baobab
cheese cheese
eog eog
@ -430,19 +490,19 @@ in
simple-scan simple-scan
totem totem
yelp yelp
] config.environment.gnome3.excludePackages); ] config.environment.gnome.excludePackages);
# Enable default program modules # Enable default program modules
# Since some of these have a corresponding package, we only # Since some of these have a corresponding package, we only
# enable that program module if the package hasn't been excluded # enable that program module if the package hasn't been excluded
# through `environment.gnome3.excludePackages` # through `environment.gnome.excludePackages`
programs.evince.enable = notExcluded pkgs.gnome3.evince; programs.evince.enable = notExcluded pkgs.gnome.evince;
programs.file-roller.enable = notExcluded pkgs.gnome3.file-roller; programs.file-roller.enable = notExcluded pkgs.gnome.file-roller;
programs.geary.enable = notExcluded pkgs.gnome3.geary; programs.geary.enable = notExcluded pkgs.gnome.geary;
programs.gnome-disks.enable = notExcluded pkgs.gnome3.gnome-disk-utility; programs.gnome-disks.enable = notExcluded pkgs.gnome.gnome-disk-utility;
programs.gnome-terminal.enable = notExcluded pkgs.gnome3.gnome-terminal; programs.gnome-terminal.enable = notExcluded pkgs.gnome.gnome-terminal;
programs.seahorse.enable = notExcluded pkgs.gnome3.seahorse; programs.seahorse.enable = notExcluded pkgs.gnome.seahorse;
services.gnome3.sushi.enable = notExcluded pkgs.gnome3.sushi; services.gnome.sushi.enable = notExcluded pkgs.gnome.sushi;
# Let nautilus find extensions # Let nautilus find extensions
# TODO: Create nautilus-with-extensions package # TODO: Create nautilus-with-extensions package
@ -457,7 +517,7 @@ in
}) })
(mkIf serviceCfg.games.enable { (mkIf serviceCfg.games.enable {
environment.systemPackages = (with pkgs.gnome3; removePackagesByName [ environment.systemPackages = (with pkgs.gnome; removePackagesByName [
aisleriot aisleriot
atomix atomix
five-or-more five-or-more
@ -477,12 +537,12 @@ in
quadrapassel quadrapassel
swell-foop swell-foop
tali tali
] config.environment.gnome3.excludePackages); ] config.environment.gnome.excludePackages);
}) })
# Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/-/blob/3.38.0/elements/core/meta-gnome-core-developer-tools.bst # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/-/blob/3.38.0/elements/core/meta-gnome-core-developer-tools.bst
(mkIf serviceCfg.core-developer-tools.enable { (mkIf serviceCfg.core-developer-tools.enable {
environment.systemPackages = (with pkgs.gnome3; removePackagesByName [ environment.systemPackages = (with pkgs.gnome; removePackagesByName [
dconf-editor dconf-editor
devhelp devhelp
pkgs.gnome-builder pkgs.gnome-builder
@ -491,7 +551,7 @@ in
# in default configurations. # in default configurations.
# https://github.com/NixOS/nixpkgs/issues/60908 # https://github.com/NixOS/nixpkgs/issues/60908
/* gnome-boxes */ /* gnome-boxes */
] config.environment.gnome3.excludePackages); ] config.environment.gnome.excludePackages);
services.sysprof.enable = true; services.sysprof.enable = true;
}) })

2
nixos/modules/services/x11/desktop-managers/lxqt.nix
View File

@ -51,7 +51,7 @@ in
environment.systemPackages = environment.systemPackages =
pkgs.lxqt.preRequisitePackages ++ pkgs.lxqt.preRequisitePackages ++
pkgs.lxqt.corePackages ++ pkgs.lxqt.corePackages ++
(pkgs.gnome3.removePackagesByName (pkgs.gnome.removePackagesByName
pkgs.lxqt.optionalPackages pkgs.lxqt.optionalPackages
config.environment.lxqt.excludePackages); config.environment.lxqt.excludePackages);

6
nixos/modules/services/x11/desktop-managers/mate.nix
View File

@ -76,7 +76,7 @@ in
environment.systemPackages = environment.systemPackages =
pkgs.mate.basePackages ++ pkgs.mate.basePackages ++
(pkgs.gnome3.removePackagesByName (pkgs.gnome.removePackagesByName
pkgs.mate.extraPackages pkgs.mate.extraPackages
config.environment.mate.excludePackages) ++ config.environment.mate.excludePackages) ++
[ [
@ -97,8 +97,8 @@ in
# Mate uses this for printing # Mate uses this for printing
programs.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); programs.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
services.gnome3.at-spi2-core.enable = true; services.gnome.at-spi2-core.enable = true;
services.gnome3.gnome-keyring.enable = true; services.gnome.gnome-keyring.enable = true;
services.udev.packages = [ pkgs.mate.mate-settings-daemon ]; services.udev.packages = [ pkgs.mate.mate-settings-daemon ];
services.gvfs.enable = true; services.gvfs.enable = true;
services.upower.enable = config.powerManagement.enable; services.upower.enable = config.powerManagement.enable;

24
nixos/modules/services/x11/desktop-managers/pantheon.nix
View File

@ -43,7 +43,7 @@ in
sessionPath = mkOption { sessionPath = mkOption {
default = []; default = [];
type = types.listOf types.package; type = types.listOf types.package;
example = literalExample "[ pkgs.gnome3.gpaste ]"; example = literalExample "[ pkgs.gnome.gpaste ]";
description = '' description = ''
Additional list of packages to be added to the session search path. Additional list of packages to be added to the session search path.
Useful for GSettings-conditional autostart. Useful for GSettings-conditional autostart.
@ -142,12 +142,12 @@ in
]; ];
services.pantheon.apps.enable = mkDefault true; services.pantheon.apps.enable = mkDefault true;
services.pantheon.contractor.enable = mkDefault true; services.pantheon.contractor.enable = mkDefault true;
services.gnome3.at-spi2-core.enable = true; services.gnome.at-spi2-core.enable = true;
services.gnome3.evolution-data-server.enable = true; services.gnome.evolution-data-server.enable = true;
services.gnome3.glib-networking.enable = true; services.gnome.glib-networking.enable = true;
services.gnome3.gnome-keyring.enable = true; services.gnome.gnome-keyring.enable = true;
services.gvfs.enable = true; services.gvfs.enable = true;
services.gnome3.rygel.enable = mkDefault true; services.gnome.rygel.enable = mkDefault true;
services.gsignond.enable = mkDefault true; services.gsignond.enable = mkDefault true;
services.gsignond.plugins = with pkgs.gsignondPlugins; [ lastfm mail oauth ]; services.gsignond.plugins = with pkgs.gsignondPlugins; [ lastfm mail oauth ];
services.udisks2.enable = true; services.udisks2.enable = true;
@ -177,7 +177,7 @@ in
desktop-file-utils desktop-file-utils
glib glib
gnome-menus gnome-menus
gnome3.adwaita-icon-theme gnome.adwaita-icon-theme
gtk3.out gtk3.out
hicolor-icon-theme hicolor-icon-theme
lightlocker lightlocker
@ -213,10 +213,10 @@ in
elementary-settings-daemon elementary-settings-daemon
pantheon-agent-geoclue2 pantheon-agent-geoclue2
pantheon-agent-polkit pantheon-agent-polkit
]) ++ (gnome3.removePackagesByName [ ]) ++ (gnome.removePackagesByName [
gnome3.geary gnome.geary
gnome3.epiphany gnome.epiphany
gnome3.gnome-font-viewer gnome.gnome-font-viewer
] config.environment.pantheon.excludePackages); ] config.environment.pantheon.excludePackages);
programs.evince.enable = mkDefault true; programs.evince.enable = mkDefault true;
@ -265,7 +265,7 @@ in
}) })
(mkIf serviceCfg.apps.enable { (mkIf serviceCfg.apps.enable {
environment.systemPackages = (with pkgs.pantheon; pkgs.gnome3.removePackagesByName [ environment.systemPackages = (with pkgs.pantheon; pkgs.gnome.removePackagesByName [
elementary-calculator elementary-calculator
elementary-calendar elementary-calendar
elementary-camera elementary-camera

8
nixos/modules/services/x11/desktop-managers/xfce.nix
View File

@ -9,7 +9,7 @@ in
{ {
meta = { meta = {
maintainers = with maintainers; [ worldofpeace ]; maintainers = with maintainers; [ ];
}; };
imports = [ imports = [
@ -74,8 +74,8 @@ in
glib # for gsettings glib # for gsettings
gtk3.out # gtk-update-icon-cache gtk3.out # gtk-update-icon-cache
gnome3.gnome-themes-extra gnome.gnome-themes-extra
gnome3.adwaita-icon-theme gnome.adwaita-icon-theme
hicolor-icon-theme hicolor-icon-theme
tango-icon-theme tango-icon-theme
xfce4-icon-theme xfce4-icon-theme
@ -149,7 +149,7 @@ in
security.polkit.enable = true; security.polkit.enable = true;
services.accounts-daemon.enable = true; services.accounts-daemon.enable = true;
services.upower.enable = config.powerManagement.enable; services.upower.enable = config.powerManagement.enable;
services.gnome3.glib-networking.enable = true; services.gnome.glib-networking.enable = true;
services.gvfs.enable = true; services.gvfs.enable = true;
services.tumbler.enable = true; services.tumbler.enable = true;
services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));

2
nixos/modules/services/x11/display-managers/account-service-util.nix
View File

@ -39,6 +39,6 @@ python3.pkgs.buildPythonApplication {
''; '';
meta = with lib; { meta = with lib; {
maintainers = with maintainers; [ worldofpeace ]; maintainers = with maintainers; [ ];
}; };
} }

10
nixos/modules/services/x11/display-managers/gdm.nix
View File

@ -5,7 +5,7 @@ with lib;
let let
cfg = config.services.xserver.displayManager; cfg = config.services.xserver.displayManager;
gdm = pkgs.gnome3.gdm; gdm = pkgs.gnome.gdm;
xSessionWrapper = if (cfg.setupCommands == "") then null else xSessionWrapper = if (cfg.setupCommands == "") then null else
pkgs.writeScript "gdm-x-session-wrapper" '' pkgs.writeScript "gdm-x-session-wrapper" ''
@ -154,14 +154,14 @@ in
] ++ optionals config.hardware.pulseaudio.enable [ ] ++ optionals config.hardware.pulseaudio.enable [
"d /run/gdm/.config/pulse 0711 gdm gdm" "d /run/gdm/.config/pulse 0711 gdm gdm"
"L+ /run/gdm/.config/pulse/${pulseConfig.name} - - - - ${pulseConfig}" "L+ /run/gdm/.config/pulse/${pulseConfig.name} - - - - ${pulseConfig}"
] ++ optionals config.services.gnome3.gnome-initial-setup.enable [ ] ++ optionals config.services.gnome.gnome-initial-setup.enable [
# Create stamp file for gnome-initial-setup to prevent it starting in GDM. # Create stamp file for gnome-initial-setup to prevent it starting in GDM.
"f /run/gdm/.config/gnome-initial-setup-done 0711 gdm gdm - yes" "f /run/gdm/.config/gnome-initial-setup-done 0711 gdm gdm - yes"
]; ];
# Otherwise GDM will not be able to start correctly and display Wayland sessions # Otherwise GDM will not be able to start correctly and display Wayland sessions
systemd.packages = with pkgs.gnome3; [ gdm gnome-session gnome-shell ]; systemd.packages = with pkgs.gnome; [ gdm gnome-session gnome-shell ];
environment.systemPackages = [ pkgs.gnome3.adwaita-icon-theme ]; environment.systemPackages = [ pkgs.gnome.adwaita-icon-theme ];
systemd.services.display-manager.wants = [ systemd.services.display-manager.wants = [
# Because sd_login_monitor_new requires /run/systemd/machines # Because sd_login_monitor_new requires /run/systemd/machines
@ -208,7 +208,7 @@ in
EnvironmentFile = "-/etc/locale.conf"; EnvironmentFile = "-/etc/locale.conf";
}; };
systemd.services.display-manager.path = [ pkgs.gnome3.gnome-session ]; systemd.services.display-manager.path = [ pkgs.gnome.gnome-session ];
# Allow choosing an user account # Allow choosing an user account
services.accounts-daemon.enable = true; services.accounts-daemon.enable = true;

4
nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix
View File

@ -34,8 +34,8 @@ in {
theme = { theme = {
package = mkOption { package = mkOption {
type = types.package; type = types.package;
default = pkgs.gnome3.gnome-themes-extra; default = pkgs.gnome.gnome-themes-extra;
defaultText = "pkgs.gnome3.gnome-themes-extra"; defaultText = "pkgs.gnome.gnome-themes-extra";
description = '' description = ''
The package path that contains the theme given in the name option. The package path that contains the theme given in the name option.
''; '';

12
nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
View File

@ -47,8 +47,8 @@ in
package = mkOption { package = mkOption {
type = types.package; type = types.package;
default = pkgs.gnome3.gnome-themes-extra; default = pkgs.gnome.gnome-themes-extra;
defaultText = "pkgs.gnome3.gnome-themes-extra"; defaultText = "pkgs.gnome.gnome-themes-extra";
description = '' description = ''
The package path that contains the theme given in the name option. The package path that contains the theme given in the name option.
''; '';
@ -68,8 +68,8 @@ in
package = mkOption { package = mkOption {
type = types.package; type = types.package;
default = pkgs.gnome3.adwaita-icon-theme; default = pkgs.gnome.adwaita-icon-theme;
defaultText = "pkgs.gnome3.adwaita-icon-theme"; defaultText = "pkgs.gnome.adwaita-icon-theme";
description = '' description = ''
The package path that contains the icon theme given in the name option. The package path that contains the icon theme given in the name option.
''; '';
@ -89,8 +89,8 @@ in
package = mkOption { package = mkOption {
type = types.package; type = types.package;
default = pkgs.gnome3.adwaita-icon-theme; default = pkgs.gnome.adwaita-icon-theme;
defaultText = "pkgs.gnome3.adwaita-icon-theme"; defaultText = "pkgs.gnome.adwaita-icon-theme";
description = '' description = ''
The package path that contains the cursor theme given in the name option. The package path that contains the cursor theme given in the name option.
''; '';

2
nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
View File

@ -11,7 +11,7 @@ let
in in
{ {
meta = { meta = {
maintainers = with maintainers; [ worldofpeace ]; maintainers = with maintainers; [ ];
}; };
options = { options = {

2
nixos/modules/services/x11/display-managers/lightdm.nix
View File

@ -70,7 +70,7 @@ let
in in
{ {
meta = { meta = {
maintainers = with maintainers; [ worldofpeace ]; maintainers = with maintainers; [ ];
}; };
# Note: the order in which lightdm greeter modules are imported # Note: the order in which lightdm greeter modules are imported

6
nixos/modules/services/x11/window-managers/metacity.nix
View File

@ -5,7 +5,7 @@ with lib;
let let
cfg = config.services.xserver.windowManager.metacity; cfg = config.services.xserver.windowManager.metacity;
inherit (pkgs) gnome3; inherit (pkgs) gnome;
in in
{ {
@ -18,12 +18,12 @@ in
services.xserver.windowManager.session = singleton services.xserver.windowManager.session = singleton
{ name = "metacity"; { name = "metacity";
start = '' start = ''
${gnome3.metacity}/bin/metacity & ${gnome.metacity}/bin/metacity &
waitPID=$! waitPID=$!
''; '';
}; };
environment.systemPackages = [ gnome3.metacity ]; environment.systemPackages = [ gnome.metacity ];
}; };

4
nixos/release-combined.nix
View File

@ -70,8 +70,8 @@ in rec {
(onFullSupported "nixos.tests.firefox") (onFullSupported "nixos.tests.firefox")
(onFullSupported "nixos.tests.firewall") (onFullSupported "nixos.tests.firewall")
(onFullSupported "nixos.tests.fontconfig-default-fonts") (onFullSupported "nixos.tests.fontconfig-default-fonts")
(onFullSupported "nixos.tests.gnome3") (onFullSupported "nixos.tests.gnome")
(onFullSupported "nixos.tests.gnome3-xorg") (onFullSupported "nixos.tests.gnome-xorg")
(onSystems ["x86_64-linux"] "nixos.tests.hibernate") (onSystems ["x86_64-linux"] "nixos.tests.hibernate")
(onFullSupported "nixos.tests.i3wm") (onFullSupported "nixos.tests.i3wm")
(onSystems ["x86_64-linux"] "nixos.tests.installer.btrfsSimple") (onSystems ["x86_64-linux"] "nixos.tests.installer.btrfsSimple")

4
nixos/release.nix
View File

@ -323,10 +323,10 @@ in rec {
services.xserver.desktopManager.xfce.enable = true; services.xserver.desktopManager.xfce.enable = true;
}); });
gnome3 = makeClosure ({ ... }: gnome = makeClosure ({ ... }:
{ services.xserver.enable = true; { services.xserver.enable = true;
services.xserver.displayManager.gdm.enable = true; services.xserver.displayManager.gdm.enable = true;
services.xserver.desktopManager.gnome3.enable = true; services.xserver.desktopManager.gnome.enable = true;
}); });
pantheon = makeClosure ({ ... }: pantheon = makeClosure ({ ... }:

4
nixos/tests/all-tests.nix
View File

@ -139,8 +139,8 @@ in
gitolite = handleTest ./gitolite.nix {}; gitolite = handleTest ./gitolite.nix {};
gitolite-fcgiwrap = handleTest ./gitolite-fcgiwrap.nix {}; gitolite-fcgiwrap = handleTest ./gitolite-fcgiwrap.nix {};
glusterfs = handleTest ./glusterfs.nix {}; glusterfs = handleTest ./glusterfs.nix {};
gnome3 = handleTest ./gnome3.nix {}; gnome = handleTest ./gnome.nix {};
gnome3-xorg = handleTest ./gnome3-xorg.nix {}; gnome-xorg = handleTest ./gnome-xorg.nix {};
go-neb = handleTest ./go-neb.nix {}; go-neb = handleTest ./go-neb.nix {};
gobgpd = handleTest ./gobgpd.nix {}; gobgpd = handleTest ./gobgpd.nix {};
gocd-agent = handleTest ./gocd-agent.nix {}; gocd-agent = handleTest ./gocd-agent.nix {};

1
nixos/tests/fontconfig-default-fonts.nix
View File

@ -4,7 +4,6 @@ import ./make-test-python.nix ({ lib, ... }:
meta.maintainers = with lib.maintainers; [ meta.maintainers = with lib.maintainers; [
jtojnar jtojnar
worldofpeace
]; ];
machine = { config, pkgs, ... }: { machine = { config, pkgs, ... }: {

6
nixos/tests/gnome3-xorg.nix → nixos/tests/gnome-xorg.nix
View File

@ -1,5 +1,5 @@
import ./make-test-python.nix ({ pkgs, lib, ...} : { import ./make-test-python.nix ({ pkgs, lib, ...} : {
name = "gnome3-xorg"; name = "gnome-xorg";
meta = with lib; { meta = with lib; {
maintainers = teams.gnome.members; maintainers = teams.gnome.members;
}; };
@ -21,8 +21,8 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
}; };
}; };
services.xserver.desktopManager.gnome3.enable = true; services.xserver.desktopManager.gnome.enable = true;
services.xserver.desktopManager.gnome3.debug = true; services.xserver.desktopManager.gnome.debug = true;
services.xserver.displayManager.defaultSession = "gnome-xorg"; services.xserver.displayManager.defaultSession = "gnome-xorg";
virtualisation.memorySize = 1024; virtualisation.memorySize = 1024;

8
nixos/tests/gnome3.nix → nixos/tests/gnome.nix
View File

@ -1,5 +1,5 @@
import ./make-test-python.nix ({ pkgs, lib, ...} : { import ./make-test-python.nix ({ pkgs, lib, ...} : {
name = "gnome3"; name = "gnome";
meta = with lib; { meta = with lib; {
maintainers = teams.gnome.members; maintainers = teams.gnome.members;
}; };
@ -20,13 +20,13 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
}; };
}; };
services.xserver.desktopManager.gnome3.enable = true; services.xserver.desktopManager.gnome.enable = true;
services.xserver.desktopManager.gnome3.debug = true; services.xserver.desktopManager.gnome.debug = true;
environment.systemPackages = [ environment.systemPackages = [
(pkgs.makeAutostartItem { (pkgs.makeAutostartItem {
name = "org.gnome.Terminal"; name = "org.gnome.Terminal";
package = pkgs.gnome3.gnome-terminal; package = pkgs.gnome.gnome-terminal;
}) })
]; ];

2
nixos/tests/installed-tests/gnome-photos.nix
View File

@ -7,7 +7,7 @@ makeInstalledTest {
testConfig = { testConfig = {
programs.dconf.enable = true; programs.dconf.enable = true;
services.gnome3.at-spi2-core.enable = true; # needed for dogtail services.gnome.at-spi2-core.enable = true; # needed for dogtail
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# gsettings tool with access to gsettings-desktop-schemas # gsettings tool with access to gsettings-desktop-schemas
(stdenv.mkDerivation { (stdenv.mkDerivation {

2
nixos/tests/installed-tests/libgdata.nix
View File

@ -6,6 +6,6 @@ makeInstalledTest {
testConfig = { testConfig = {
# # GLib-GIO-DEBUG: _g_io_module_get_default: Found default implementation dummy (GDummyTlsBackend) for ‘gio-tls-backend’ # # GLib-GIO-DEBUG: _g_io_module_get_default: Found default implementation dummy (GDummyTlsBackend) for ‘gio-tls-backend’
# Bail out! libgdata:ERROR:../gdata/tests/common.c:134:gdata_test_init: assertion failed (child_error == NULL): TLS support is not available (g-tls-error-quark, 0) # Bail out! libgdata:ERROR:../gdata/tests/common.c:134:gdata_test_init: assertion failed (child_error == NULL): TLS support is not available (g-tls-error-quark, 0)
services.gnome3.glib-networking.enable = true; services.gnome.glib-networking.enable = true;
}; };
} }

2
nixos/tests/lightdm.nix
View File

@ -1,7 +1,7 @@
import ./make-test-python.nix ({ pkgs, ...} : { import ./make-test-python.nix ({ pkgs, ...} : {
name = "lightdm"; name = "lightdm";
meta = with pkgs.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ aszlig worldofpeace ]; maintainers = [ aszlig ];
}; };
machine = { ... }: { machine = { ... }: {

4
nixos/tests/nixos-generate-config.nix
View File

@ -14,7 +14,7 @@ import ./make-test-python.nix ({ lib, ... } : {
system.nixos-generate-config.desktopConfiguration = ['' system.nixos-generate-config.desktopConfiguration = [''
# DESKTOP # DESKTOP
services.xserver.displayManager.gdm.enable = true; services.xserver.displayManager.gdm.enable = true;
services.xserver.desktopManager.gnome3.enable = true; services.xserver.desktopManager.gnome.enable = true;
'']; ''];
}; };
testScript = '' testScript = ''
@ -35,7 +35,7 @@ import ./make-test-python.nix ({ lib, ... } : {
# Test if the Perl variable $desktopConfiguration is spliced correctly # Test if the Perl variable $desktopConfiguration is spliced correctly
machine.succeed( machine.succeed(
"grep 'services\\.xserver\\.desktopManager\\.gnome3\\.enable = true;' /etc/nixos/configuration.nix" "grep 'services\\.xserver\\.desktopManager\\.gnome\\.enable = true;' /etc/nixos/configuration.nix"
) )
''; '';
}) })

2
nixos/tests/plotinus.nix
View File

@ -9,7 +9,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
{ imports = [ ./common/x11.nix ]; { imports = [ ./common/x11.nix ];
programs.plotinus.enable = true; programs.plotinus.enable = true;
environment.systemPackages = [ pkgs.gnome3.gnome-calculator pkgs.xdotool ]; environment.systemPackages = [ pkgs.gnome.gnome-calculator pkgs.xdotool ];
}; };
testScript = '' testScript = ''

4
pkgs/applications/accessibility/mousetweaks/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config { lib, stdenv, fetchurl, pkg-config
, glib, gtk3, gnome3, gsettings-desktop-schemas, wrapGAppsHook , glib, gtk3, gnome, gsettings-desktop-schemas, wrapGAppsHook
, libX11, libXtst, libXfixes, libXcursor , libX11, libXtst, libXfixes, libXcursor
}: }:
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
]; ];
passthru = { passthru = {
updateScript = gnome3.updateScript { updateScript = gnome.updateScript {
packageName = pname; packageName = pname;
}; };
}; };

4
pkgs/applications/accessibility/squeekboard/default.nix
View File

@ -4,7 +4,7 @@
, meson , meson
, ninja , ninja
, pkg-config , pkg-config
, gnome3 , gnome
, glib , glib
, gtk3 , gtk3
, wayland , wayland
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gtk3 gtk3
gnome3.gnome-desktop gnome.gnome-desktop
wayland wayland
wayland-protocols wayland-protocols
libxml2 libxml2

2
pkgs/applications/audio/cadence/default.nix
View File

@ -98,7 +98,7 @@ mkDerivation rec {
homepage = "https://github.com/falkTX/Cadence/"; homepage = "https://github.com/falkTX/Cadence/";
description = "Collection of tools useful for audio production"; description = "Collection of tools useful for audio production";
license = lib.licenses.gpl2Plus; license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ worldofpeace ]; maintainers = with lib.maintainers; [ ];
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
}; };
} }

4
pkgs/applications/audio/cozy-audiobooks/default.nix
View File

@ -12,7 +12,7 @@
, file , file
, cairo , cairo
, gettext , gettext
, gnome3 , gnome
}: }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
@ -46,7 +46,7 @@ python3Packages.buildPythonApplication rec {
gtk3 gtk3
cairo cairo
gettext gettext
gnome3.adwaita-icon-theme gnome.adwaita-icon-theme
] ++ (with gst_all_1; [ ] ++ (with gst_all_1; [
gstreamer gstreamer
gst-plugins-good gst-plugins-good

6
pkgs/applications/audio/easytag/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, pkg-config, intltool, gtk3, glib, libid3tag, id3lib, taglib { lib, stdenv, fetchurl, pkg-config, intltool, gtk3, glib, libid3tag, id3lib, taglib
, libvorbis, libogg, opusfile, flac, itstool, libxml2, gsettings-desktop-schemas , libvorbis, libogg, opusfile, flac, itstool, libxml2, gsettings-desktop-schemas
, gnome3, wrapGAppsHook , gnome, wrapGAppsHook
}: }:
let let
@ -19,13 +19,13 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config intltool itstool libxml2 wrapGAppsHook ]; nativeBuildInputs = [ pkg-config intltool itstool libxml2 wrapGAppsHook ];
buildInputs = [ buildInputs = [
gtk3 glib libid3tag id3lib taglib libvorbis libogg opusfile flac 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 doCheck = false; # fails 1 out of 9 tests
passthru = { passthru = {
updateScript = gnome3.updateScript { updateScript = gnome.updateScript {
packageName = pname; packageName = pname;
versionPolicy = "none"; versionPolicy = "none";
}; };

4
pkgs/applications/audio/gpodder/default.nix
View File

@ -1,5 +1,5 @@
{ lib, fetchFromGitHub, python3, python3Packages, intltool { lib, fetchFromGitHub, python3, python3Packages, intltool
, glibcLocales, gnome3, gtk3, wrapGAppsHook , glibcLocales, gnome, gtk3, wrapGAppsHook
, gobject-introspection , gobject-introspection
}: }:
@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec {
buildInputs = [ buildInputs = [
python3 python3
gobject-introspection gobject-introspection
gnome3.adwaita-icon-theme gnome.adwaita-icon-theme
]; ];
checkInputs = with python3Packages; [ checkInputs = with python3Packages; [

4
pkgs/applications/audio/gtkpod/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, wrapGAppsHook, intltool, libgpod, curl, flac, { 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 }: libvorbis, gdk-pixbuf }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
curl gettext curl gettext
flex libgpod libid3tag flac libvorbis gtk3 gdk-pixbuf 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 ]); ] ++ (with perlPackages; [ perl XMLParser ]);
patchPhase = '' patchPhase = ''

4
pkgs/applications/audio/guitarix/default.nix
View File

@ -10,7 +10,7 @@
, glib , glib
, glib-networking , glib-networking
, glibmm , glibmm
, gnome3 , gnome
, gsettings-desktop-schemas , gsettings-desktop-schemas
, gtk3 , gtk3
, gtkmm3 , gtkmm3
@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
glib glib
glib-networking.out glib-networking.out
glibmm glibmm
gnome3.adwaita-icon-theme gnome.adwaita-icon-theme
gsettings-desktop-schemas gsettings-desktop-schemas
gtk3 gtk3
gtkmm3 gtkmm3

6
pkgs/applications/audio/helio-workstation/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub { lib, stdenv, fetchFromGitHub
, alsaLib, freetype, xorg, curl, libGL, libjack2, gnome3 , alsaLib, freetype, xorg, curl, libGL, libjack2, gnome
, pkg-config, makeWrapper , pkg-config, makeWrapper
}: }:
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
alsaLib freetype xorg.libX11 xorg.libXext xorg.libXinerama xorg.libXrandr 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 ]; nativeBuildInputs = [ pkg-config makeWrapper ];
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
install -Dm755 build/Helio $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 mkdir -p $out/share
cp -r ../Deployment/Linux/Debian/x64/usr/share/* $out/share cp -r ../Deployment/Linux/Debian/x64/usr/share/* $out/share

2
pkgs/applications/audio/kapitonov-plugins-pack/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, faust, meson, ninja, pkg-config { 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 , zita-convolver, zita-resampler
}: }:

2
pkgs/applications/audio/lollypop/default.nix
View File

@ -106,7 +106,7 @@ python3.pkgs.buildPythonApplication rec {
description = "A modern music player for GNOME"; description = "A modern music player for GNOME";
homepage = "https://wiki.gnome.org/Apps/Lollypop"; homepage = "https://wiki.gnome.org/Apps/Lollypop";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ worldofpeace lovesegfault ]; maintainers = with maintainers; [ lovesegfault ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

59
pkgs/applications/audio/miniaudicle/default.nix Normal file
View File

@ -0,0 +1,59 @@
{ lib
, stdenv
, fetchurl
, bison
, flex
, which
, alsaLib
, libsndfile
, qt4
, qscintilla
, libpulseaudio
, libjack2
, audioBackend ? "pulse" # "pulse", "alsa", or "jack"
}:
stdenv.mkDerivation rec {
pname = "miniaudicle";
version = "1.3.5.2";
src = fetchurl {
url = "https://audicle.cs.princeton.edu/mini/release/files/miniAudicle-${version}.tgz";
hash = "sha256-dakDz69uHbKZFj8z67CubmRXEQ5X6GuYqlCXXvLzqSI=";
};
sourceRoot = "miniAudicle-${version}/src";
postPatch = ''
substituteInPlace miniAudicle.pro \
--replace "/usr/local" $out
'';
nativeBuildInputs = [
bison
flex
which
];
buildInputs = [
alsaLib
libsndfile
qt4
qscintilla
] ++ lib.optional (audioBackend == "pulse") libpulseaudio
++ lib.optional (audioBackend == "jack") libjack2;
buildFlags = [ "linux-${audioBackend}" ];
makeFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
description = "A light-weight integrated development environment for the ChucK digital audio programming language";
homepage = "https://audicle.cs.princeton.edu/mini/";
downloadPage = "https://audicle.cs.princeton.edu/mini/linux/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ fgaz ];
platforms = platforms.all;
broken = stdenv.isDarwin; # not attempted
};
}

4
pkgs/applications/audio/pavucontrol/default.nix
View File

@ -1,5 +1,5 @@
{ fetchurl, fetchpatch, lib, stdenv, pkg-config, intltool, libpulseaudio, { fetchurl, fetchpatch, lib, stdenv, pkg-config, intltool, libpulseaudio,
gtkmm3 , libcanberra-gtk3, gnome3, wrapGAppsHook }: gtkmm3 , libcanberra-gtk3, gnome, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pavucontrol"; pname = "pavucontrol";
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
})]; })];
buildInputs = [ libpulseaudio gtkmm3 libcanberra-gtk3 buildInputs = [ libpulseaudio gtkmm3 libcanberra-gtk3
gnome3.adwaita-icon-theme ]; gnome.adwaita-icon-theme ];
nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ]; nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ];

4
pkgs/applications/audio/pithos/default.nix
View File

@ -1,5 +1,5 @@
{ lib, fetchFromGitHub, meson, ninja, pkg-config, appstream-glib { 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 }: , libnotify, libsecret, gst_all_1 }:
pythonPackages.buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
@ -23,7 +23,7 @@ pythonPackages.buildPythonApplication rec {
nativeBuildInputs = [ meson ninja pkg-config appstream-glib wrapGAppsHook ]; nativeBuildInputs = [ meson ninja pkg-config appstream-glib wrapGAppsHook ];
propagatedBuildInputs = 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 gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad ]) ++
(with pythonPackages; [ pygobject3 pylast ]); (with pythonPackages; [ pygobject3 pylast ]);

4
pkgs/applications/audio/quodlibet/default.nix
View File

@ -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, tag ? "", xvfb_run, dbus, glibcLocales, glib, glib-networking, gobject-introspection, hicolor-icon-theme,
gst_all_1, withGstPlugins ? true, gst_all_1, withGstPlugins ? true,
xineBackend ? false, xine-lib, 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 ]); 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; ++ (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 ]); [ gstreamer gst-plugins-base ] ++ optionals withGstPlugins [ gst-plugins-good gst-plugins-ugly gst-plugins-bad ]);

6
pkgs/applications/audio/rhythmbox/default.nix
View File

@ -6,7 +6,7 @@
, intltool , intltool
, libpeas , libpeas
, libsoup , libsoup
, gnome3 , gnome
, totem-pl-parser , totem-pl-parser
, tdb , tdb
, json-glib , json-glib
@ -42,7 +42,7 @@ in stdenv.mkDerivation rec {
gtk3 gtk3
libpeas libpeas
totem-pl-parser totem-pl-parser
gnome3.adwaita-icon-theme gnome.adwaita-icon-theme
gst_all_1.gstreamer gst_all_1.gstreamer
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-base
@ -51,7 +51,7 @@ in stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
passthru = { passthru = {
updateScript = gnome3.updateScript { updateScript = gnome.updateScript {
packageName = pname; packageName = pname;
versionPolicy = "none"; versionPolicy = "none";
}; };

6
pkgs/applications/audio/sfizz/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub { lib, stdenv, fetchFromGitHub
, libjack2, libsndfile, xorg, freetype, libxkbcommon , libjack2, libsndfile, xorg, freetype, libxkbcommon
, cairo, glib, gnome3, flac, libogg, libvorbis, libopus , cairo, glib, gnome, flac, libogg, libvorbis, libopus
, cmake, pkg-config , cmake, pkg-config
}: }:
@ -35,14 +35,14 @@ stdenv.mkDerivation rec {
libxkbcommon libxkbcommon
cairo cairo
glib glib
gnome3.zenity gnome.zenity
freetype freetype
]; ];
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];
postPatch = '' postPatch = ''
substituteInPlace editor/external/vstgui4/vstgui/lib/platform/linux/x11fileselector.cpp \ 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 = [ cmakeFlags = [

4
pkgs/applications/audio/sonata/default.nix
View File

@ -1,5 +1,5 @@
{ lib, fetchFromGitHub, wrapGAppsHook, gettext { 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 let
inherit (python3Packages) buildPythonApplication isPy3k dbus-python pygobject3 mpd2 setuptools; inherit (python3Packages) buildPythonApplication isPy3k dbus-python pygobject3 mpd2 setuptools;
@ -24,7 +24,7 @@ in buildPythonApplication rec {
buildInputs = [ buildInputs = [
glib glib
gnome3.adwaita-icon-theme gnome.adwaita-icon-theme
gsettings-desktop-schemas gsettings-desktop-schemas
gtk3 gtk3
gdk-pixbuf gdk-pixbuf

6
pkgs/applications/audio/sound-juicer/default.nix
View File

@ -10,7 +10,7 @@
, libxml2 , libxml2
, brasero , brasero
, libcanberra-gtk3 , libcanberra-gtk3
, gnome3 , gnome
, gst_all_1 , gst_all_1
, libmusicbrainz5 , libmusicbrainz5
, libdiscid , libdiscid
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
gtk3 gtk3
brasero brasero
libcanberra-gtk3 libcanberra-gtk3
gnome3.adwaita-icon-theme gnome.adwaita-icon-theme
gsettings-desktop-schemas gsettings-desktop-schemas
libmusicbrainz5 libmusicbrainz5
libdiscid libdiscid
@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
]; ];
passthru = { passthru = {
updateScript = gnome3.updateScript { updateScript = gnome.updateScript {
packageName = pname; packageName = pname;
}; };
}; };

4
pkgs/applications/audio/spotify/default.nix
View File

@ -1,6 +1,6 @@
{ fetchurl, lib, stdenv, squashfsTools, xorg, alsaLib, makeWrapper, openssl, freetype { fetchurl, lib, stdenv, squashfsTools, xorg, alsaLib, makeWrapper, openssl, freetype
, glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss, libpng, libnotify , 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 , at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon
}: }:
@ -139,7 +139,7 @@ stdenv.mkDerivation {
librarypath="${lib.makeLibraryPath deps}:$libdir" librarypath="${lib.makeLibraryPath deps}:$libdir"
wrapProgram $out/share/spotify/spotify \ wrapProgram $out/share/spotify/spotify \
--prefix LD_LIBRARY_PATH : "$librarypath" \ --prefix LD_LIBRARY_PATH : "$librarypath" \
--prefix PATH : "${gnome3.zenity}/bin" --prefix PATH : "${gnome.zenity}/bin"
# fix Icon line in the desktop file (#48062) # fix Icon line in the desktop file (#48062)
sed -i "s:^Icon=.*:Icon=spotify-client:" "$out/share/spotify/spotify.desktop" sed -i "s:^Icon=.*:Icon=spotify-client:" "$out/share/spotify/spotify.desktop"

2
pkgs/applications/audio/vocal/default.nix
View File

@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
''; '';
homepage = "https://github.com/needle-and-thread/vocal"; homepage = "https://github.com/needle-and-thread/vocal";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ worldofpeace ]; maintainers = with maintainers; [ ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

6
pkgs/applications/display-managers/lightdm/default.nix
View File

@ -20,7 +20,7 @@
, polkit , polkit
, accountsservice , accountsservice
, gtk-doc , gtk-doc
, gnome3 , gnome
, gobject-introspection , gobject-introspection
, vala , vala
, fetchpatch , fetchpatch
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
autoconf autoconf
automake automake
yelp-tools yelp-tools
gnome3.yelp-xsl gnome.yelp-xsl
gobject-introspection gobject-introspection
gtk-doc gtk-doc
intltool intltool
@ -142,6 +142,6 @@ stdenv.mkDerivation rec {
description = "A cross-desktop display manager"; description = "A cross-desktop display manager";
platforms = platforms.linux; platforms = platforms.linux;
license = licenses.gpl3; license = licenses.gpl3;
maintainers = with maintainers; [ worldofpeace ]; maintainers = with maintainers; [ ];
}; };
} }

4
pkgs/applications/editors/apostrophe/default.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitLab, meson, ninja, cmake { lib, stdenv, fetchFromGitLab, meson, ninja, cmake
, wrapGAppsHook, pkg-config, desktop-file-utils , wrapGAppsHook, pkg-config, desktop-file-utils
, appstream-glib, pythonPackages, glib, gobject-introspection , appstream-glib, pythonPackages, glib, gobject-introspection
, gtk3, webkitgtk, glib-networking, gnome3, gspell, texlive , gtk3, webkitgtk, glib-networking, gnome, gspell, texlive
, shared-mime-info, libhandy , shared-mime-info, libhandy
}: }:
@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
appstream-glib wrapGAppsHook ]; appstream-glib wrapGAppsHook ];
buildInputs = [ glib pythonEnv gobject-introspection gtk3 buildInputs = [ glib pythonEnv gobject-introspection gtk3
gnome3.adwaita-icon-theme webkitgtk gspell texlive gnome.adwaita-icon-theme webkitgtk gspell texlive
glib-networking libhandy ]; glib-networking libhandy ];
postPatch = '' postPatch = ''

4
pkgs/applications/editors/bluefish/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, intltool, wrapGAppsHook, pkg-config , gtk, libxml2 { lib, stdenv, fetchurl, intltool, wrapGAppsHook, pkg-config , gtk, libxml2
, enchant, gucharmap, python3, gnome3 , enchant, gucharmap, python3, gnome
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ intltool pkg-config wrapGAppsHook ]; nativeBuildInputs = [ intltool pkg-config wrapGAppsHook ];
buildInputs = [ gnome3.adwaita-icon-theme gtk libxml2 buildInputs = [ gnome.adwaita-icon-theme gtk libxml2
enchant gucharmap python3 ]; enchant gucharmap python3 ];
meta = with lib; { meta = with lib; {

6
pkgs/applications/editors/gnome-builder/default.nix
View File

@ -6,7 +6,7 @@
, docbook_xml_dtd_43 , docbook_xml_dtd_43
, fetchurl , fetchurl
, flatpak , flatpak
, gnome3 , gnome
, libgit2-glib , libgit2-glib
, gobject-introspection , gobject-introspection
, glade , glade
@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
ctags ctags
flatpak flatpak
gnome3.devhelp gnome.devhelp
glade glade
libgit2-glib libgit2-glib
libpeas libpeas
@ -134,7 +134,7 @@ stdenv.mkDerivation rec {
done done
''; '';
passthru.updateScript = gnome3.updateScript { passthru.updateScript = gnome.updateScript {
packageName = pname; packageName = pname;
versionPolicy = "odd-unstable"; versionPolicy = "odd-unstable";
}; };

6
pkgs/applications/editors/gnome-latex/default.nix
View File

@ -13,7 +13,7 @@
, libgee , libgee
, tepl , tepl
, amtk , amtk
, gnome3 , gnome
, glib , glib
, pkg-config , pkg-config
, intltool , intltool
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
amtk amtk
gnome3.adwaita-icon-theme gnome.adwaita-icon-theme
glib glib
gsettings-desktop-schemas gsettings-desktop-schemas
gspell gspell
@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
passthru.updateScript = gnome3.updateScript { passthru.updateScript = gnome.updateScript {
packageName = pname; packageName = pname;
versionPolicy = "odd-unstable"; versionPolicy = "odd-unstable";
}; };

2
pkgs/applications/editors/gobby/default.nix
View File

@ -1,6 +1,6 @@
{ avahiSupport ? false # build support for Avahi in libinfinity { avahiSupport ? false # build support for Avahi in libinfinity
, lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, wrapGAppsHook, yelp-tools , 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 let
libinf = libinfinity.override { gtkWidgets = true; inherit avahiSupport; }; libinf = libinfinity.override { gtkWidgets = true; inherit avahiSupport; };

4
pkgs/applications/graphics/avocode/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, makeDesktopItem, fetchurl, unzip { 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 , xorg, mozjpeg, makeWrapper, wrapGAppsHook, libuuid, at-spi2-core, libdrm, mesa
}: }:
@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [makeWrapper wrapGAppsHook unzip]; 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 # src is producing multiple folder on unzip so we must
# override unpackCmd to extract it into newly created folder # override unpackCmd to extract it into newly created folder

4
pkgs/applications/graphics/darktable/default.nix
View File

@ -2,7 +2,7 @@
, cairo, cmake, ninja, curl, perl, llvm, desktop-file-utils, exiv2, glib , cairo, cmake, ninja, curl, perl, llvm, desktop-file-utils, exiv2, glib
, ilmbase, gtk3, intltool, lcms2, lensfun, libX11, libexif, libgphoto2, libjpeg , ilmbase, gtk3, intltool, lcms2, lensfun, libX11, libexif, libgphoto2, libjpeg
, libpng, librsvg, libtiff, openexr, osm-gps-map, pkg-config, sqlite, libxslt , 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 , ocl-icd, pcre, gtk-mac-integration, isocodes, llvmPackages
}: }:
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
cairo curl exiv2 glib gtk3 ilmbase lcms2 lensfun libexif cairo curl exiv2 glib gtk3 ilmbase lcms2 lensfun libexif
libgphoto2 libjpeg libpng librsvg libtiff openexr sqlite libxslt libgphoto2 libjpeg libpng librsvg libtiff openexr sqlite libxslt
libsoup graphicsmagick json-glib openjpeg lua pugixml 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 [ ] ++ lib.optionals stdenv.isLinux [
colord colord-gtk libX11 ocl-icd colord colord-gtk libX11 ocl-icd
] ++ lib.optional stdenv.isDarwin gtk-mac-integration ] ++ lib.optional stdenv.isDarwin gtk-mac-integration

2
pkgs/applications/graphics/fondo/default.nix
View File

@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
description = "Find the most beautiful wallpapers for your desktop"; description = "Find the most beautiful wallpapers for your desktop";
homepage = "https://github.com/calo001/fondo"; homepage = "https://github.com/calo001/fondo";
license = licenses.agpl3Plus; license = licenses.agpl3Plus;
maintainers = with maintainers; [ worldofpeace ]; maintainers = with maintainers; [ ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

4
pkgs/applications/graphics/gimp/wrapper.nix
View File

@ -1,4 +1,4 @@
{ lib, symlinkJoin, gimp, makeWrapper, gimpPlugins, gnome3, plugins ? null}: { lib, symlinkJoin, gimp, makeWrapper, gimpPlugins, gnome, plugins ? null}:
let let
allPlugins = lib.filter (pkg: lib.isDerivation pkg && !pkg.meta.broken or false) (lib.attrValues gimpPlugins); 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 \ wrapProgram $out/bin/$each \
--set GIMP2_PLUGINDIR "$out/lib/gimp/2.0" \ --set GIMP2_PLUGINDIR "$out/lib/gimp/2.0" \
--set GIMP2_DATADIR "$out/share/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} ${toString extraArgs}
done done
set +x set +x

Some files were not shown because too many files have changed in this diff Show More