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

tree-wide: autorename gnome packages to use dashes

Browse Source
This commit is contained in:
Jan Tojnar 2018-02-25 03:23:58 +01:00
parent 20c5476a8b
commit a31d98f312
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
491 changed files with 1532 additions and 1458 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nixos/modules/config/no-x-libs.nix
View File

@ -28,13 +28,13 @@ with lib;
nixpkgs.config.packageOverrides = pkgs: { nixpkgs.config.packageOverrides = pkgs: {
dbus = pkgs.dbus.override { x11Support = false; }; dbus = pkgs.dbus.override { x11Support = false; };
networkmanager_fortisslvpn = pkgs.networkmanager_fortisslvpn.override { withGnome = false; }; networkmanager-fortisslvpn = pkgs.networkmanager-fortisslvpn.override { withGnome = false; };
networkmanager_l2tp = pkgs.networkmanager_l2tp.override { withGnome = false; }; networkmanager-l2tp = pkgs.networkmanager-l2tp.override { withGnome = false; };
networkmanager_openconnect = pkgs.networkmanager_openconnect.override { withGnome = false; }; networkmanager-openconnect = pkgs.networkmanager-openconnect.override { withGnome = false; };
networkmanager_openvpn = pkgs.networkmanager_openvpn.override { withGnome = false; }; networkmanager-openvpn = pkgs.networkmanager-openvpn.override { withGnome = false; };
networkmanager_pptp = pkgs.networkmanager_pptp.override { withGnome = false; }; networkmanager-pptp = pkgs.networkmanager-pptp.override { withGnome = false; };
networkmanager_vpnc = pkgs.networkmanager_vpnc.override { withGnome = false; }; networkmanager-vpnc = pkgs.networkmanager-vpnc.override { withGnome = false; };
networkmanager_iodine = pkgs.networkmanager_iodine.override { withGnome = false; }; networkmanager-iodine = pkgs.networkmanager-iodine.override { withGnome = false; };
pinentry = pkgs.pinentry_ncurses; pinentry = pkgs.pinentry_ncurses;
}; };
}; };

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

@ -69,7 +69,7 @@ with lib;
in '' in ''
mkdir -p /root/Desktop mkdir -p /root/Desktop
ln -sfT ${desktopFile} /root/Desktop/nixos-manual.desktop ln -sfT ${desktopFile} /root/Desktop/nixos-manual.desktop
cp ${pkgs.gnome3.gnome_terminal}/share/applications/gnome-terminal.desktop /root/Desktop/gnome-terminal.desktop cp ${pkgs.gnome3.gnome-terminal}/share/applications/gnome-terminal.desktop /root/Desktop/gnome-terminal.desktop
chmod a+rx /root/Desktop/gnome-terminal.desktop chmod a+rx /root/Desktop/gnome-terminal.desktop
cp ${pkgs.gparted}/share/applications/gparted.desktop /root/Desktop/gparted.desktop cp ${pkgs.gparted}/share/applications/gparted.desktop /root/Desktop/gparted.desktop
chmod a+rx /root/Desktop/gparted.desktop chmod a+rx /root/Desktop/gparted.desktop

2
nixos/modules/programs/dconf.nix
View File

@ -36,7 +36,7 @@ in
"${pkgs.gnome3.dconf.lib}/lib/gio/modules"; "${pkgs.gnome3.dconf.lib}/lib/gio/modules";
# https://github.com/NixOS/nixpkgs/pull/31891 # https://github.com/NixOS/nixpkgs/pull/31891
#environment.variables.XDG_DATA_DIRS = optional cfg.enable #environment.variables.XDG_DATA_DIRS = optional cfg.enable
# "$(echo ${pkgs.gnome3.gsettings_desktop_schemas}/share/gsettings-schemas/gsettings-desktop-schemas-*)"; # "$(echo ${pkgs.gnome3.gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas-*)";
}; };
} }

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

@ -311,7 +311,7 @@ let
("auth optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" + ("auth optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" +
" kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")} " kwalletd=${pkgs.libsForQt5.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.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so")}
${optionalString cfg.googleAuthenticator.enable ${optionalString cfg.googleAuthenticator.enable
"auth required ${pkgs.googleAuthenticator}/lib/security/pam_google_authenticator.so no_increment_hotp"} "auth required ${pkgs.googleAuthenticator}/lib/security/pam_google_authenticator.so no_increment_hotp"}
'') + '' '') + ''
@ -384,7 +384,7 @@ let
("session optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" + ("session optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" +
" kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")} " kwalletd=${pkgs.libsForQt5.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.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start"}
${optionalString (config.virtualisation.lxc.lxcfs.enable) ${optionalString (config.virtualisation.lxc.lxcfs.enable)
"session optional ${pkgs.lxcfs}/lib/security/pam_cgfs.so -c freezer,memory,name=systemd,unified,cpuset"} "session optional ${pkgs.lxcfs}/lib/security/pam_cgfs.so -c freezer,memory,name=systemd,unified,cpuset"}
''); '');

6
nixos/modules/services/desktops/gnome3/at-spi2-core.nix
View File

@ -30,9 +30,9 @@ with lib;
config = mkMerge [ config = mkMerge [
(mkIf config.services.gnome3.at-spi2-core.enable { (mkIf config.services.gnome3.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.gnome3.at-spi2-core.enable) {

6
nixos/modules/services/desktops/gnome3/evolution-data-server.nix
View File

@ -30,11 +30,11 @@ with lib;
config = mkIf config.services.gnome3.evolution-data-server.enable { config = mkIf config.services.gnome3.evolution-data-server.enable {
environment.systemPackages = [ pkgs.gnome3.evolution_data_server ]; environment.systemPackages = [ pkgs.gnome3.evolution-data-server ];
services.dbus.packages = [ pkgs.gnome3.evolution_data_server ]; services.dbus.packages = [ pkgs.gnome3.evolution-data-server ];
systemd.packages = [ pkgs.gnome3.evolution_data_server ]; systemd.packages = [ pkgs.gnome3.evolution-data-server ];
}; };

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

@ -31,9 +31,9 @@ with lib;
config = mkIf config.services.gnome3.gnome-keyring.enable { config = mkIf config.services.gnome3.gnome-keyring.enable {
environment.systemPackages = [ pkgs.gnome3.gnome_keyring ]; environment.systemPackages = [ pkgs.gnome3.gnome-keyring ];
services.dbus.packages = [ pkgs.gnome3.gnome_keyring pkgs.gnome3.gcr ]; services.dbus.packages = [ pkgs.gnome3.gnome-keyring pkgs.gnome3.gcr ];
}; };

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

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

6
nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix
View File

@ -30,11 +30,11 @@ with lib;
config = mkIf config.services.gnome3.gnome-terminal-server.enable { config = mkIf config.services.gnome3.gnome-terminal-server.enable {
environment.systemPackages = [ pkgs.gnome3.gnome_terminal ]; environment.systemPackages = [ pkgs.gnome3.gnome-terminal ];
services.dbus.packages = [ pkgs.gnome3.gnome_terminal ]; services.dbus.packages = [ pkgs.gnome3.gnome-terminal ];
systemd.packages = [ pkgs.gnome3.gnome_terminal ]; systemd.packages = [ pkgs.gnome3.gnome-terminal ];
}; };

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

@ -30,9 +30,9 @@ with lib;
config = mkIf config.services.telepathy.enable { config = mkIf config.services.telepathy.enable {
environment.systemPackages = [ pkgs.telepathy_mission_control ]; environment.systemPackages = [ pkgs.telepathy-mission-control ];
services.dbus.packages = [ pkgs.telepathy_mission_control ]; services.dbus.packages = [ pkgs.telepathy-mission-control ];
}; };

22
nixos/modules/services/networking/networkmanager.nix
View File

@ -133,10 +133,10 @@ in {
basePackages = mkOption { basePackages = mkOption {
type = types.attrsOf types.package; type = types.attrsOf types.package;
default = { inherit networkmanager modemmanager wpa_supplicant default = { inherit networkmanager modemmanager wpa_supplicant
networkmanager_openvpn networkmanager_vpnc networkmanager-openvpn networkmanager-vpnc
networkmanager_openconnect networkmanager_fortisslvpn networkmanager-openconnect networkmanager-fortisslvpn
networkmanager_pptp networkmanager_l2tp networkmanager-pptp networkmanager-l2tp
networkmanager_iodine; }; networkmanager-iodine; };
internal = true; internal = true;
}; };
@ -273,28 +273,28 @@ in {
{ source = configFile; { source = configFile;
target = "NetworkManager/NetworkManager.conf"; target = "NetworkManager/NetworkManager.conf";
} }
{ source = "${networkmanager_openvpn}/etc/NetworkManager/VPN/nm-openvpn-service.name"; { source = "${networkmanager-openvpn}/etc/NetworkManager/VPN/nm-openvpn-service.name";
target = "NetworkManager/VPN/nm-openvpn-service.name"; target = "NetworkManager/VPN/nm-openvpn-service.name";
} }
{ source = "${networkmanager_vpnc}/etc/NetworkManager/VPN/nm-vpnc-service.name"; { source = "${networkmanager-vpnc}/etc/NetworkManager/VPN/nm-vpnc-service.name";
target = "NetworkManager/VPN/nm-vpnc-service.name"; target = "NetworkManager/VPN/nm-vpnc-service.name";
} }
{ source = "${networkmanager_openconnect}/etc/NetworkManager/VPN/nm-openconnect-service.name"; { source = "${networkmanager-openconnect}/etc/NetworkManager/VPN/nm-openconnect-service.name";
target = "NetworkManager/VPN/nm-openconnect-service.name"; target = "NetworkManager/VPN/nm-openconnect-service.name";
} }
{ source = "${networkmanager_fortisslvpn}/etc/NetworkManager/VPN/nm-fortisslvpn-service.name"; { source = "${networkmanager-fortisslvpn}/etc/NetworkManager/VPN/nm-fortisslvpn-service.name";
target = "NetworkManager/VPN/nm-fortisslvpn-service.name"; target = "NetworkManager/VPN/nm-fortisslvpn-service.name";
} }
{ source = "${networkmanager_pptp}/etc/NetworkManager/VPN/nm-pptp-service.name"; { source = "${networkmanager-pptp}/etc/NetworkManager/VPN/nm-pptp-service.name";
target = "NetworkManager/VPN/nm-pptp-service.name"; target = "NetworkManager/VPN/nm-pptp-service.name";
} }
{ source = "${networkmanager_l2tp}/etc/NetworkManager/VPN/nm-l2tp-service.name"; { source = "${networkmanager-l2tp}/etc/NetworkManager/VPN/nm-l2tp-service.name";
target = "NetworkManager/VPN/nm-l2tp-service.name"; target = "NetworkManager/VPN/nm-l2tp-service.name";
} }
{ source = "${networkmanager_strongswan}/etc/NetworkManager/VPN/nm-strongswan-service.name"; { source = "${networkmanager_strongswan}/etc/NetworkManager/VPN/nm-strongswan-service.name";
target = "NetworkManager/VPN/nm-strongswan-service.name"; target = "NetworkManager/VPN/nm-strongswan-service.name";
} }
{ source = "${networkmanager_iodine}/etc/NetworkManager/VPN/nm-iodine-service.name"; { source = "${networkmanager-iodine}/etc/NetworkManager/VPN/nm-iodine-service.name";
target = "NetworkManager/VPN/nm-iodine-service.name"; target = "NetworkManager/VPN/nm-iodine-service.name";
} }
] ++ optional (cfg.appendNameservers == [] || cfg.insertNameservers == []) ] ++ optional (cfg.appendNameservers == [] || cfg.insertNameservers == [])

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

@ -33,7 +33,7 @@ in
pkgs.xorg.xauth # used by kdesu pkgs.xorg.xauth # used by kdesu
pkgs.gtk2 # To get GTK+'s themes. pkgs.gtk2 # To get GTK+'s themes.
pkgs.tango-icon-theme pkgs.tango-icon-theme
pkgs.shared_mime_info pkgs.shared-mime-info
pkgs.gnome2.gnomeicontheme pkgs.gnome2.gnomeicontheme
pkgs.xorg.xcursorthemes pkgs.xorg.xcursorthemes
]; ];

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

@ -27,7 +27,7 @@ let
nixos-gsettings-desktop-schemas = pkgs.runCommand "nixos-gsettings-desktop-schemas" {} nixos-gsettings-desktop-schemas = pkgs.runCommand "nixos-gsettings-desktop-schemas" {}
'' ''
mkdir -p $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas mkdir -p $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
cp -rf ${pkgs.gnome3.gsettings_desktop_schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas cp -rf ${pkgs.gnome3.gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
${concatMapStrings (pkg: "cp -rf ${pkg}/share/gsettings-schemas/*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas\n") cfg.extraGSettingsOverridePackages} ${concatMapStrings (pkg: "cp -rf ${pkg}/share/gsettings-schemas/*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas\n") cfg.extraGSettingsOverridePackages}
@ -60,7 +60,7 @@ in {
example = literalExample "[ pkgs.gnome3.gpaste ]"; example = literalExample "[ pkgs.gnome3.gpaste ]";
description = "Additional list of packages to be added to the session search path. description = "Additional list of packages to be added to the session search path.
Useful for gnome shell extensions or gsettings-conditionated autostart."; Useful for gnome shell extensions or gsettings-conditionated autostart.";
apply = list: list ++ [ pkgs.gnome3.gnome_shell pkgs.gnome3.gnome-shell-extensions ]; apply = list: list ++ [ pkgs.gnome3.gnome-shell pkgs.gnome3.gnome-shell-extensions ];
}; };
extraGSettingsOverrides = mkOption { extraGSettingsOverrides = mkOption {
@ -118,7 +118,7 @@ in {
services.packagekit.enable = mkDefault true; services.packagekit.enable = mkDefault true;
hardware.bluetooth.enable = mkDefault true; hardware.bluetooth.enable = mkDefault true;
services.xserver.libinput.enable = mkDefault true; # for controlling touchpad settings via gnome control center services.xserver.libinput.enable = mkDefault true; # for controlling touchpad settings via gnome control center
services.udev.packages = [ pkgs.gnome3.gnome_settings_daemon ]; services.udev.packages = [ pkgs.gnome3.gnome-settings-daemon ];
systemd.packages = [ pkgs.gnome3.vino ]; systemd.packages = [ pkgs.gnome3.vino ];
# If gnome3 is installed, build vim for gtk3 too. # If gnome3 is installed, build vim for gtk3 too.
@ -164,7 +164,7 @@ in {
# Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/ # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/
${pkgs.xdg-user-dirs}/bin/xdg-user-dirs-update ${pkgs.xdg-user-dirs}/bin/xdg-user-dirs-update
${pkgs.gnome3.gnome_session}/bin/gnome-session ${optionalString cfg.debug "--debug"} & ${pkgs.gnome3.gnome-session}/bin/gnome-session ${optionalString cfg.debug "--debug"} &
waitPID=$! waitPID=$!
''; '';
}; };
@ -172,7 +172,7 @@ in {
services.xserver.updateDbusEnvironment = true; services.xserver.updateDbusEnvironment = true;
environment.variables.GIO_EXTRA_MODULES = [ "${lib.getLib pkgs.gnome3.dconf}/lib/gio/modules" environment.variables.GIO_EXTRA_MODULES = [ "${lib.getLib pkgs.gnome3.dconf}/lib/gio/modules"
"${pkgs.gnome3.glib_networking.out}/lib/gio/modules" "${pkgs.gnome3.glib-networking.out}/lib/gio/modules"
"${pkgs.gnome3.gvfs}/lib/gio/modules" ]; "${pkgs.gnome3.gvfs}/lib/gio/modules" ];
environment.systemPackages = pkgs.gnome3.corePackages ++ cfg.sessionPath environment.systemPackages = pkgs.gnome3.corePackages ++ cfg.sessionPath
++ (removePackagesByName pkgs.gnome3.optionalPackages config.environment.gnome3.excludePackages); ++ (removePackagesByName pkgs.gnome3.optionalPackages config.environment.gnome3.excludePackages);
@ -180,10 +180,10 @@ in {
# Use the correct gnome3 packageSet # Use the correct gnome3 packageSet
networking.networkmanager.basePackages = networking.networkmanager.basePackages =
{ inherit (pkgs) networkmanager modemmanager wpa_supplicant; { inherit (pkgs) networkmanager modemmanager wpa_supplicant;
inherit (pkgs.gnome3) networkmanager_openvpn networkmanager_vpnc inherit (pkgs.gnome3) networkmanager-openvpn networkmanager-vpnc
networkmanager_openconnect networkmanager_fortisslvpn networkmanager-openconnect networkmanager-fortisslvpn
networkmanager_pptp networkmanager_iodine networkmanager-pptp networkmanager-iodine
networkmanager_l2tp; }; networkmanager-l2tp; };
# Needed for themes and backgrounds # Needed for themes and backgrounds
environment.pathsToLink = [ "/share" ]; environment.pathsToLink = [ "/share" ];

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

@ -102,7 +102,7 @@ in
services.dbus.packages = [ services.dbus.packages = [
pkgs.gnome3.dconf pkgs.gnome3.dconf
pkgs.at_spi2_core pkgs.at-spi2-core
]; ];
services.gnome3.gnome-keyring.enable = true; services.gnome3.gnome-keyring.enable = true;

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

@ -154,7 +154,7 @@ in
print-manager print-manager
breeze-icons breeze-icons
pkgs.hicolor_icon_theme pkgs.hicolor-icon-theme
kde-gtk-config breeze-gtk kde-gtk-config breeze-gtk

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

@ -61,12 +61,12 @@ in
# utilities-terminal, accessories-text-editor # utilities-terminal, accessories-text-editor
gnome3.defaultIconTheme gnome3.defaultIconTheme
hicolor_icon_theme hicolor-icon-theme
tango-icon-theme tango-icon-theme
xfce4-icon-theme xfce4-icon-theme
desktop_file_utils desktop-file-utils
shared_mime_info shared-mime-info
# Needed by Xfce's xinitrc script # Needed by Xfce's xinitrc script
# TODO: replace with command -v # TODO: replace with command -v

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

@ -133,7 +133,7 @@ in
StandardError = "inherit"; StandardError = "inherit";
}; };
systemd.services.display-manager.path = [ pkgs.gnome3.gnome_session ]; systemd.services.display-manager.path = [ pkgs.gnome3.gnome-session ];
services.dbus.packages = [ gdm ]; services.dbus.packages = [ gdm ];
@ -193,7 +193,7 @@ in
auth required pam_env.so envfile=${config.system.build.pamEnvironment} auth required pam_env.so envfile=${config.system.build.pamEnvironment}
auth required pam_succeed_if.so uid >= 1000 quiet auth required pam_succeed_if.so uid >= 1000 quiet
auth optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auth optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so
auth ${if config.security.pam.enableEcryptfs then "required" else "sufficient"} pam_unix.so nullok likeauth auth ${if config.security.pam.enableEcryptfs then "required" else "sufficient"} pam_unix.so nullok likeauth
${optionalString config.security.pam.enableEcryptfs ${optionalString config.security.pam.enableEcryptfs
"auth required ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"} "auth required ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"}
@ -213,7 +213,7 @@ in
"session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"} "session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"}
session required pam_loginuid.so session required pam_loginuid.so
session optional ${pkgs.systemd}/lib/security/pam_systemd.so session optional ${pkgs.systemd}/lib/security/pam_systemd.so
session optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start session optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start
''; '';
gdm-password.text = '' gdm-password.text = ''
@ -221,7 +221,7 @@ in
auth required pam_env.so envfile=${config.system.build.pamEnvironment} auth required pam_env.so envfile=${config.system.build.pamEnvironment}
auth required pam_succeed_if.so uid >= 1000 quiet auth required pam_succeed_if.so uid >= 1000 quiet
auth optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auth optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so
auth ${if config.security.pam.enableEcryptfs then "required" else "sufficient"} pam_unix.so nullok likeauth auth ${if config.security.pam.enableEcryptfs then "required" else "sufficient"} pam_unix.so nullok likeauth
${optionalString config.security.pam.enableEcryptfs ${optionalString config.security.pam.enableEcryptfs
"auth required ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"} "auth required ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"}
@ -240,7 +240,7 @@ in
"session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"} "session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"}
session required pam_loginuid.so session required pam_loginuid.so
session optional ${pkgs.systemd}/lib/security/pam_systemd.so session optional ${pkgs.systemd}/lib/security/pam_systemd.so
session optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start session optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start
''; '';
gdm-autologin.text = '' gdm-autologin.text = ''

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

@ -68,8 +68,8 @@ in
package = mkOption { package = mkOption {
type = types.package; type = types.package;
default = pkgs.gnome3.gnome_themes_standard; default = pkgs.gnome3.gnome-themes-standard;
defaultText = "pkgs.gnome3.gnome_themes_standard"; defaultText = "pkgs.gnome3.gnome-themes-standard";
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.
''; '';

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gettext, gtk2, expat, intltool, libgcrypt, { stdenv, fetchurl, pkgconfig, gettext, gtk2, expat, intltool, libgcrypt,
libunique, gnutls, libxml2, curl, mpd_clientlib, dbus_glib, libnotify, libunique, gnutls, libxml2, curl, mpd_clientlib, dbus-glib, libnotify,
libsoup, avahi, taglib libsoup, avahi, taglib
}: }:
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
gettext gtk2 expat intltool libgcrypt libunique gnutls gettext gtk2 expat intltool libgcrypt libunique gnutls
libxml2 curl mpd_clientlib dbus_glib libnotify libsoup avahi taglib libxml2 curl mpd_clientlib dbus-glib libnotify libsoup avahi taglib
]; ];
meta = { meta = {

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, wrapGAppsHook, gettext, glib, gtk3 { stdenv, fetchurl, pkgconfig, wrapGAppsHook, gettext, glib, gtk3
, libmowgli, dbus_glib, libxml2, xorg, gnome3, alsaLib , libmowgli, dbus-glib, libxml2, xorg, gnome3, alsaLib
, libpulseaudio, libjack2, fluidsynth, libmad, libogg, libvorbis , libpulseaudio, libjack2, fluidsynth, libmad, libogg, libvorbis
, libcdio, libcddb, flac, ffmpeg, mpg123, libcue, libmms, libbs2b , libcdio, libcddb, flac, ffmpeg, mpg123, libcue, libmms, libbs2b
, libsndfile, libmodplug, libsamplerate, soxr, lirc, curl, wavpack , libsndfile, libmodplug, libsamplerate, soxr, lirc, curl, wavpack
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
gettext glib gtk3 libmowgli dbus_glib libxml2 gettext glib gtk3 libmowgli dbus-glib libxml2
xorg.libXcomposite gnome3.defaultIconTheme alsaLib libjack2 xorg.libXcomposite gnome3.defaultIconTheme alsaLib libjack2
libpulseaudio fluidsynth libmad libogg libvorbis libcdio libpulseaudio fluidsynth libmad libogg libvorbis libcdio
libcddb flac ffmpeg mpg123 libcue libmms libbs2b libsndfile libcddb flac ffmpeg mpg123 libcue libmms libbs2b libsndfile

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

@ -1,7 +1,7 @@
{ stdenv, fetchurl, intltool, pkgconfig, fetchpatch, jansson { stdenv, fetchurl, intltool, pkgconfig, fetchpatch, jansson
# deadbeef can use either gtk2 or gtk3 # deadbeef can use either gtk2 or gtk3
, gtk2Support ? false, gtk2 ? null , gtk2Support ? false, gtk2 ? null
, gtk3Support ? true, gtk3 ? null, gsettings_desktop_schemas ? null, wrapGAppsHook ? null , gtk3Support ? true, gtk3 ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null
# input plugins # input plugins
, vorbisSupport ? true, libvorbis ? null , vorbisSupport ? true, libvorbis ? null
, mp123Support ? true, libmad ? null , mp123Support ? true, libmad ? null
@ -30,7 +30,7 @@
assert gtk2Support || gtk3Support; assert gtk2Support || gtk3Support;
assert gtk2Support -> gtk2 != null; assert gtk2Support -> gtk2 != null;
assert gtk3Support -> gtk3 != null && gsettings_desktop_schemas != null && wrapGAppsHook != null; assert gtk3Support -> gtk3 != null && gsettings-desktop-schemas != null && wrapGAppsHook != null;
assert vorbisSupport -> libvorbis != null; assert vorbisSupport -> libvorbis != null;
assert mp123Support -> libmad != null; assert mp123Support -> libmad != null;
assert flacSupport -> flac != null; assert flacSupport -> flac != null;
@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
buildInputs = with stdenv.lib; [ jansson ] buildInputs = with stdenv.lib; [ jansson ]
++ optional gtk2Support gtk2 ++ optional gtk2Support gtk2
++ optionals gtk3Support [ gtk3 gsettings_desktop_schemas ] ++ optionals gtk3Support [ gtk3 gsettings-desktop-schemas ]
++ optional vorbisSupport libvorbis ++ optional vorbisSupport libvorbis
++ optional mp123Support libmad ++ optional mp123Support libmad
++ optional flacSupport flac ++ optional flacSupport flac

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libid3tag, id3lib, taglib { stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libid3tag, id3lib, taglib
, libvorbis, libogg, flac, itstool, libxml2, gsettings_desktop_schemas , libvorbis, libogg, flac, itstool, libxml2, gsettings-desktop-schemas
, makeWrapper, gnome3 , makeWrapper, gnome3
}: }:
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper pkgconfig intltool ]; nativeBuildInputs = [ makeWrapper pkgconfig intltool ];
buildInputs = [ buildInputs = [
gtk3 glib libid3tag id3lib taglib libvorbis libogg flac gtk3 glib libid3tag id3lib taglib libvorbis libogg flac
itstool libxml2 gsettings_desktop_schemas gnome3.defaultIconTheme (stdenv.lib.getLib gnome3.dconf) itstool libxml2 gsettings-desktop-schemas gnome3.defaultIconTheme (stdenv.lib.getLib gnome3.dconf)
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, mpd_clientlib, dbus_glib, audacious, gtk2, gsl { stdenv, fetchurl, pkgconfig, mpd_clientlib, dbus-glib, audacious, gtk2, gsl
, libaudclient }: , libaudclient }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -11,7 +11,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ mpd_clientlib dbus_glib audacious gtk2 gsl libaudclient ]; buildInputs = [ mpd_clientlib dbus-glib audacious gtk2 gsl libaudclient ];
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];

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

@ -1,6 +1,6 @@
{ stdenv, fetchurl, libtool, intltool, pkgconfig, glib { stdenv, fetchurl, libtool, intltool, pkgconfig, glib
, gtk2, curl, mpd_clientlib, libsoup, gob2, vala, libunique , gtk2, curl, mpd_clientlib, libsoup, gob2, vala, libunique
, libSM, libICE, sqlite, hicolor_icon_theme, wrapGAppsHook , libSM, libICE, sqlite, hicolor-icon-theme, wrapGAppsHook
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig libtool intltool gob2 vala wrapGAppsHook ]; nativeBuildInputs = [ pkgconfig libtool intltool gob2 vala wrapGAppsHook ];
buildInputs = [ buildInputs = [
glib gtk2 curl mpd_clientlib libsoup glib gtk2 curl mpd_clientlib libsoup
libunique libmpd libSM libICE sqlite hicolor_icon_theme libunique libmpd libSM libICE sqlite hicolor-icon-theme
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

12
pkgs/applications/audio/gradio/default.nix
View File

@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, pkgconfig { stdenv, fetchFromGitHub, pkgconfig
, gcc , gcc
, python3 , python3
, gsettings_desktop_schemas , gsettings-desktop-schemas
, desktop_file_utils , desktop-file-utils
, glib , glib
, gtk3 , gtk3
, intltool , intltool
, libsoup , libsoup
, json_glib , json-glib
, wrapGAppsHook , wrapGAppsHook
, meson , meson
, ninja , ninja
@ -44,15 +44,15 @@ in stdenv.mkDerivation rec {
glib glib
intltool intltool
libsoup libsoup
json_glib json-glib
gtk3 gtk3
gst_all_1.gstreamer gst_all_1.gstreamer
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-base
wrapGAppsHook wrapGAppsHook
desktop_file_utils desktop-file-utils
gsettings_desktop_schemas gsettings-desktop-schemas
] ++ gst_plugins; ] ++ gst_plugins;
enableParallelBuilding = true; enableParallelBuilding = true;

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

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, makeWrapper, intltool, libgpod, curl, flac, { stdenv, fetchurl, pkgconfig, makeWrapper, intltool, libgpod, curl, flac,
gnome, gtk3, glib, gettext, perl, perlXMLParser, flex, libglade, libid3tag, gnome, gtk3, glib, gettext, perl, perlXMLParser, flex, libglade, libid3tag,
libvorbis, hicolor_icon_theme, gdk_pixbuf }: libvorbis, hicolor-icon-theme, gdk_pixbuf }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.1.5"; version = "2.1.5";
@ -11,13 +11,13 @@ stdenv.mkDerivation rec {
sha256 = "0xisrpx069f7bjkyc8vqxb4k0480jmx1wscqxr6cpq1qj6pchzd5"; sha256 = "0xisrpx069f7bjkyc8vqxb4k0480jmx1wscqxr6cpq1qj6pchzd5";
}; };
propagatedUserEnvPkgs = [ gnome.gnome_themes_standard ]; propagatedUserEnvPkgs = [ gnome.gnome-themes-standard ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ makeWrapper intltool curl gettext perl perlXMLParser buildInputs = [ makeWrapper intltool curl gettext perl perlXMLParser
flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf libglade gnome.anjuta flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf libglade gnome.anjuta
gnome.gdl gnome.defaultIconTheme gnome.gdl gnome.defaultIconTheme
hicolor_icon_theme ]; hicolor-icon-theme ];
patchPhase = '' patchPhase = ''
sed -i 's/which/type -P/' scripts/*.sh sed -i 's/which/type -P/' scripts/*.sh
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
preFixup = '' preFixup = ''
wrapProgram "$out/bin/gtkpod" \ wrapProgram "$out/bin/gtkpod" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome.gnome-themes-standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;

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

@ -1,6 +1,6 @@
{ stdenv, fetchurl, gettext, intltool, pkgconfig, python2 { stdenv, fetchurl, gettext, intltool, pkgconfig, python2
, avahi, bluez, boost, eigen, fftw, glib, glib_networking , avahi, bluez, boost, eigen, fftw, glib, glib-networking
, glibmm, gsettings_desktop_schemas, gtkmm2, libjack2 , glibmm, gsettings-desktop-schemas, gtkmm2, libjack2
, ladspaH, libav, librdf, libsndfile, lilv, lv2, serd, sord, sratom , ladspaH, libav, librdf, libsndfile, lilv, lv2, serd, sord, sratom
, wrapGAppsHook, zita-convolver, zita-resampler , wrapGAppsHook, zita-convolver, zita-resampler
, optimizationSupport ? false # Enable support for native CPU extensions , optimizationSupport ? false # Enable support for native CPU extensions
@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python2 ]; nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python2 ];
buildInputs = [ buildInputs = [
avahi bluez boost eigen fftw glib glibmm glib_networking.out avahi bluez boost eigen fftw glib glibmm glib-networking.out
gsettings_desktop_schemas gtkmm2 libjack2 ladspaH libav librdf gsettings-desktop-schemas gtkmm2 libjack2 ladspaH libav librdf
libsndfile lilv lv2 serd sord sratom zita-convolver libsndfile lilv lv2 serd sord sratom zita-convolver
zita-resampler zita-resampler
]; ];

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

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pythonPackages, wrapGAppsHook { stdenv, fetchFromGitHub, pythonPackages, wrapGAppsHook
, gst_all_1, glib_networking, gobjectIntrospection , gst_all_1, glib-networking, gobjectIntrospection
}: }:
pythonPackages.buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec {
buildInputs = with gst_all_1; [ buildInputs = with gst_all_1; [
gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad
glib_networking gobjectIntrospection glib-networking gobjectIntrospection
]; ];
propagatedBuildInputs = with pythonPackages; [ propagatedBuildInputs = with pythonPackages; [

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

@ -1,5 +1,5 @@
{ fetchurl, stdenv, pkgconfig, pulseaudioFull, gtkmm2, libglademm { fetchurl, stdenv, pkgconfig, pulseaudioFull, gtkmm2, libglademm
, dbus_glib, GConf, gconfmm, intltool }: , dbus-glib, GConf, gconfmm, intltool }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "paprefs-0.9.10"; name = "paprefs-0.9.10";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1c5b3sb881szavly220q31g7rvpn94wr7ywlk00hqb9zaikml716"; sha256 = "1c5b3sb881szavly220q31g7rvpn94wr7ywlk00hqb9zaikml716";
}; };
buildInputs = [ pulseaudioFull gtkmm2 libglademm dbus_glib gconfmm ]; buildInputs = [ pulseaudioFull gtkmm2 libglademm dbus-glib gconfmm ];
nativeBuildInputs = [ pkgconfig intltool ]; nativeBuildInputs = [ pkgconfig intltool ];

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

@ -1,4 +1,4 @@
{ stdenv, alsaLib, boost, dbus_glib, fetchsvn, ganv, glibmm { stdenv, alsaLib, boost, dbus-glib, fetchsvn, ganv, glibmm
, gtkmm2, libjack2, pkgconfig, python2 , gtkmm2, libjack2, pkgconfig, python2
}: }:
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
alsaLib boost dbus_glib ganv glibmm gtkmm2 libjack2 alsaLib boost dbus-glib ganv glibmm gtkmm2 libjack2
pkgconfig python2 pkgconfig python2
]; ];

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

@ -1,5 +1,5 @@
{ fetchurl, stdenv, pkgconfig, intltool, libpulseaudio, gtkmm3 { fetchurl, stdenv, pkgconfig, intltool, libpulseaudio, gtkmm3
, libcanberra_gtk3, makeWrapper, gnome3 }: , libcanberra-gtk3, makeWrapper, gnome3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pavucontrol-3.0"; name = "pavucontrol-3.0";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS" --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS"
''; '';
buildInputs = [ libpulseaudio gtkmm3 libcanberra_gtk3 makeWrapper buildInputs = [ libpulseaudio gtkmm3 libcanberra-gtk3 makeWrapper
gnome3.defaultIconTheme ]; gnome3.defaultIconTheme ];
nativeBuildInputs = [ pkgconfig intltool ]; nativeBuildInputs = [ pkgconfig intltool ];

4
pkgs/applications/audio/radiotray-ng/default.nix
View File

@ -11,7 +11,7 @@
, dbus , dbus
, glibmm , glibmm
, gnome3 , gnome3
, hicolor_icon_theme , hicolor-icon-theme
, libappindicator-gtk3 , libappindicator-gtk3
, libnotify , libnotify
, libxdg_basedir , libxdg_basedir
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
curl curl
boost jsoncpp libbsd pcre boost jsoncpp libbsd pcre
glibmm hicolor_icon_theme gnome3.gsettings_desktop_schemas libappindicator-gtk3 libnotify glibmm hicolor-icon-theme gnome3.gsettings-desktop-schemas libappindicator-gtk3 libnotify
libxdg_basedir libxdg_basedir
lsb-release lsb-release
wxGTK wxGTK

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

@ -7,7 +7,7 @@
, libsoup , libsoup
, gnome3 , gnome3
, tdb , tdb
, json_glib , json-glib
, itstool , itstool
, wrapGAppsHook , wrapGAppsHook
, gst_all_1 , gst_all_1
@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
intltool intltool
libsoup libsoup
tdb tdb
json_glib json-glib
itstool itstool
gtk3 gtk3

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

@ -19,8 +19,8 @@ in buildPythonApplication rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
intltool wrapGAppsHook intltool wrapGAppsHook
gnome3.gnome_themes_standard gnome3.defaultIconTheme gnome3.gnome-themes-standard gnome3.defaultIconTheme
gnome3.gsettings_desktop_schemas gnome3.gsettings-desktop-schemas
]; ];
postPatch = '' postPatch = ''
@ -28,7 +28,7 @@ in buildPythonApplication rec {
sed -i '/localmpd/d' sonata/consts.py sed -i '/localmpd/d' sonata/consts.py
''; '';
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];
propagatedBuildInputs = [ propagatedBuildInputs = [
gobjectIntrospection gtk3 pygobject3 gobjectIntrospection gtk3 pygobject3

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gtk3, intltool, itstool, libxml2, brasero { stdenv, fetchurl, pkgconfig, gtk3, intltool, itstool, libxml2, brasero
, libcanberra_gtk3, gnome3, gst_all_1, libmusicbrainz5, libdiscid, isocodes , libcanberra-gtk3, gnome3, gst_all_1, libmusicbrainz5, libdiscid, isocodes
, makeWrapper }: , makeWrapper }:
let let
@ -16,8 +16,8 @@ in stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk3 intltool itstool libxml2 brasero libcanberra_gtk3 buildInputs = [ gtk3 intltool itstool libxml2 brasero libcanberra-gtk3
gnome3.gsettings_desktop_schemas libmusicbrainz5 libdiscid isocodes gnome3.gsettings-desktop-schemas libmusicbrainz5 libdiscid isocodes
makeWrapper (stdenv.lib.getLib gnome3.dconf) makeWrapper (stdenv.lib.getLib gnome3.dconf)
gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gstreamer gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
preFixup = '' preFixup = ''
for f in $out/bin/* $out/libexec/*; do for f in $out/bin/* $out/libexec/*; do
wrapProgram "$f" \ wrapProgram "$f" \
--prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ --prefix XDG_DATA_DIRS : "${gnome3.gnome-themes-standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
--prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules"
done done

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

@ -4,12 +4,12 @@
, enableXMPP ? true, libjreen ? null , enableXMPP ? true, libjreen ? null
, enableKDE ? false, kdelibs4 ? null , enableKDE ? false, kdelibs4 ? null
, enableTelepathy ? false, telepathy_qt ? null , enableTelepathy ? false, telepathy-qt ? null
}: }:
assert enableXMPP -> libjreen != null; assert enableXMPP -> libjreen != null;
assert enableKDE -> kdelibs4 != null; assert enableKDE -> kdelibs4 != null;
assert enableTelepathy -> telepathy_qt != null; assert enableTelepathy -> telepathy-qt != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "tomahawk-${version}"; name = "tomahawk-${version}";
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
makeWrapper makeWrapper
] ++ stdenv.lib.optional enableXMPP libjreen ] ++ stdenv.lib.optional enableXMPP libjreen
++ stdenv.lib.optional enableKDE kdelibs4 ++ stdenv.lib.optional enableKDE kdelibs4
++ stdenv.lib.optional enableTelepathy telepathy_qt; ++ stdenv.lib.optional enableTelepathy telepathy-qt;
postInstall = let postInstall = let
pluginPath = stdenv.lib.concatStringsSep ":" [ pluginPath = stdenv.lib.concatStringsSep ":" [

8
pkgs/applications/backup/deja-dup/default.nix
View File

@ -1,8 +1,8 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, vala_0_38, gettext { stdenv, fetchurl, meson, ninja, pkgconfig, vala_0_38, gettext
, gnome3, libnotify, intltool, itstool, glib, gtk3, libxml2 , gnome3, libnotify, intltool, itstool, glib, gtk3, libxml2
, coreutils, libsecret, pcre, libxkbcommon, wrapGAppsHook , coreutils, libsecret, pcre, libxkbcommon, wrapGAppsHook
, libpthreadstubs, libXdmcp, epoxy, at_spi2_core, dbus, libgpgerror , libpthreadstubs, libXdmcp, epoxy, at-spi2-core, dbus, libgpgerror
, appstream-glib, desktop_file_utils, duplicity , appstream-glib, desktop-file-utils, duplicity
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -29,13 +29,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
meson ninja pkgconfig vala_0_38 gettext intltool itstool meson ninja pkgconfig vala_0_38 gettext intltool itstool
appstream-glib desktop_file_utils libxml2 wrapGAppsHook appstream-glib desktop-file-utils libxml2 wrapGAppsHook
]; ];
buildInputs = [ buildInputs = [
libnotify gnome3.libpeas glib gtk3 libsecret libnotify gnome3.libpeas glib gtk3 libsecret
pcre libxkbcommon libpthreadstubs libXdmcp epoxy gnome3.nautilus pcre libxkbcommon libpthreadstubs libXdmcp epoxy gnome3.nautilus
at_spi2_core dbus gnome3.gnome_online_accounts libgpgerror at-spi2-core dbus gnome3.gnome-online-accounts libgpgerror
]; ];
propagatedUserEnvPkgs = [ duplicity ]; propagatedUserEnvPkgs = [ duplicity ];

4
pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, lightdm, pkgconfig, intltool { stdenv, fetchurl, lightdm, pkgconfig, intltool
, hicolor_icon_theme, makeWrapper , hicolor-icon-theme, makeWrapper
, useGTK2 ? false, gtk2, gtk3 # gtk3 seems better supported , useGTK2 ? false, gtk2, gtk3 # gtk3 seems better supported
, exo , exo
}: }:
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
substituteInPlace "$out/share/xgreeters/lightdm-gtk-greeter.desktop" \ substituteInPlace "$out/share/xgreeters/lightdm-gtk-greeter.desktop" \
--replace "Exec=lightdm-gtk-greeter" "Exec=$out/sbin/lightdm-gtk-greeter" --replace "Exec=lightdm-gtk-greeter" "Exec=$out/sbin/lightdm-gtk-greeter"
wrapProgram "$out/sbin/lightdm-gtk-greeter" \ wrapProgram "$out/sbin/lightdm-gtk-greeter" \
--prefix XDG_DATA_DIRS ":" "${hicolor_icon_theme}/share" --prefix XDG_DATA_DIRS ":" "${hicolor-icon-theme}/share"
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

4
pkgs/applications/editors/atom/env.nix
View File

@ -1,11 +1,11 @@
{ stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig { stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig
, libgnome_keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr , libgnome-keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr
, gconf, nss, xorg, libcap, systemd, libnotify, libsecret , gconf, nss, xorg, libcap, systemd, libnotify, libsecret
}: }:
let let
packages = [ packages = [
stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome_keyring3 stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3
fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss
xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr

4
pkgs/applications/editors/eclipse/build-eclipse.nix
View File

@ -1,5 +1,5 @@
{ stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender { stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender
, zlib, jdk, glib, gtk2, libXtst, gsettings_desktop_schemas, webkitgtk24x-gtk2 , zlib, jdk, glib, gtk2, libXtst, gsettings-desktop-schemas, webkitgtk24x-gtk2
, makeWrapper, ... }: , makeWrapper, ... }:
{ name, src ? builtins.getAttr stdenv.system sources, sources ? null, description }: { name, src ? builtins.getAttr stdenv.system sources, sources ? null, description }:
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
fontconfig freetype glib gsettings_desktop_schemas gtk2 jdk libX11 fontconfig freetype glib gsettings-desktop-schemas gtk2 jdk libX11
libXrender libXtst makeWrapper zlib libXrender libXtst makeWrapper zlib
] ++ stdenv.lib.optional (webkitgtk24x-gtk2 != null) webkitgtk24x-gtk2; ] ++ stdenv.lib.optional (webkitgtk24x-gtk2 != null) webkitgtk24x-gtk2;

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

@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, makeDesktopItem, makeWrapper { stdenv, lib, fetchurl, makeDesktopItem, makeWrapper
, freetype, fontconfig, libX11, libXext, libXrender, zlib , freetype, fontconfig, libX11, libXext, libXrender, zlib
, glib, gtk2, libXtst, jdk, gsettings_desktop_schemas , glib, gtk2, libXtst, jdk, gsettings-desktop-schemas
, webkitgtk24x-gtk2 ? null # for internal web browser , webkitgtk24x-gtk2 ? null # for internal web browser
, buildEnv, writeText, runCommand , buildEnv, writeText, runCommand
, callPackage , callPackage
@ -15,7 +15,7 @@ rec {
buildEclipse = import ./build-eclipse.nix { buildEclipse = import ./build-eclipse.nix {
inherit stdenv makeDesktopItem freetype fontconfig libX11 libXrender zlib inherit stdenv makeDesktopItem freetype fontconfig libX11 libXrender zlib
jdk glib gtk2 libXtst gsettings_desktop_schemas webkitgtk24x-gtk2 jdk glib gtk2 libXtst gsettings-desktop-schemas webkitgtk24x-gtk2
makeWrapper; makeWrapper;
}; };

8
pkgs/applications/editors/emacs/default.nix
View File

@ -4,8 +4,8 @@
, alsaLib, cairo, acl, gpm, AppKit, CoreWLAN, Kerberos, GSS, ImageIO , alsaLib, cairo, acl, gpm, AppKit, CoreWLAN, Kerberos, GSS, ImageIO
, withX ? !stdenv.isDarwin , withX ? !stdenv.isDarwin
, withGTK2 ? false, gtk2 ? null , withGTK2 ? false, gtk2 ? null
, withGTK3 ? true, gtk3 ? null, gsettings_desktop_schemas ? null , withGTK3 ? true, gtk3 ? null, gsettings-desktop-schemas ? null
, withXwidgets ? false, webkitgtk24x-gtk3 ? null, wrapGAppsHook ? null, glib_networking ? null , withXwidgets ? false, webkitgtk24x-gtk3 ? null, wrapGAppsHook ? null, glib-networking ? null
, withCsrc ? true , withCsrc ? true
, srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null , srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null
}: }:
@ -61,9 +61,9 @@ stdenv.mkDerivation rec {
[ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft
imagemagick gconf ] imagemagick gconf ]
++ lib.optional (withX && withGTK2) gtk2 ++ lib.optional (withX && withGTK2) gtk2
++ lib.optionals (withX && withGTK3) [ gtk3 gsettings_desktop_schemas ] ++ lib.optionals (withX && withGTK3) [ gtk3 gsettings-desktop-schemas ]
++ lib.optional (stdenv.isDarwin && withX) cairo ++ lib.optional (stdenv.isDarwin && withX) cairo
++ lib.optionals (withX && withXwidgets) [ webkitgtk24x-gtk3 glib_networking ]; ++ lib.optionals (withX && withXwidgets) [ webkitgtk24x-gtk3 glib-networking ];
propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ]; propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ];

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

@ -1,4 +1,4 @@
{ config, stdenv, fetchgit, makeWrapper, gnome3, at_spi2_core, libcxx, { config, stdenv, fetchgit, makeWrapper, gnome3, at-spi2-core, libcxx,
boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre, boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre,
libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts, libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts,
coreutils, glibc, dbus_libs, openssl, libxml2, gnumake, ctags }: coreutils, glibc, dbus_libs, openssl, libxml2, gnumake, ctags }:
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
openssl openssl
libxml2 libxml2
gnome3.gtksourceview gnome3.gtksourceview
at_spi2_core at-spi2-core
pcre pcre
epoxy epoxy
boost boost

4
pkgs/applications/editors/kdevelop5/kdevelop.nix
View File

@ -3,7 +3,7 @@
, kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews , kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews
, kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor , kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor
, threadweaver, kxmlgui, kwindowsystem, grantlee, kcrash, karchive, kguiaddons , threadweaver, kxmlgui, kwindowsystem, grantlee, kcrash, karchive, kguiaddons
, plasma-framework, krunner, kdevplatform, kdevelop-pg-qt, shared_mime_info , plasma-framework, krunner, kdevplatform, kdevelop-pg-qt, shared-mime-info
, libksysguard, konsole, llvmPackages, makeWrapper , libksysguard, konsole, llvmPackages, makeWrapper
}: }:
@ -34,7 +34,7 @@ mkDerivation rec {
kconfig kdeclarative kdoctools kiconthemes ki18n kitemmodels kitemviews kconfig kdeclarative kdoctools kiconthemes ki18n kitemmodels kitemviews
kjobwidgets kcmutils kio knewstuff knotifyconfig kparts ktexteditor kjobwidgets kcmutils kio knewstuff knotifyconfig kparts ktexteditor
threadweaver kxmlgui kwindowsystem grantlee plasma-framework krunner threadweaver kxmlgui kwindowsystem grantlee plasma-framework krunner
kdevplatform shared_mime_info libksysguard konsole kcrash karchive kguiaddons kdevplatform shared-mime-info libksysguard konsole kcrash karchive kguiaddons
]; ];
postInstall = '' postInstall = ''

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

@ -1,11 +1,11 @@
{ stdenv, fetchurl, zlib, glib, alsaLib, makeDesktopItem { stdenv, fetchurl, zlib, glib, alsaLib, makeDesktopItem
, dbus, gtk2, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf , dbus, gtk2, atk, pango, freetype, fontconfig, libgnome-keyring3, gdk_pixbuf
, cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xorg, systemd, libnotify , cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xorg, systemd, libnotify
}: }:
let let
libPath = stdenv.lib.makeLibraryPath [ libPath = stdenv.lib.makeLibraryPath [
stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome_keyring3 nss stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3 nss
fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gnome3.gconf fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gnome3.gconf
xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
xorg.libXcomposite xorg.libXi xorg.libXfixes libnotify xorg.libXrandr xorg.libXcomposite xorg.libXi xorg.libXfixes libnotify xorg.libXrandr

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchgit, fetchNuGet { stdenv, fetchurl, fetchgit, fetchNuGet
, autoconf, automake, pkgconfig, shared_mime_info, intltool , autoconf, automake, pkgconfig, shared-mime-info, intltool
, glib, mono, gtk-sharp-2_0, gnome2, gnome-sharp, unzip , glib, mono, gtk-sharp-2_0, gnome2, gnome-sharp, unzip
, dotnetPackages , dotnetPackages
}: }:
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
autoconf automake shared_mime_info intltool autoconf automake shared-mime-info intltool
mono gtk-sharp-2_0 gnome-sharp unzip mono gtk-sharp-2_0 gnome-sharp unzip
dotnetPackages.NUnit dotnetPackages.NUnit
dotnetPackages.NUnitRunners dotnetPackages.NUnitRunners

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, libsoup, graphicsmagick, json_glib, wrapGAppsHook { stdenv, fetchurl, libsoup, graphicsmagick, json-glib, wrapGAppsHook
, 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, pkgconfig, sqlite, libxslt , libpng, librsvg, libtiff, openexr, osm-gps-map, pkgconfig, sqlite, libxslt
, openjpeg, lua, pugixml, colord, colord-gtk, libwebp, libsecret, gnome3 , openjpeg, lua, pugixml, colord, colord-gtk, libwebp, libsecret, gnome3
@ -14,12 +14,12 @@ stdenv.mkDerivation rec {
sha256 = "014pq80i5k1kdvvrl7xrgaaq3i4fzv09h7a3pwzlp2ahkczwcm32"; sha256 = "014pq80i5k1kdvvrl7xrgaaq3i4fzv09h7a3pwzlp2ahkczwcm32";
}; };
nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop_file_utils wrapGAppsHook ]; nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop-file-utils wrapGAppsHook ];
buildInputs = [ buildInputs = [
cairo curl exiv2 glib gtk3 ilmbase lcms2 lensfun libX11 libexif cairo curl exiv2 glib gtk3 ilmbase lcms2 lensfun libX11 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
colord colord-gtk libwebp libsecret gnome3.adwaita-icon-theme colord colord-gtk libwebp libsecret gnome3.adwaita-icon-theme
osm-gps-map osm-gps-map
]; ];

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

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, gnome3, libtool, intltool, pkgconfig, gtk3, hicolor_icon_theme, wrapGAppsHook } : { stdenv, fetchFromGitHub, gnome3, libtool, intltool, pkgconfig, gtk3, hicolor-icon-theme, wrapGAppsHook } :
let let
version = "2.2"; version = "2.2";
@ -12,7 +12,7 @@ in stdenv.mkDerivation {
sha256 = "1rbahsi33pfggpj5cigy6wy5333g3rpm8v2q0b35c6m7pwhmf2gr"; sha256 = "1rbahsi33pfggpj5cigy6wy5333g3rpm8v2q0b35c6m7pwhmf2gr";
}; };
nativeBuildInputs = [ gnome3.gnome_common libtool intltool pkgconfig hicolor_icon_theme wrapGAppsHook ]; nativeBuildInputs = [ gnome3.gnome-common libtool intltool pkgconfig hicolor-icon-theme wrapGAppsHook ];
buildInputs = [ gtk3 ]; buildInputs = [ gtk3 ];

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, autoconf, automake, gettext, intltool { stdenv, fetchurl, pkgconfig, autoconf, automake, gettext, intltool
, gtk3, lcms2, exiv2, libchamplain, clutter_gtk, ffmpegthumbnailer, fbida , gtk3, lcms2, exiv2, libchamplain, clutter-gtk, ffmpegthumbnailer, fbida
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig autoconf automake gettext intltool ]; nativeBuildInputs = [ pkgconfig autoconf automake gettext intltool ];
buildInputs = [ buildInputs = [
gtk3 lcms2 exiv2 libchamplain clutter_gtk ffmpegthumbnailer fbida gtk3 lcms2 exiv2 libchamplain clutter-gtk ffmpegthumbnailer fbida
]; ];
postInstall = '' postInstall = ''

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

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, gdk_pixbuf, scons, pkgconfig, gtk2, glib, { stdenv, fetchFromGitHub, gdk_pixbuf, scons, pkgconfig, gtk2, glib,
pcre, cfitsio, perl, gob2, vala, libtiff, json_glib }: pcre, cfitsio, perl, gob2, vala, libtiff, json-glib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "giv-${version}"; name = "giv-${version}";
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
installPhase = "scons install"; installPhase = "scons install";
nativeBuildInputs = [ scons pkgconfig vala perl gob2 ]; nativeBuildInputs = [ scons pkgconfig vala perl gob2 ];
buildInputs = [ gdk_pixbuf gtk2 glib pcre cfitsio libtiff json_glib ]; buildInputs = [ gdk_pixbuf gtk2 glib pcre cfitsio libtiff json-glib ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Cross platform image and hierarchical vector viewer based"; description = "Cross platform image and hierarchical vector viewer based";

6
pkgs/applications/graphics/glabels/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, barcode, gnome3, autoreconfHook { stdenv, fetchurl, barcode, gnome3, autoreconfHook
, gtk3, gtk_doc, libxml2, librsvg , libtool, libe-book , gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book
, intltool, itstool, makeWrapper, pkgconfig, which , intltool, itstool, makeWrapper, pkgconfig, which
}: }:
@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper intltool ]; nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper intltool ];
buildInputs = [ buildInputs = [
barcode gtk3 gtk_doc gnome3.yelp_tools barcode gtk3 gtk-doc gnome3.yelp-tools
gnome3.gnome_common gnome3.gsettings_desktop_schemas gnome3.gnome-common gnome3.gsettings-desktop-schemas
itstool libxml2 librsvg libe-book libtool itstool libxml2 librsvg libe-book libtool
]; ];

10
pkgs/applications/graphics/gthumb/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, gnome3, itstool, libxml2, pkgconfig, intltool, { stdenv, fetchurl, gnome3, itstool, libxml2, pkgconfig, intltool,
exiv2, libjpeg, libtiff, gstreamer, libraw, libsoup, libsecret, exiv2, libjpeg, libtiff, gstreamer, libraw, libsoup, libsecret,
libchamplain, librsvg, libwebp, json_glib, webkit, lcms2, bison, libchamplain, librsvg, libwebp, json-glib, webkit, lcms2, bison,
flex, hicolor_icon_theme, wrapGAppsHook, shared_mime_info }: flex, hicolor-icon-theme, wrapGAppsHook, shared-mime-info }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -17,14 +17,14 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
buildInputs = with gnome3; buildInputs = with gnome3;
[ itstool libxml2 intltool glib gtk gsettings_desktop_schemas dconf [ itstool libxml2 intltool glib gtk gsettings-desktop-schemas dconf
exiv2 libjpeg libtiff gstreamer libraw libsoup libsecret libchamplain exiv2 libjpeg libtiff gstreamer libraw libsoup libsecret libchamplain
librsvg libwebp json_glib webkit lcms2 bison flex hicolor_icon_theme defaultIconTheme ]; librsvg libwebp json-glib webkit lcms2 bison flex hicolor-icon-theme defaultIconTheme ];
enableParallelBuilding = true; enableParallelBuilding = true;
preFixup = '' preFixup = ''
gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared_mime_info}/share") gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share")
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

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

@ -4,7 +4,7 @@
, makeWrapper , makeWrapper
, pkgconfig , pkgconfig
, wrapGAppsHook , wrapGAppsHook
, gsettings_desktop_schemas , gsettings-desktop-schemas
, qtbase , qtbase
, qttools , qttools
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
libraw libraw
libtiff libtiff
quazip quazip
gsettings_desktop_schemas]; gsettings-desktop-schemas];
cmakeFlags = ["-DENABLE_OPENCV=ON" cmakeFlags = ["-DENABLE_OPENCV=ON"
"-DENABLE_RAW=ON" "-DENABLE_RAW=ON"

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

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm3, libXau { stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm3, libXau
, libXdmcp, lcms2, libiptcdata, libcanberra_gtk3, fftw, expat, pcre, libsigcxx, wrapGAppsHook , libXdmcp, lcms2, libiptcdata, libcanberra-gtk3, fftw, expat, pcre, libsigcxx, wrapGAppsHook
, lensfun , lensfun
}: }:
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
pixman libpthreadstubs gtkmm3 libXau libXdmcp pixman libpthreadstubs gtkmm3 libXau libXdmcp
lcms2 libiptcdata libcanberra_gtk3 fftw expat pcre libsigcxx lensfun lcms2 libiptcdata libcanberra-gtk3 fftw expat pcre libsigcxx lensfun
]; ];
cmakeFlags = [ cmakeFlags = [

10
pkgs/applications/graphics/shotwell/default.nix
View File

@ -1,6 +1,6 @@
{ fetchurl, stdenv, meson, ninja, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite { fetchurl, stdenv, meson, ninja, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite
, webkitgtk, pkgconfig, gnome3, gst_all_1, libgudev, libraw, glib, json_glib , webkitgtk, pkgconfig, gnome3, gst_all_1, libgudev, libraw, glib, json-glib
, gettext, desktop_file_utils, gdk_pixbuf, librsvg, wrapGAppsHook , gettext, desktop-file-utils, gdk_pixbuf, librsvg, wrapGAppsHook
, itstool, libgdata }: , itstool, libgdata }:
# for dependencies see https://wiki.gnome.org/Apps/Shotwell/BuildingAndInstalling # for dependencies see https://wiki.gnome.org/Apps/Shotwell/BuildingAndInstalling
@ -17,14 +17,14 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ nativeBuildInputs = [
meson ninja pkgconfig itstool gettext desktop_file_utils wrapGAppsHook meson ninja pkgconfig itstool gettext desktop-file-utils wrapGAppsHook
]; ];
buildInputs = [ buildInputs = [
gtk3 libexif libgphoto2 libsoup libxml2 vala sqlite webkitgtk gtk3 libexif libgphoto2 libsoup libxml2 vala sqlite webkitgtk
gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee
libgudev gnome3.gexiv2 gnome3.gsettings_desktop_schemas libgudev gnome3.gexiv2 gnome3.gsettings-desktop-schemas
libraw json_glib glib gdk_pixbuf librsvg gnome3.rest libraw json-glib glib gdk_pixbuf librsvg gnome3.rest
gnome3.gcr gnome3.defaultIconTheme libgdata gnome3.gcr gnome3.defaultIconTheme libgdata
]; ];

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

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk2, libpng, exiv2, lcms { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk2, libpng, exiv2, lcms
, intltool, gettext, shared_mime_info, glib, gdk_pixbuf, perl}: , intltool, gettext, shared-mime-info, glib, gdk_pixbuf, perl}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "viewnior-${version}"; name = "viewnior-${version}";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ];
buildInputs = buildInputs =
[ pkgconfig gtk2 libpng exiv2 lcms intltool gettext [ pkgconfig gtk2 libpng exiv2 lcms intltool gettext
shared_mime_info glib gdk_pixbuf perl shared-mime-info glib gdk_pixbuf perl
]; ];
preFixup = '' preFixup = ''

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

@ -1,5 +1,5 @@
{ lib, python3Packages, fetchFromGitHub, imagemagick, librsvg, gtk3, jhead { lib, python3Packages, fetchFromGitHub, imagemagick, librsvg, gtk3, jhead
, hicolor_icon_theme, defaultIconTheme , hicolor-icon-theme, defaultIconTheme
# Test requirements # Test requirements
, dbus, xvfb_run, xdotool , dbus, xvfb_run, xdotool
@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec {
''; '';
checkInputs = [ python3Packages.nose dbus.daemon xvfb_run xdotool ]; checkInputs = [ python3Packages.nose dbus.daemon xvfb_run xdotool ];
buildInputs = [ hicolor_icon_theme defaultIconTheme librsvg ]; buildInputs = [ hicolor-icon-theme defaultIconTheme librsvg ];
propagatedBuildInputs = with python3Packages; [ pillow pygobject3 gtk3 ]; propagatedBuildInputs = with python3Packages; [ pillow pygobject3 gtk3 ];
makeWrapperArgs = [ makeWrapperArgs = [

4
pkgs/applications/kde/akonadi-mime.nix
View File

@ -1,6 +1,6 @@
{ {
mkDerivation, lib, kdepimTeam, mkDerivation, lib, kdepimTeam,
extra-cmake-modules, shared_mime_info, extra-cmake-modules, shared-mime-info,
akonadi, kdbusaddons, ki18n, kio, kitemmodels, kmime akonadi, kdbusaddons, ki18n, kio, kitemmodels, kmime
}: }:
@ -10,7 +10,7 @@ mkDerivation {
license = with lib.licenses; [ gpl2 lgpl21 ]; license = with lib.licenses; [ gpl2 lgpl21 ];
maintainers = kdepimTeam; maintainers = kdepimTeam;
}; };
nativeBuildInputs = [ extra-cmake-modules shared_mime_info ]; nativeBuildInputs = [ extra-cmake-modules shared-mime-info ];
buildInputs = [ akonadi kdbusaddons ki18n kio kitemmodels kmime ]; buildInputs = [ akonadi kdbusaddons ki18n kio kitemmodels kmime ];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
} }

4
pkgs/applications/kde/akonadi/default.nix
View File

@ -1,6 +1,6 @@
{ {
mkDerivation, copyPathsToStore, lib, kdepimTeam, mkDerivation, copyPathsToStore, lib, kdepimTeam,
extra-cmake-modules, shared_mime_info, extra-cmake-modules, shared-mime-info,
boost, kcompletion, kconfigwidgets, kcrash, kdbusaddons, kdesignerplugin, boost, kcompletion, kconfigwidgets, kcrash, kdbusaddons, kdesignerplugin,
ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mysql, qttools, ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mysql, qttools,
}: }:
@ -12,7 +12,7 @@ mkDerivation {
maintainers = kdepimTeam; maintainers = kdepimTeam;
}; };
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
nativeBuildInputs = [ extra-cmake-modules shared_mime_info ]; nativeBuildInputs = [ extra-cmake-modules shared-mime-info ];
buildInputs = [ buildInputs = [
kcompletion kconfigwidgets kcrash kdbusaddons kdesignerplugin ki18n kcompletion kconfigwidgets kcrash kdbusaddons kdesignerplugin ki18n
kiconthemes kio kwindowsystem qttools kiconthemes kio kwindowsystem qttools

4
pkgs/applications/kde/k3b.nix
View File

@ -1,5 +1,5 @@
{ mkDerivation, lib { mkDerivation, lib
, extra-cmake-modules, kdoctools, makeWrapper, shared_mime_info , extra-cmake-modules, kdoctools, makeWrapper, shared-mime-info
, qtwebkit , qtwebkit
, libkcddb, karchive, kcmutils, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui , libkcddb, karchive, kcmutils, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui
, flac, lame, libmad, libmpcdec, libvorbis , flac, lame, libmad, libmpcdec, libvorbis
@ -28,7 +28,7 @@ mkDerivation {
# cd/dvd # cd/dvd
cdparanoia libdvdcss libdvdread cdparanoia libdvdcss libdvdread
# others # others
ffmpeg libmusicbrainz3 shared_mime_info ffmpeg libmusicbrainz3 shared-mime-info
]; ];
propagatedUserEnvPkgs = [ (lib.getBin kinit) ]; propagatedUserEnvPkgs = [ (lib.getBin kinit) ];
postFixup = postFixup =

4
pkgs/applications/kde/kdenlive.nix
View File

@ -21,7 +21,7 @@
, kplotting , kplotting
, ktextwidgets , ktextwidgets
, mlt , mlt
, shared_mime_info , shared-mime-info
, libv4l , libv4l
, kfilemetadata , kfilemetadata
, ffmpeg , ffmpeg
@ -62,7 +62,7 @@ mkDerivation {
qtquickcontrols qtquickcontrols
qtscript qtscript
qtwebkit qtwebkit
shared_mime_info shared-mime-info
libv4l libv4l
ffmpeg ffmpeg
]; ];

4
pkgs/applications/kde/kdepim-runtime.nix
View File

@ -1,7 +1,7 @@
{ {
mkDerivation, lib, kdepimTeam, mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools,
shared_mime_info, shared-mime-info,
akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes, akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes,
kalarmcal, kcalutils, kcontacts, kdav, kdelibs4support, kidentitymanagement, kalarmcal, kcalutils, kcontacts, kdav, kdelibs4support, kidentitymanagement,
kimap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig, kimap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig,
@ -14,7 +14,7 @@ mkDerivation {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam; maintainers = kdepimTeam;
}; };
nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ]; nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ];
buildInputs = [ buildInputs = [
akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes
kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap

4
pkgs/applications/kde/kio-extras.nix
View File

@ -1,5 +1,5 @@
{ {
mkDerivation, lib, extra-cmake-modules, kdoctools, shared_mime_info, mkDerivation, lib, extra-cmake-modules, kdoctools, shared-mime-info,
exiv2, kactivities, karchive, kbookmarks, kconfig, kconfigwidgets, exiv2, kactivities, karchive, kbookmarks, kconfig, kconfigwidgets,
kcoreaddons, kdbusaddons, kguiaddons, kdnssd, kiconthemes, ki18n, kio, khtml, kcoreaddons, kdbusaddons, kguiaddons, kdnssd, kiconthemes, ki18n, kio, khtml,
kdelibs4support, kpty, libmtp, libssh, openexr, ilmbase, openslp, phonon, kdelibs4support, kpty, libmtp, libssh, openexr, ilmbase, openslp, phonon,
@ -12,7 +12,7 @@ mkDerivation {
license = with lib.licenses; [ gpl2 lgpl21 ]; license = with lib.licenses; [ gpl2 lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ]; maintainers = [ lib.maintainers.ttuegel ];
}; };
nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ]; nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ];
buildInputs = [ buildInputs = [
exiv2 kactivities karchive kbookmarks kconfig kconfigwidgets kcoreaddons exiv2 kactivities karchive kbookmarks kconfig kconfigwidgets kcoreaddons
kdbusaddons kguiaddons kdnssd kiconthemes ki18n kio khtml kdelibs4support kdbusaddons kguiaddons kdnssd kiconthemes ki18n kio khtml kdelibs4support

4
pkgs/applications/kde/kmail-account-wizard.nix
View File

@ -1,6 +1,6 @@
{ {
mkDerivation, lib, kdepimTeam, mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools, shared_mime_info, extra-cmake-modules, kdoctools, shared-mime-info,
akonadi, kcmutils, kcrash, kdbusaddons, kidentitymanagement, kldap, akonadi, kcmutils, kcrash, kdbusaddons, kidentitymanagement, kldap,
kmailtransport, knewstuff, knotifications, knotifyconfig, kparts, kross, ktexteditor, kmailtransport, knewstuff, knotifications, knotifyconfig, kparts, kross, ktexteditor,
kwallet, libkdepim, libkleo, pimcommon, qttools, kwallet, libkdepim, libkleo, pimcommon, qttools,
@ -12,7 +12,7 @@ mkDerivation {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam; maintainers = kdepimTeam;
}; };
nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ]; nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ];
buildInputs = [ buildInputs = [
akonadi kcmutils kcrash kdbusaddons kidentitymanagement kldap kmailtransport akonadi kcmutils kcrash kdbusaddons kidentitymanagement kldap kmailtransport
knewstuff knotifications knotifyconfig kparts kross ktexteditor kwallet libkdepim knewstuff knotifications knotifyconfig kparts kross ktexteditor kwallet libkdepim

4
pkgs/applications/kde/marble.nix
View File

@ -1,7 +1,7 @@
{ mkDerivation, lib { mkDerivation, lib
, extra-cmake-modules, kdoctools , extra-cmake-modules, kdoctools
, qtscript, qtsvg, qtquickcontrols, qtwebkit , qtscript, qtsvg, qtquickcontrols, qtwebkit
, krunner, shared_mime_info, kparts, knewstuff , krunner, shared-mime-info, kparts, knewstuff
, gpsd, perl , gpsd, perl
}: }:
@ -10,7 +10,7 @@ mkDerivation {
meta.license = with lib.licenses; [ lgpl21 gpl3 ]; meta.license = with lib.licenses; [ lgpl21 gpl3 ];
nativeBuildInputs = [ extra-cmake-modules kdoctools perl ]; nativeBuildInputs = [ extra-cmake-modules kdoctools perl ];
propagatedBuildInputs = [ propagatedBuildInputs = [
qtscript qtsvg qtquickcontrols qtwebkit shared_mime_info krunner kparts qtscript qtsvg qtquickcontrols qtwebkit shared-mime-info krunner kparts
knewstuff gpsd knewstuff gpsd
]; ];
} }

4
pkgs/applications/kde/okteta.nix
View File

@ -3,7 +3,7 @@
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools,
qtscript, kconfig, kinit, karchive, kcrash, qtscript, kconfig, kinit, karchive, kcrash,
kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5, kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5,
shared_mime_info shared-mime-info
}: }:
mkDerivation { mkDerivation {
@ -13,7 +13,7 @@ mkDerivation {
maintainers = with lib.maintainers; [ peterhoeg ]; maintainers = with lib.maintainers; [ peterhoeg ];
}; };
nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ]; nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ];
buildInputs = [ shared_mime_info ]; buildInputs = [ shared-mime-info ];
propagatedBuildInputs = [ propagatedBuildInputs = [
kconfig kinit kcmutils kconfigwidgets knewstuff kparts qca-qt5 kconfig kinit kcmutils kconfigwidgets knewstuff kparts qca-qt5
karchive kcrash karchive kcrash

4
pkgs/applications/misc/artha/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, dbus_glib, gtk2, pkgconfig, wordnet }: { stdenv, fetchurl, dbus-glib, gtk2, pkgconfig, wordnet }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "artha-${version}"; name = "artha-${version}";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ dbus_glib gtk2 wordnet ]; buildInputs = [ dbus-glib gtk2 wordnet ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "An offline thesaurus based on WordNet"; description = "An offline thesaurus based on WordNet";

4
pkgs/applications/misc/clipit/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, intltool, pkgconfig, gtk2, xdotool, hicolor_icon_theme }: { fetchurl, stdenv, intltool, pkgconfig, gtk2, xdotool, hicolor-icon-theme }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "clipit-${version}"; name = "clipit-${version}";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool gtk2 xdotool hicolor_icon_theme ]; buildInputs = [ intltool gtk2 xdotool hicolor-icon-theme ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Lightweight GTK+ Clipboard Manager"; description = "Lightweight GTK+ Clipboard Manager";

4
pkgs/applications/misc/deepin-terminal/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, vte, libgee, wnck, zssh, gettext, librsvg, libsecret, json_glib, gobjectIntrospection }: { stdenv, fetchurl, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, vte, libgee, wnck, zssh, gettext, librsvg, libsecret, json-glib, gobjectIntrospection }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "deepin-terminal-${version}"; name = "deepin-terminal-${version}";
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
# For setup hook # For setup hook
gobjectIntrospection gobjectIntrospection
]; ];
buildInputs = [ gtk3 vte libgee wnck librsvg libsecret json_glib ]; buildInputs = [ gtk3 vte libgee wnck librsvg libsecret json-glib ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "The default terminal emulation for Deepin"; description = "The default terminal emulation for Deepin";

8
pkgs/applications/misc/finalterm/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper { stdenv, lib, fetchFromGitHub, makeWrapper
, pkgconfig, cmake, libxml2, vala_0_26, intltool, libmx, gnome3, gtk3, gtk_doc , pkgconfig, cmake, libxml2, vala_0_26, intltool, libmx, gnome3, gtk3, gtk-doc
, keybinder3, clutter_gtk, libnotify , keybinder3, clutter-gtk, libnotify
, libxkbcommon, xorg, udev , libxkbcommon, xorg, udev
, bashInteractive , bashInteractive
}: }:
@ -19,8 +19,8 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig cmake intltool makeWrapper ]; nativeBuildInputs = [ pkgconfig cmake intltool makeWrapper ];
buildInputs = [ buildInputs = [
vala_0_26 gtk3 gnome3.gnome_common gnome3.libgee vala_0_26 gtk3 gnome3.gnome-common gnome3.libgee
gtk_doc clutter_gtk libmx keybinder3 libxml2 libnotify gtk-doc clutter-gtk libmx keybinder3 libxml2 libnotify
xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence
libxkbcommon libxkbcommon
] ++ optionals stdenv.isLinux [ udev ]; ] ++ optionals stdenv.isLinux [ udev ];

6
pkgs/applications/misc/font-manager/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, automake, autoconf, libtool, { stdenv, fetchFromGitHub, automake, autoconf, libtool,
pkgconfig, file, intltool, libxml2, json_glib , sqlite, itstool, pkgconfig, file, intltool, libxml2, json-glib , sqlite, itstool,
librsvg, vala_0_34, gnome3, wrapGAppsHook, gobjectIntrospection librsvg, vala_0_34, gnome3, wrapGAppsHook, gobjectIntrospection
}: }:
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
file file
intltool intltool
vala_0_34 vala_0_34
gnome3.yelp_tools gnome3.yelp-tools
wrapGAppsHook wrapGAppsHook
# For setup hook # For setup hook
gobjectIntrospection gobjectIntrospection
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
libxml2 libxml2
json_glib json-glib
sqlite sqlite
itstool itstool
librsvg librsvg

6
pkgs/applications/misc/gksu/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gtk2, gnome3, libgksu, { stdenv, fetchurl, pkgconfig, gtk2, gnome3, libgksu,
intltool, libstartup_notification, gtk_doc, wrapGAppsHook intltool, libstartup_notification, gtk-doc, wrapGAppsHook
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -13,11 +13,11 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig intltool gtk_doc wrapGAppsHook pkgconfig intltool gtk-doc wrapGAppsHook
]; ];
buildInputs = [ buildInputs = [
gtk2 gnome3.gconf libstartup_notification gnome3.libgnome_keyring gtk2 gnome3.gconf libstartup_notification gnome3.libgnome-keyring
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/applications/misc/gmtp/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, libmtp, libid3tag, flac, libvorbis, gtk3 { stdenv, fetchurl, pkgconfig, libmtp, libid3tag, flac, libvorbis, gtk3
, gsettings_desktop_schemas, wrapGAppsHook , gsettings-desktop-schemas, wrapGAppsHook
}: }:
let version = "1.3.10"; in let version = "1.3.10"; in
@ -13,7 +13,7 @@ stdenv.mkDerivation {
}; };
nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
buildInputs = [ libmtp libid3tag flac libvorbis gtk3 gsettings_desktop_schemas ]; buildInputs = [ libmtp libid3tag flac libvorbis gtk3 gsettings-desktop-schemas ];
enableParallelBuilding = true; enableParallelBuilding = true;

6
pkgs/applications/misc/gpx-viewer/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, intltool, pkgconfig, gnome3, shared_mime_info, desktop_file_utils, wrapGAppsHook }: { stdenv, fetchurl, intltool, pkgconfig, gnome3, shared-mime-info, desktop-file-utils, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gpx-viewer-${version}"; name = "gpx-viewer-${version}";
@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
intltool pkgconfig intltool pkgconfig
shared_mime_info # For update-mime-database shared-mime-info # For update-mime-database
desktop_file_utils # For update-desktop-database desktop-file-utils # For update-desktop-database
wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system
]; ];
buildInputs = with gnome3; [ gdl libchamplain defaultIconTheme ]; buildInputs = with gnome3; [ gdl libchamplain defaultIconTheme ];

2
pkgs/applications/misc/gramps/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool, { stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool,
pango, gsettings_desktop_schemas, pango, gsettings-desktop-schemas,
# Optional packages: # Optional packages:
enableOSM ? true, osm-gps-map enableOSM ? true, osm-gps-map
}: }:

2
pkgs/applications/misc/guake/default.nix
View File

@ -17,7 +17,7 @@ with lib;
let let
inherit (python2Packages) python; inherit (python2Packages) python;
inputs = [ dbus gtk2 gconf python libutempter vte keybinder gnome3.gnome_common ]; inputs = [ dbus gtk2 gconf python libutempter vte keybinder gnome3.gnome-common ];
pyPath = makeSearchPathOutput "lib" python.sitePackages (attrVals [ "dbus-python" "notify" "pyGtkGlade" "pyxdg" ] python2Packages ++ [ gnome2.gnome_python ]); pyPath = makeSearchPathOutput "lib" python.sitePackages (attrVals [ "dbus-python" "notify" "pyGtkGlade" "pyxdg" ] python2Packages ++ [ gnome2.gnome_python ]);
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "guake-${version}"; name = "guake-${version}";

8
pkgs/applications/misc/hamster-time-tracker/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchzip, pythonPackages, docbook2x, libxslt, gnome_doc_utils { stdenv, fetchzip, pythonPackages, docbook2x, libxslt, gnome-doc-utils
, intltool, dbus_glib, gnome_python, dbus , intltool, dbus-glib, gnome_python, dbus
, hicolor_icon_theme , hicolor-icon-theme
}: }:
# TODO: Add optional dependency 'wnck', for "workspace tracking" support. Fixes # TODO: Add optional dependency 'wnck', for "workspace tracking" support. Fixes
@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec {
}; };
buildInputs = [ buildInputs = [
docbook2x libxslt gnome_doc_utils intltool dbus_glib hicolor_icon_theme docbook2x libxslt gnome-doc-utils intltool dbus-glib hicolor-icon-theme
]; ];
propagatedBuildInputs = with pythonPackages; [ pygobject2 pygtk pyxdg gnome_python dbus-python ]; propagatedBuildInputs = with pythonPackages; [ pygobject2 pygtk pyxdg gnome_python dbus-python ];

4
pkgs/applications/misc/kiwix/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, makeWrapper, pkgconfig { stdenv, fetchurl, makeWrapper, pkgconfig
, zip, python, zlib, which, icu, libmicrohttpd, lzma, aria2, wget, bc , zip, python, zlib, which, icu, libmicrohttpd, lzma, aria2, wget, bc
, libuuid, glibc, libX11, libXext, libXt, libXrender, glib, dbus, dbus_glib , libuuid, glibc, libX11, libXext, libXt, libXrender, glib, dbus, dbus-glib
, gtk2, gdk_pixbuf, pango, cairo, freetype, fontconfig, alsaLib, atk, cmake , gtk2, gdk_pixbuf, pango, cairo, freetype, fontconfig, alsaLib, atk, cmake
, xapian, ctpp2, zimlib , xapian, ctpp2, zimlib
}: }:
@ -93,7 +93,7 @@ stdenv.mkDerivation rec {
rm $out/bin/kiwix rm $out/bin/kiwix
makeWrapper $out/lib/kiwix/kiwix-launcher $out/bin/kiwix \ makeWrapper $out/lib/kiwix/kiwix-launcher $out/bin/kiwix \
--suffix LD_LIBRARY_PATH : ${makeLibraryPath [stdenv.cc.cc libX11 libXext libXt libXrender glib dbus dbus_glib gtk2 gdk_pixbuf pango cairo freetype fontconfig alsaLib atk]} \ --suffix LD_LIBRARY_PATH : ${makeLibraryPath [stdenv.cc.cc libX11 libXext libXt libXrender glib dbus dbus-glib gtk2 gdk_pixbuf pango cairo freetype fontconfig alsaLib atk]} \
--suffix PATH : ${aria2}/bin --suffix PATH : ${aria2}/bin
''; '';

4
pkgs/applications/misc/kupfer/default.nix
View File

@ -8,7 +8,7 @@
, dbus , dbus
, libwnck3 , libwnck3
, keybinder3 , keybinder3
, hicolor_icon_theme , hicolor-icon-theme
, wrapGAppsHook , wrapGAppsHook
}: }:
@ -28,7 +28,7 @@ buildPythonApplication rec {
# For setup hook # For setup hook
gobjectIntrospection gobjectIntrospection
]; ];
buildInputs = [ hicolor_icon_theme docutils libwnck3 keybinder3 ]; buildInputs = [ hicolor-icon-theme docutils libwnck3 keybinder3 ];
propagatedBuildInputs = [ pygobject3 gtk3 pyxdg dbus-python pycairo ]; propagatedBuildInputs = [ pygobject3 gtk3 pyxdg dbus-python pycairo ];
configurePhase = '' configurePhase = ''

4
pkgs/applications/misc/mediainfo-gui/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, wxGTK { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, wxGTK
, desktop_file_utils, libSM, imagemagick }: , desktop-file-utils, libSM, imagemagick }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "17.10"; version = "17.10";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ libzen libmediainfo wxGTK desktop_file_utils libSM buildInputs = [ libzen libmediainfo wxGTK desktop-file-utils libSM
imagemagick ]; imagemagick ];
sourceRoot = "./MediaInfo/Project/GNU/GUI/"; sourceRoot = "./MediaInfo/Project/GNU/GUI/";

10
pkgs/applications/misc/mysql-workbench/default.nix
View File

@ -1,8 +1,8 @@
{ stdenv, fetchurl, makeWrapper, cmake, pkgconfig { stdenv, fetchurl, makeWrapper, cmake, pkgconfig
, glibc, gnome_keyring, gtk, gtkmm, pcre, swig, sudo , glibc, gnome-keyring, gtk, gtkmm, pcre, swig, sudo
, mysql, libxml2, libctemplate, libmysqlconnectorcpp , mysql, libxml2, libctemplate, libmysqlconnectorcpp
, vsqlite, tinyxml, gdal, libiodbc, libpthreadstubs , vsqlite, tinyxml, gdal, libiodbc, libpthreadstubs
, libXdmcp, libuuid, libzip, libgnome_keyring, file , libXdmcp, libuuid, libzip, libgnome-keyring, file
, pythonPackages, jre, autoconf, automake, libtool , pythonPackages, jre, autoconf, automake, libtool
, boost, glibmm, libsigcxx, pangomm, libX11, openssl , boost, glibmm, libsigcxx, pangomm, libX11, openssl
, proj, cairo, libglade , proj, cairo, libglade
@ -21,9 +21,9 @@ in stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake gnome_keyring gtk gtk.dev gtkmm pcre swig python sudo buildInputs = [ cmake gnome-keyring gtk gtk.dev gtkmm pcre swig python sudo
paramiko mysql libxml2 libctemplate libmysqlconnectorcpp vsqlite tinyxml gdal libiodbc file paramiko mysql libxml2 libctemplate libmysqlconnectorcpp vsqlite tinyxml gdal libiodbc file
libpthreadstubs libXdmcp libuuid libzip libgnome_keyring libgnome_keyring.dev jre autoconf libpthreadstubs libXdmcp libuuid libzip libgnome-keyring libgnome-keyring.dev jre autoconf
automake libtool boost glibmm glibmm.dev libsigcxx pangomm libX11 pexpect pycrypto openssl automake libtool boost glibmm glibmm.dev libsigcxx pangomm libX11 pexpect pycrypto openssl
proj cairo cairo.dev makeWrapper libglade ] ; proj cairo cairo.dev makeWrapper libglade ] ;
@ -82,7 +82,7 @@ in stdenv.mkDerivation rec {
wrapProgram "$out/bin/mysql-workbench" \ wrapProgram "$out/bin/mysql-workbench" \
--prefix LD_LIBRARY_PATH : "${python}/lib" \ --prefix LD_LIBRARY_PATH : "${python}/lib" \
--prefix LD_LIBRARY_PATH : "$(cat ${stdenv.cc}/nix-support/orig-cc)/lib64" \ --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.cc}/nix-support/orig-cc)/lib64" \
--prefix PATH : "${gnome_keyring}/bin" \ --prefix PATH : "${gnome-keyring}/bin" \
--prefix PATH : "${python}/bin" \ --prefix PATH : "${python}/bin" \
--set PYTHONPATH $PYTHONPATH \ --set PYTHONPATH $PYTHONPATH \
--run ' --run '

6
pkgs/applications/misc/notify-osd/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, glib, libwnck3, libnotify, dbus_glib, makeWrapper, gnome3 }: { stdenv, fetchurl, pkgconfig, glib, libwnck3, libnotify, dbus-glib, makeWrapper, gnome3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "notify-osd-${version}"; name = "notify-osd-${version}";
@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
glib libwnck3 libnotify dbus_glib makeWrapper glib libwnck3 libnotify dbus-glib makeWrapper
gnome3.gsettings_desktop_schemas gnome3.gsettings-desktop-schemas
]; ];
configureFlags = "--libexecdir=$(out)/bin"; configureFlags = "--libexecdir=$(out)/bin";

12
pkgs/applications/misc/onboard/default.nix
View File

@ -1,21 +1,21 @@
{ fetchurl { fetchurl
, stdenv , stdenv
, aspellWithDicts , aspellWithDicts
, at_spi2_core ? null , at-spi2-core ? null
, atspiSupport ? true , atspiSupport ? true
, bash , bash
, glib , glib
, glibcLocales , glibcLocales
, gnome3 , gnome3
, gobjectIntrospection , gobjectIntrospection
, gsettings_desktop_schemas , gsettings-desktop-schemas
, gtk3 , gtk3
, hunspell , hunspell
, hunspellDicts , hunspellDicts
, hunspellWithDicts , hunspellWithDicts
, intltool , intltool
, isocodes , isocodes
, libcanberra_gtk3 , libcanberra-gtk3
, libudev , libudev
, libxkbcommon , libxkbcommon
, pkgconfig , pkgconfig
@ -74,17 +74,17 @@ in python3.pkgs.buildPythonApplication rec {
buildInputs = [ buildInputs = [
bash bash
gnome3.dconf gnome3.dconf
gsettings_desktop_schemas gsettings-desktop-schemas
gtk3 gtk3
hunspell hunspell
isocodes isocodes
libcanberra_gtk3 libcanberra-gtk3
libudev libudev
libxkbcommon libxkbcommon
wrapGAppsHook wrapGAppsHook
xorg.libXtst xorg.libXtst
xorg.libxkbfile xorg.libxkbfile
] ++ stdenv.lib.optional atspiSupport at_spi2_core; ] ++ stdenv.lib.optional atspiSupport at-spi2-core;
nativeBuildInputs = [ nativeBuildInputs = [
glibcLocales glibcLocales

10
pkgs/applications/misc/orca/default.nix
View File

@ -1,9 +1,9 @@
{ stdenv, lib, pkgconfig, fetchurl, buildPythonApplication { stdenv, lib, pkgconfig, fetchurl, buildPythonApplication
, autoreconfHook, wrapGAppsHook , autoreconfHook, wrapGAppsHook
, intltool, yelp_tools, itstool, libxmlxx3 , intltool, yelp-tools, itstool, libxmlxx3
, python, pygobject3, gtk3, gnome3, substituteAll , python, pygobject3, gtk3, gnome3, substituteAll
, at_spi2_atk, at_spi2_core, pyatspi, dbus, dbus-python, pyxdg , at-spi2-atk, at-spi2-core, pyatspi, dbus, dbus-python, pyxdg
, xkbcomp, gsettings_desktop_schemas, liblouis , xkbcomp, gsettings-desktop-schemas, liblouis
, speechd, brltty, setproctitle, gst_all_1, gst-python , speechd, brltty, setproctitle, gst_all_1, gst-python
}: }:
@ -30,7 +30,7 @@ in buildPythonApplication rec {
nativeBuildInputs = [ nativeBuildInputs = [
autoreconfHook wrapGAppsHook pkgconfig libxmlxx3 autoreconfHook wrapGAppsHook pkgconfig libxmlxx3
intltool yelp_tools itstool intltool yelp-tools itstool
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -38,7 +38,7 @@ in buildPythonApplication rec {
]; ];
buildInputs = [ buildInputs = [
python gtk3 at_spi2_atk at_spi2_core dbus gsettings_desktop_schemas python gtk3 at-spi2-atk at-spi2-core dbus gsettings-desktop-schemas
gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
]; ];

4
pkgs/applications/misc/pdfmod/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, gnome_doc_utils, intltool, lib { stdenv, fetchurl, fetchpatch, pkgconfig, gnome-doc-utils, intltool, lib
, mono, gtk-sharp-2_0, gnome-sharp, hyena , mono, gtk-sharp-2_0, gnome-sharp, hyena
, which, makeWrapper, glib, gnome3, poppler, wrapGAppsHook , which, makeWrapper, glib, gnome3, poppler, wrapGAppsHook
}: }:
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
gnome_doc_utils intltool mono gtk-sharp-2_0 gnome-sharp gnome-doc-utils intltool mono gtk-sharp-2_0 gnome-sharp
hyena which makeWrapper wrapGAppsHook hyena which makeWrapper wrapGAppsHook
]; ];

6
pkgs/applications/misc/pdfshuffler/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchsvn { stdenv, fetchsvn
, wrapGAppsHook, makeWrapper, gettext , wrapGAppsHook, makeWrapper, gettext
, python3Packages, gtk3, poppler_gi , python3Packages, gtk3, poppler_gi
, gnome3, gsettings_desktop_schemas, shared_mime_info, , gnome3, gsettings-desktop-schemas, shared-mime-info,
}: }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec {
nativeBuildInputs = [ wrapGAppsHook gettext makeWrapper ]; nativeBuildInputs = [ wrapGAppsHook gettext makeWrapper ];
buildInputs = [ buildInputs = [
gtk3 gsettings_desktop_schemas poppler_gi gnome3.adwaita-icon-theme gtk3 gsettings-desktop-schemas poppler_gi gnome3.adwaita-icon-theme
]; ];
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = with python3Packages; [
@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec {
]; ];
preFixup = '' preFixup = ''
gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared_mime_info}/share") gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share")
''; '';
doCheck = false; # no tests doCheck = false; # no tests

12
pkgs/applications/misc/roxterm/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, docbook_xsl, dbus_libs, dbus_glib, expat, gettext { stdenv, fetchurl, docbook_xsl, dbus_libs, dbus-glib, expat, gettext
, gsettings_desktop_schemas, gdk_pixbuf, gtk2, gtk3, hicolor_icon_theme , gsettings-desktop-schemas, gdk_pixbuf, gtk2, gtk3, hicolor-icon-theme
, imagemagick, itstool, librsvg, libtool, libxslt, lockfile, makeWrapper , imagemagick, itstool, librsvg, libtool, libxslt, lockfile, makeWrapper
, pkgconfig, python, pythonPackages, vte , pkgconfig, python, pythonPackages, vte
, wrapGAppsHook}: , wrapGAppsHook}:
@ -22,11 +22,11 @@ in stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ docbook_xsl expat imagemagick itstool librsvg libtool libxslt [ docbook_xsl expat imagemagick itstool librsvg libtool libxslt
makeWrapper python pythonPackages.lockfile dbus_libs dbus_glib makeWrapper python pythonPackages.lockfile dbus_libs dbus-glib
gdk_pixbuf gsettings_desktop_schemas gtk3 gdk_pixbuf gsettings-desktop-schemas gtk3
hicolor_icon_theme vte ]; hicolor-icon-theme vte ];
NIX_CFLAGS_COMPILE = [ "-I${dbus_glib.dev}/include/dbus-1.0" NIX_CFLAGS_COMPILE = [ "-I${dbus-glib.dev}/include/dbus-1.0"
"-I${dbus_libs.dev}/include/dbus-1.0" "-I${dbus_libs.dev}/include/dbus-1.0"
"-I${dbus_libs.lib}/lib/dbus-1.0/include" ]; "-I${dbus_libs.lib}/lib/dbus-1.0/include" ];

4
pkgs/applications/misc/simplenote/default.nix
View File

@ -1,5 +1,5 @@
{ fetchurl, stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig { fetchurl, stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig
, libgnome_keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr , libgnome-keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr
, nss, xorg, libcap, systemd, libnotify ,libXScrnSaver, gnome3 }: , nss, xorg, libcap, systemd, libnotify ,libXScrnSaver, gnome3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -15,7 +15,7 @@
buildCommand = let buildCommand = let
packages = [ packages = [
stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome_keyring3 stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3
fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr nss fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr nss
xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr

8
pkgs/applications/misc/spacefm/default.nix
View File

@ -1,6 +1,6 @@
{ pkgs, fetchFromGitHub, stdenv, gtk3, udev, desktop_file_utils { pkgs, fetchFromGitHub, stdenv, gtk3, udev, desktop-file-utils
, shared_mime_info, intltool, pkgconfig, wrapGAppsHook, ffmpegthumbnailer , shared-mime-info, intltool, pkgconfig, wrapGAppsHook, ffmpegthumbnailer
, jmtpfs, ifuseSupport ? false, ifuse ? null, lsof, udisks, hicolor_icon_theme, adwaita-icon-theme }: , jmtpfs, ifuseSupport ? false, ifuse ? null, lsof, udisks, hicolor-icon-theme, adwaita-icon-theme }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "spacefm-${version}"; name = "spacefm-${version}";
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
gtk3 udev desktop_file_utils shared_mime_info intltool gtk3 udev desktop-file-utils shared-mime-info intltool
wrapGAppsHook ffmpegthumbnailer jmtpfs lsof udisks wrapGAppsHook ffmpegthumbnailer jmtpfs lsof udisks
] ++ (if ifuseSupport then [ ifuse ] else []); ] ++ (if ifuseSupport then [ ifuse ] else []);
# Introduced because ifuse doesn't build due to CVEs in libplist # Introduced because ifuse doesn't build due to CVEs in libplist

6
pkgs/applications/misc/sweethome3d/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant { lib, stdenv, fetchurl, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant
, gtk3, gsettings_desktop_schemas, p7zip, libXxf86vm }: , gtk3, gsettings-desktop-schemas, p7zip, libXxf86vm }:
let let
@ -36,7 +36,7 @@ let
patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/i586/libnativewindow_x11.so patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/i586/libnativewindow_x11.so
''; '';
buildInputs = [ ant jdk jre makeWrapper p7zip gtk3 gsettings_desktop_schemas ]; buildInputs = [ ant jdk jre makeWrapper p7zip gtk3 gsettings-desktop-schemas ];
buildPhase = '' buildPhase = ''
ant furniture textures help ant furniture textures help
@ -54,7 +54,7 @@ let
cp "${sweethome3dItem}/share/applications/"* $out/share/applications cp "${sweethome3dItem}/share/applications/"* $out/share/applications
makeWrapper ${jre}/bin/java $out/bin/$exec \ makeWrapper ${jre}/bin/java $out/bin/$exec \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings_desktop_schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings-desktop-schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \
--add-flags "-jar $out/share/java/${module}-${version}.jar -cp $out/share/java/Furniture.jar:$out/share/java/Textures.jar:$out/share/java/Help.jar ${if stdenv.system == "x86_64-linux" then "-d64" else "-d32"}" --add-flags "-jar $out/share/java/${module}-${version}.jar -cp $out/share/java/Furniture.jar:$out/share/java/Textures.jar:$out/share/java/Help.jar ${if stdenv.system == "x86_64-linux" then "-d64" else "-d32"}"
''; '';

6
pkgs/applications/misc/sweethome3d/editors.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant { stdenv, fetchurl, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant
, gtk3, gsettings_desktop_schemas, p7zip, sweethome3dApp }: , gtk3, gsettings-desktop-schemas, p7zip, sweethome3dApp }:
let let
@ -26,7 +26,7 @@ let
categories = "Application;Graphics;2DGraphics;3DGraphics;"; categories = "Application;Graphics;2DGraphics;3DGraphics;";
}; };
buildInputs = [ ant jre jdk makeWrapper gtk3 gsettings_desktop_schemas ]; buildInputs = [ ant jre jdk makeWrapper gtk3 gsettings-desktop-schemas ];
patchPhase = '' patchPhase = ''
sed -i -e 's,../SweetHome3D,${application.src},g' build.xml sed -i -e 's,../SweetHome3D,${application.src},g' build.xml
@ -43,7 +43,7 @@ let
cp ${module}-${version}.jar $out/share/java/. cp ${module}-${version}.jar $out/share/java/.
cp "${editorItem}/share/applications/"* $out/share/applications cp "${editorItem}/share/applications/"* $out/share/applications
makeWrapper ${jre}/bin/java $out/bin/$exec \ makeWrapper ${jre}/bin/java $out/bin/$exec \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings_desktop_schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings-desktop-schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \
--add-flags "-jar $out/share/java/${module}-${version}.jar ${if stdenv.system == "x86_64-linux" then "-d64" else "-d32"}" --add-flags "-jar $out/share/java/${module}-${version}.jar ${if stdenv.system == "x86_64-linux" then "-d64" else "-d32"}"
''; '';

6
pkgs/applications/misc/synapse/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, gettext, pkgconfig, glib, libnotify, gtk3, libgee { stdenv, fetchurl, gettext, pkgconfig, glib, libnotify, gtk3, libgee
, keybinder3, json_glib, zeitgeist, vala_0_38, hicolor_icon_theme, gobjectIntrospection , keybinder3, json-glib, zeitgeist, vala_0_38, hicolor-icon-theme, gobjectIntrospection
}: }:
let let
@ -18,8 +18,8 @@ in stdenv.mkDerivation rec {
gobjectIntrospection gobjectIntrospection
]; ];
buildInputs = [ buildInputs = [
glib libnotify gtk3 libgee keybinder3 json_glib zeitgeist glib libnotify gtk3 libgee keybinder3 json-glib zeitgeist
hicolor_icon_theme hicolor-icon-theme
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

6
pkgs/applications/misc/tilix/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, dmd, gnome3, dbus { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, dmd, gnome3, dbus
, gsettings_desktop_schemas, libsecret, desktop_file_utils, gettext, gtkd , gsettings-desktop-schemas, libsecret, desktop-file-utils, gettext, gtkd
, perlPackages, wrapGAppsHook, xdg_utils }: , perlPackages, wrapGAppsHook, xdg_utils }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -14,10 +14,10 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ nativeBuildInputs = [
autoreconfHook dmd desktop_file_utils perlPackages.Po4a pkgconfig xdg_utils autoreconfHook dmd desktop-file-utils perlPackages.Po4a pkgconfig xdg_utils
wrapGAppsHook wrapGAppsHook
]; ];
buildInputs = [ gnome3.dconf gettext gsettings_desktop_schemas gtkd dbus ]; buildInputs = [ gnome3.dconf gettext gsettings-desktop-schemas gtkd dbus ];
preBuild = '' preBuild = ''
makeFlagsArray=(PERL5LIB="${perlPackages.Po4a}/lib/perl5") makeFlagsArray=(PERL5LIB="${perlPackages.Po4a}/lib/perl5")

4
pkgs/applications/misc/tint2/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitLab, pkgconfig, cmake, gettext, cairo, pango, pcre { stdenv, fetchFromGitLab, pkgconfig, cmake, gettext, cairo, pango, pcre
, glib, imlib2, gtk2, libXinerama, libXrender, libXcomposite, libXdamage , glib, imlib2, gtk2, libXinerama, libXrender, libXcomposite, libXdamage
, libX11, libXrandr, librsvg, libpthreadstubs, libXdmcp , libX11, libXrandr, librsvg, libpthreadstubs, libXdmcp
, libstartup_notification, hicolor_icon_theme, wrapGAppsHook , libstartup_notification, hicolor-icon-theme, wrapGAppsHook
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
buildInputs = [ cairo pango pcre glib imlib2 gtk2 libXinerama libXrender buildInputs = [ cairo pango pcre glib imlib2 gtk2 libXinerama libXrender
libXcomposite libXdamage libX11 libXrandr librsvg libpthreadstubs libXcomposite libXdamage libX11 libXrandr librsvg libpthreadstubs
libXdmcp libstartup_notification hicolor_icon_theme ]; libXdmcp libstartup_notification hicolor-icon-theme ];
postPatch = '' postPatch = ''
substituteInPlace CMakeLists.txt --replace /etc $out/etc substituteInPlace CMakeLists.txt --replace /etc $out/etc

4
pkgs/applications/misc/udiskie/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, asciidoc-full, gettext { stdenv, fetchFromGitHub, asciidoc-full, gettext
, gobjectIntrospection, gtk3, hicolor_icon_theme, libnotify, librsvg , gobjectIntrospection, gtk3, hicolor-icon-theme, libnotify, librsvg
, udisks2, wrapGAppsHook , udisks2, wrapGAppsHook
, buildPythonApplication , buildPythonApplication
, docopt , docopt
@ -21,7 +21,7 @@ buildPythonApplication rec {
buildInputs = [ buildInputs = [
asciidoc-full # For building man page. asciidoc-full # For building man page.
hicolor_icon_theme hicolor-icon-theme
wrapGAppsHook wrapGAppsHook
librsvg # required for loading svg icons (udiskie uses svg icons) librsvg # required for loading svg icons (udiskie uses svg icons)
]; ];

4
pkgs/applications/misc/viking/default.nix
View File

@ -1,5 +1,5 @@
{ fetchurl, stdenv, makeWrapper, pkgconfig, intltool, gettext, gtk2, expat, curl { fetchurl, stdenv, makeWrapper, pkgconfig, intltool, gettext, gtk2, expat, curl
, gpsd, bc, file, gnome_doc_utils, libexif, libxml2, libxslt, scrollkeeper , gpsd, bc, file, gnome-doc-utils, libexif, libxml2, libxslt, scrollkeeper
, docbook_xml_dtd_412, gexiv2, sqlite, gpsbabel, expect }: , docbook_xml_dtd_412, gexiv2, sqlite, gpsbabel, expect }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ makeWrapper intltool gettext gtk2 expat curl gpsd bc file gnome_doc_utils buildInputs = [ makeWrapper intltool gettext gtk2 expat curl gpsd bc file gnome-doc-utils
libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 sqlite libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 sqlite
]; ];

4
pkgs/applications/misc/volnoti/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, fetchpatch { stdenv, fetchFromGitHub, fetchpatch
, pkgconfig, dbus, gdk_pixbuf, glib, libX11, gtk2, librsvg , pkgconfig, dbus, gdk_pixbuf, glib, libX11, gtk2, librsvg
, dbus_glib, autoreconfHook, wrapGAppsHook }: , dbus-glib, autoreconfHook, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "volnoti-unstable-${version}"; name = "volnoti-unstable-${version}";
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig autoreconfHook wrapGAppsHook ]; nativeBuildInputs = [ pkgconfig autoreconfHook wrapGAppsHook ];
buildInputs = [ buildInputs = [
dbus gdk_pixbuf glib libX11 gtk2 dbus_glib librsvg dbus gdk_pixbuf glib libX11 gtk2 dbus-glib librsvg
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

4
pkgs/applications/misc/workrave/default.nix
View File

@ -2,7 +2,7 @@
, autoconf, automake, gettext, intltool, libtool, pkgconfig , autoconf, automake, gettext, intltool, libtool, pkgconfig
, libICE, libSM, libXScrnSaver, libXtst, cheetah , libICE, libSM, libXScrnSaver, libXtst, cheetah
, glib, glibmm, gtkmm2, atk, pango, pangomm, cairo, cairomm , glib, glibmm, gtkmm2, atk, pango, pangomm, cairo, cairomm
, dbus, dbus_glib, GConf, gconfmm, gdome2, gstreamer, libsigcxx }: , dbus, dbus-glib, GConf, gconfmm, gdome2, gstreamer, libsigcxx }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "workrave-${version}"; name = "workrave-${version}";
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
libICE libSM libXScrnSaver libXtst cheetah libICE libSM libXScrnSaver libXtst cheetah
glib glibmm gtkmm2 atk pango pangomm cairo cairomm glib glibmm gtkmm2 atk pango pangomm cairo cairomm
dbus dbus_glib GConf gconfmm gdome2 gstreamer libsigcxx dbus dbus-glib GConf gconfmm gdome2 gstreamer libsigcxx
]; ];
preConfigure = "./autogen.sh"; preConfigure = "./autogen.sh";

8
pkgs/applications/misc/xiphos/default.nix
View File

@ -3,11 +3,11 @@
, intltool , intltool
, docbook2x, docbook_xml_dtd_412, libxslt , docbook2x, docbook_xml_dtd_412, libxslt
, sword, clucene_core, biblesync , sword, clucene_core, biblesync
, gnome_doc_utils , gnome-doc-utils
, libgsf, gconf , libgsf, gconf
, gtkhtml, libglade, scrollkeeper , gtkhtml, libglade, scrollkeeper
, webkitgtk , webkitgtk
, dbus_glib, enchant, isocodes, libuuid, icu , dbus-glib, enchant, isocodes, libuuid, icu
, wrapGAppsHook , wrapGAppsHook
}: }:
@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
buildInputs = [ python intltool docbook2x docbook_xml_dtd_412 libxslt buildInputs = [ python intltool docbook2x docbook_xml_dtd_412 libxslt
sword clucene_core biblesync gnome_doc_utils libgsf gconf gtkhtml sword clucene_core biblesync gnome-doc-utils libgsf gconf gtkhtml
libglade scrollkeeper webkitgtk dbus_glib enchant isocodes libuuid icu ]; libglade scrollkeeper webkitgtk dbus-glib enchant isocodes libuuid icu ];
prePatch = '' prePatch = ''
patchShebangs .; patchShebangs .;

8
pkgs/applications/networking/browsers/chromium/common.nix
View File

@ -11,7 +11,7 @@
, nspr, systemd, kerberos , nspr, systemd, kerberos
, utillinux, alsaLib , utillinux, alsaLib
, bison, gperf , bison, gperf
, glib, gtk2, gtk3, dbus_glib , glib, gtk2, gtk3, dbus-glib
, libXScrnSaver, libXcursor, libXtst, mesa , libXScrnSaver, libXcursor, libXtst, mesa
, protobuf, speechd, libXdamage, cups , protobuf, speechd, libXdamage, cups
, ffmpeg, harfbuzz, harfbuzz-icu, libxslt, libxml2 , ffmpeg, harfbuzz, harfbuzz-icu, libxslt, libxml2
@ -25,7 +25,7 @@
, enableHotwording ? false , enableHotwording ? false
, enableWideVine ? false , enableWideVine ? false
, gnomeSupport ? false, gnome ? null , gnomeSupport ? false, gnome ? null
, gnomeKeyringSupport ? false, libgnome_keyring3 ? null , gnomeKeyringSupport ? false, libgnome-keyring3 ? null
, proprietaryCodecs ? true , proprietaryCodecs ? true
, cupsSupport ? true , cupsSupport ? true
, pulseSupport ? false, libpulseaudio ? null , pulseSupport ? false, libpulseaudio ? null
@ -125,10 +125,10 @@ let
nspr nss systemd nspr nss systemd
utillinux alsaLib utillinux alsaLib
bison gperf kerberos bison gperf kerberos
glib gtk2 gtk3 dbus_glib glib gtk2 gtk3 dbus-glib
libXScrnSaver libXcursor libXtst mesa libXScrnSaver libXcursor libXtst mesa
pciutils protobuf speechd libXdamage pciutils protobuf speechd libXdamage
] ++ optional gnomeKeyringSupport libgnome_keyring3 ] ++ optional gnomeKeyringSupport libgnome-keyring3
++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
++ optionals cupsSupport [ libgcrypt cups ] ++ optionals cupsSupport [ libgcrypt cups ]
++ optional pulseSupport libpulseaudio; ++ optional pulseSupport libpulseaudio;

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