commit a31d98f3120e0f676303b7fc3e84424e6b325290 · pyrox.dev/nixpkgs

+7 -7

nixos/modules/config/no-x-libs.nix

···

       28
       28
        
       

     

       29
       29
        
           nixpkgs.config.packageOverrides = pkgs: {

     

       30
       30
        
             dbus = pkgs.dbus.override { x11Support = false; };

     

       31
       31
       -
             networkmanager_fortisslvpn = pkgs.networkmanager_fortisslvpn.override { withGnome = false; };

     

       32
       32
       -
             networkmanager_l2tp = pkgs.networkmanager_l2tp.override { withGnome = false; };

     

       33
       33
       -
             networkmanager_openconnect = pkgs.networkmanager_openconnect.override { withGnome = false; };

     

       34
       34
       -
             networkmanager_openvpn = pkgs.networkmanager_openvpn.override { withGnome = false; };

     

       35
       35
       -
             networkmanager_pptp = pkgs.networkmanager_pptp.override { withGnome = false; };

     

       36
       36
       -
             networkmanager_vpnc = pkgs.networkmanager_vpnc.override { withGnome = false; };

     

       37
       37
       -
             networkmanager_iodine = pkgs.networkmanager_iodine.override { withGnome = false; };

     

       31
       31
       +
             networkmanager-fortisslvpn = pkgs.networkmanager-fortisslvpn.override { withGnome = false; };

     

       32
       32
       +
             networkmanager-l2tp = pkgs.networkmanager-l2tp.override { withGnome = false; };

     

       33
       33
       +
             networkmanager-openconnect = pkgs.networkmanager-openconnect.override { withGnome = false; };

     

       34
       34
       +
             networkmanager-openvpn = pkgs.networkmanager-openvpn.override { withGnome = false; };

     

       35
       35
       +
             networkmanager-pptp = pkgs.networkmanager-pptp.override { withGnome = false; };

     

       36
       36
       +
             networkmanager-vpnc = pkgs.networkmanager-vpnc.override { withGnome = false; };

     

       37
       37
       +
             networkmanager-iodine = pkgs.networkmanager-iodine.override { withGnome = false; };

     

       38
       38
        
             pinentry = pkgs.pinentry_ncurses;

     

       39
       39
        
           };

     

       40
       40
        
         };

+1 -1

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

···

       69
       69
        
         in ''

     

       70
       70
        
           mkdir -p /root/Desktop

     

       71
       71
        
           ln -sfT ${desktopFile} /root/Desktop/nixos-manual.desktop

     

       72
       72
       -
           cp ${pkgs.gnome3.gnome_terminal}/share/applications/gnome-terminal.desktop /root/Desktop/gnome-terminal.desktop

     

       72
       72
       +
           cp ${pkgs.gnome3.gnome-terminal}/share/applications/gnome-terminal.desktop /root/Desktop/gnome-terminal.desktop

     

       73
       73
        
           chmod a+rx /root/Desktop/gnome-terminal.desktop

     

       74
       74
        
           cp ${pkgs.gparted}/share/applications/gparted.desktop /root/Desktop/gparted.desktop

     

       75
       75
        
           chmod a+rx /root/Desktop/gparted.desktop

+1 -1

nixos/modules/programs/dconf.nix

···

       36
       36
        
             "${pkgs.gnome3.dconf.lib}/lib/gio/modules";

     

       37
       37
        
           # https://github.com/NixOS/nixpkgs/pull/31891

     

       38
       38
        
           #environment.variables.XDG_DATA_DIRS = optional cfg.enable

     

       39
       39
       -
           #  "$(echo ${pkgs.gnome3.gsettings_desktop_schemas}/share/gsettings-schemas/gsettings-desktop-schemas-*)";

     

       39
       39
       +
           #  "$(echo ${pkgs.gnome3.gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas-*)";

     

       40
       40
        
         };

     

       41
       41
        
       

     

       42
       42
        
       }

+2 -2

nixos/modules/security/pam.nix

···

       311
       311
        
                       ("auth optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" +

     

       312
       312
        
                        " kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")}

     

       313
       313
        
                     ${optionalString cfg.enableGnomeKeyring

     

       314
       314
       -
                       ("auth optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so")}

     

       314
       314
       +
                       ("auth optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so")}

     

       315
       315
        
                     ${optionalString cfg.googleAuthenticator.enable

     

       316
       316
        
                         "auth required ${pkgs.googleAuthenticator}/lib/security/pam_google_authenticator.so no_increment_hotp"}

     

       317
       317
        
                   '') + ''

     
···

       384
       384
        
                     ("session optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" +

     

       385
       385
        
                      " kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")}

     

       386
       386
        
                 ${optionalString (cfg.enableGnomeKeyring)

     

       387
       387
       -
                     "session optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start"}

     

       387
       387
       +
                     "session optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start"}

     

       388
       388
        
                 ${optionalString (config.virtualisation.lxc.lxcfs.enable)

     

       389
       389
        
                      "session optional ${pkgs.lxcfs}/lib/security/pam_cgfs.so -c freezer,memory,name=systemd,unified,cpuset"}

     

       390
       390
        
               '');

+3 -3

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

···

       30
       30
        
       

     

       31
       31
        
         config = mkMerge [

     

       32
       32
        
           (mkIf config.services.gnome3.at-spi2-core.enable {

     

       33
       33
       -
             environment.systemPackages = [ pkgs.at_spi2_core ];

     

       34
       34
       -
             services.dbus.packages = [ pkgs.at_spi2_core ];

     

       35
       35
       -
             systemd.packages = [ pkgs.at_spi2_core ];

     

       33
       33
       +
             environment.systemPackages = [ pkgs.at-spi2-core ];

     

       34
       34
       +
             services.dbus.packages = [ pkgs.at-spi2-core ];

     

       35
       35
       +
             systemd.packages = [ pkgs.at-spi2-core ];

     

       36
       36
        
           })

     

       37
       37
        
       

     

       38
       38
        
           (mkIf (!config.services.gnome3.at-spi2-core.enable) {

+3 -3

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

···

       30
       30
        
       

     

       31
       31
        
         config = mkIf config.services.gnome3.evolution-data-server.enable {

     

       32
       32
        
       

     

       33
       33
       -
           environment.systemPackages = [ pkgs.gnome3.evolution_data_server ];

     

       33
       33
       +
           environment.systemPackages = [ pkgs.gnome3.evolution-data-server ];

     

       34
       34
        
       

     

       35
       35
       -
           services.dbus.packages = [ pkgs.gnome3.evolution_data_server ];

     

       35
       35
       +
           services.dbus.packages = [ pkgs.gnome3.evolution-data-server ];

     

       36
       36
        
       

     

       37
       37
       -
           systemd.packages = [ pkgs.gnome3.evolution_data_server ];

     

       37
       37
       +
           systemd.packages = [ pkgs.gnome3.evolution-data-server ];

     

       38
       38
        
       

     

       39
       39
        
         };

     

       40
       40

+2 -2

nixos/modules/services/desktops/gnome3/gnome-keyring.nix

···

       31
       31
        
       

     

       32
       32
        
         config = mkIf config.services.gnome3.gnome-keyring.enable {

     

       33
       33
        
       

     

       34
       34
       -
           environment.systemPackages = [ pkgs.gnome3.gnome_keyring ];

     

       34
       34
       +
           environment.systemPackages = [ pkgs.gnome3.gnome-keyring ];

     

       35
       35
        
       

     

       36
       36
       -
           services.dbus.packages = [ pkgs.gnome3.gnome_keyring pkgs.gnome3.gcr ];

     

       36
       36
       +
           services.dbus.packages = [ pkgs.gnome3.gnome-keyring pkgs.gnome3.gcr ];

     

       37
       37
        
       

     

       38
       38
        
         };

     

       39
       39

+2 -2

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

···

       30
       30
        
       

     

       31
       31
        
         config = mkIf config.services.gnome3.gnome-online-accounts.enable {

     

       32
       32
        
       

     

       33
       33
       -
           environment.systemPackages = [ pkgs.gnome3.gnome_online_accounts ];

     

       33
       33
       +
           environment.systemPackages = [ pkgs.gnome3.gnome-online-accounts ];

     

       34
       34
        
       

     

       35
       35
       -
           services.dbus.packages = [ pkgs.gnome3.gnome_online_accounts ];

     

       35
       35
       +
           services.dbus.packages = [ pkgs.gnome3.gnome-online-accounts ];

     

       36
       36
        
       

     

       37
       37
        
         };

     

       38
       38

+3 -3

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

···

       30
       30
        
       

     

       31
       31
        
         config = mkIf config.services.gnome3.gnome-terminal-server.enable {

     

       32
       32
        
       

     

       33
       33
       -
           environment.systemPackages = [ pkgs.gnome3.gnome_terminal ];

     

       33
       33
       +
           environment.systemPackages = [ pkgs.gnome3.gnome-terminal ];

     

       34
       34
        
       

     

       35
       35
       -
           services.dbus.packages = [ pkgs.gnome3.gnome_terminal ];

     

       35
       35
       +
           services.dbus.packages = [ pkgs.gnome3.gnome-terminal ];

     

       36
       36
        
       

     

       37
       37
       -
           systemd.packages = [ pkgs.gnome3.gnome_terminal ];

     

       37
       37
       +
           systemd.packages = [ pkgs.gnome3.gnome-terminal ];

     

       38
       38
        
       

     

       39
       39
        
         };

     

       40
       40

+2 -2

nixos/modules/services/desktops/telepathy.nix

···

       30
       30
        
       

     

       31
       31
        
         config = mkIf config.services.telepathy.enable {

     

       32
       32
        
       

     

       33
       33
       -
           environment.systemPackages = [ pkgs.telepathy_mission_control ];

     

       33
       33
       +
           environment.systemPackages = [ pkgs.telepathy-mission-control ];

     

       34
       34
        
       

     

       35
       35
       -
           services.dbus.packages = [ pkgs.telepathy_mission_control ];

     

       35
       35
       +
           services.dbus.packages = [ pkgs.telepathy-mission-control ];

     

       36
       36
        
       

     

       37
       37
        
         };

     

       38
       38

+11 -11

nixos/modules/services/networking/networkmanager.nix

···

       133
       133
        
             basePackages = mkOption {

     

       134
       134
        
               type = types.attrsOf types.package;

     

       135
       135
        
               default = { inherit networkmanager modemmanager wpa_supplicant

     

       136
       136
       -
                                   networkmanager_openvpn networkmanager_vpnc

     

       137
       137
       -
                                   networkmanager_openconnect networkmanager_fortisslvpn

     

       138
       138
       -
                                   networkmanager_pptp networkmanager_l2tp

     

       139
       139
       -
                                   networkmanager_iodine; };

     

       136
       136
       +
                                   networkmanager-openvpn networkmanager-vpnc

     

       137
       137
       +
                                   networkmanager-openconnect networkmanager-fortisslvpn

     

       138
       138
       +
                                   networkmanager-pptp networkmanager-l2tp

     

       139
       139
       +
                                   networkmanager-iodine; };

     

       140
       140
        
               internal = true;

     

       141
       141
        
             };

     

       142
       142
        
       

     
···

       273
       273
        
             { source = configFile;

     

       274
       274
        
               target = "NetworkManager/NetworkManager.conf";

     

       275
       275
        
             }

     

       276
       276
       -
             { source = "${networkmanager_openvpn}/etc/NetworkManager/VPN/nm-openvpn-service.name";

     

       276
       276
       +
             { source = "${networkmanager-openvpn}/etc/NetworkManager/VPN/nm-openvpn-service.name";

     

       277
       277
        
               target = "NetworkManager/VPN/nm-openvpn-service.name";

     

       278
       278
        
             }

     

       279
       279
       -
             { source = "${networkmanager_vpnc}/etc/NetworkManager/VPN/nm-vpnc-service.name";

     

       279
       279
       +
             { source = "${networkmanager-vpnc}/etc/NetworkManager/VPN/nm-vpnc-service.name";

     

       280
       280
        
               target = "NetworkManager/VPN/nm-vpnc-service.name";

     

       281
       281
        
             }

     

       282
       282
       -
             { source = "${networkmanager_openconnect}/etc/NetworkManager/VPN/nm-openconnect-service.name";

     

       282
       282
       +
             { source = "${networkmanager-openconnect}/etc/NetworkManager/VPN/nm-openconnect-service.name";

     

       283
       283
        
               target = "NetworkManager/VPN/nm-openconnect-service.name";

     

       284
       284
        
             }

     

       285
       285
       -
             { source = "${networkmanager_fortisslvpn}/etc/NetworkManager/VPN/nm-fortisslvpn-service.name";

     

       285
       285
       +
             { source = "${networkmanager-fortisslvpn}/etc/NetworkManager/VPN/nm-fortisslvpn-service.name";

     

       286
       286
        
               target = "NetworkManager/VPN/nm-fortisslvpn-service.name";

     

       287
       287
        
             }

     

       288
       288
       -
             { source = "${networkmanager_pptp}/etc/NetworkManager/VPN/nm-pptp-service.name";

     

       288
       288
       +
             { source = "${networkmanager-pptp}/etc/NetworkManager/VPN/nm-pptp-service.name";

     

       289
       289
        
               target = "NetworkManager/VPN/nm-pptp-service.name";

     

       290
       290
        
             }

     

       291
       291
       -
             { source = "${networkmanager_l2tp}/etc/NetworkManager/VPN/nm-l2tp-service.name";

     

       291
       291
       +
             { source = "${networkmanager-l2tp}/etc/NetworkManager/VPN/nm-l2tp-service.name";

     

       292
       292
        
               target = "NetworkManager/VPN/nm-l2tp-service.name";

     

       293
       293
        
             }

     

       294
       294
        
             { source = "${networkmanager_strongswan}/etc/NetworkManager/VPN/nm-strongswan-service.name";

     

       295
       295
        
               target = "NetworkManager/VPN/nm-strongswan-service.name";

     

       296
       296
        
             }

     

       297
       297
       -
             { source = "${networkmanager_iodine}/etc/NetworkManager/VPN/nm-iodine-service.name";

     

       297
       297
       +
             { source = "${networkmanager-iodine}/etc/NetworkManager/VPN/nm-iodine-service.name";

     

       298
       298
        
               target = "NetworkManager/VPN/nm-iodine-service.name";

     

       299
       299
        
             }

     

       300
       300
        
           ] ++ optional (cfg.appendNameservers == [] || cfg.insertNameservers == [])

+1 -1

nixos/modules/services/x11/desktop-managers/enlightenment.nix

···

       33
       33
        
             pkgs.xorg.xauth # used by kdesu

     

       34
       34
        
             pkgs.gtk2 # To get GTK+'s themes.

     

       35
       35
        
             pkgs.tango-icon-theme

     

       36
       36
       -
             pkgs.shared_mime_info

     

       36
       36
       +
             pkgs.shared-mime-info

     

       37
       37
        
             pkgs.gnome2.gnomeicontheme

     

       38
       38
        
             pkgs.xorg.xcursorthemes

     

       39
       39
        
           ];

+9 -9

nixos/modules/services/x11/desktop-managers/gnome3.nix

···

       27
       27
        
         nixos-gsettings-desktop-schemas = pkgs.runCommand "nixos-gsettings-desktop-schemas" {}

     

       28
       28
        
           ''

     

       29
       29
        
            mkdir -p $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas

     

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

     

       30
       30
       +
            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

     

       31
       31
        
       

     

       32
       32
        
            ${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}

     

       33
       33
        
       

     
···

       60
       60
        
               example = literalExample "[ pkgs.gnome3.gpaste ]";

     

       61
       61
        
               description = "Additional list of packages to be added to the session search path.

     

       62
       62
        
                              Useful for gnome shell extensions or gsettings-conditionated autostart.";

     

       63
       63
       -
               apply = list: list ++ [ pkgs.gnome3.gnome_shell pkgs.gnome3.gnome-shell-extensions ];

     

       63
       63
       +
               apply = list: list ++ [ pkgs.gnome3.gnome-shell pkgs.gnome3.gnome-shell-extensions ];

     

       64
       64
        
             };

     

       65
       65
        
       

     

       66
       66
        
             extraGSettingsOverrides = mkOption {

     
···

       118
       118
        
           services.packagekit.enable = mkDefault true;

     

       119
       119
        
           hardware.bluetooth.enable = mkDefault true;

     

       120
       120
        
           services.xserver.libinput.enable = mkDefault true; # for controlling touchpad settings via gnome control center

     

       121
       121
       -
           services.udev.packages = [ pkgs.gnome3.gnome_settings_daemon ];

     

       121
       121
       +
           services.udev.packages = [ pkgs.gnome3.gnome-settings-daemon ];

     

       122
       122
        
           systemd.packages = [ pkgs.gnome3.vino ];

     

       123
       123
        
       

     

       124
       124
        
           # If gnome3 is installed, build vim for gtk3 too.

     
···

       164
       164
        
                 # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/

     

       165
       165
        
                 ${pkgs.xdg-user-dirs}/bin/xdg-user-dirs-update

     

       166
       166
        
       

     

       167
       167
       -
                 ${pkgs.gnome3.gnome_session}/bin/gnome-session ${optionalString cfg.debug "--debug"} &

     

       167
       167
       +
                 ${pkgs.gnome3.gnome-session}/bin/gnome-session ${optionalString cfg.debug "--debug"} &

     

       168
       168
        
                 waitPID=$!

     

       169
       169
        
               '';

     

       170
       170
        
             };

     
···

       172
       172
        
           services.xserver.updateDbusEnvironment = true;

     

       173
       173
        
       

     

       174
       174
        
           environment.variables.GIO_EXTRA_MODULES = [ "${lib.getLib pkgs.gnome3.dconf}/lib/gio/modules"

     

       175
       175
       -
                                                       "${pkgs.gnome3.glib_networking.out}/lib/gio/modules"

     

       175
       175
       +
                                                       "${pkgs.gnome3.glib-networking.out}/lib/gio/modules"

     

       176
       176
        
                                                       "${pkgs.gnome3.gvfs}/lib/gio/modules" ];

     

       177
       177
        
           environment.systemPackages = pkgs.gnome3.corePackages ++ cfg.sessionPath

     

       178
       178
        
             ++ (removePackagesByName pkgs.gnome3.optionalPackages config.environment.gnome3.excludePackages);

     
···

       180
       180
        
           # Use the correct gnome3 packageSet

     

       181
       181
        
           networking.networkmanager.basePackages =

     

       182
       182
        
             { inherit (pkgs) networkmanager modemmanager wpa_supplicant;

     

       183
       183
       -
               inherit (pkgs.gnome3) networkmanager_openvpn networkmanager_vpnc

     

       184
       184
       -
                                     networkmanager_openconnect networkmanager_fortisslvpn

     

       185
       185
       -
                                     networkmanager_pptp networkmanager_iodine

     

       186
       186
       -
                                     networkmanager_l2tp; };

     

       183
       183
       +
               inherit (pkgs.gnome3) networkmanager-openvpn networkmanager-vpnc

     

       184
       184
       +
                                     networkmanager-openconnect networkmanager-fortisslvpn

     

       185
       185
       +
                                     networkmanager-pptp networkmanager-iodine

     

       186
       186
       +
                                     networkmanager-l2tp; };

     

       187
       187
        
       

     

       188
       188
        
           # Needed for themes and backgrounds

     

       189
       189
        
           environment.pathsToLink = [ "/share" ];

+1 -1

nixos/modules/services/x11/desktop-managers/mate.nix

···

       102
       102
        
       

     

       103
       103
        
           services.dbus.packages = [

     

       104
       104
        
             pkgs.gnome3.dconf

     

       105
       105
       -
             pkgs.at_spi2_core

     

       105
       105
       +
             pkgs.at-spi2-core

     

       106
       106
        
           ];

     

       107
       107
        
       

     

       108
       108
        
           services.gnome3.gnome-keyring.enable = true;

+1 -1

nixos/modules/services/x11/desktop-managers/plasma5.nix

···

       154
       154
        
                 print-manager

     

       155
       155
        
       

     

       156
       156
        
                 breeze-icons

     

       157
       157
       -
                 pkgs.hicolor_icon_theme

     

       157
       157
       +
                 pkgs.hicolor-icon-theme

     

       158
       158
        
       

     

       159
       159
        
                 kde-gtk-config breeze-gtk

     

       160
       160

+3 -3

nixos/modules/services/x11/desktop-managers/xfce.nix

···

       61
       61
        
             # utilities-terminal, accessories-text-editor

     

       62
       62
        
             gnome3.defaultIconTheme

     

       63
       63
        
       

     

       64
       64
       -
             hicolor_icon_theme

     

       64
       64
       +
             hicolor-icon-theme

     

       65
       65
        
             tango-icon-theme

     

       66
       66
        
             xfce4-icon-theme

     

       67
       67
        
       

     

       68
       68
       -
             desktop_file_utils

     

       69
       69
       -
             shared_mime_info

     

       68
       68
       +
             desktop-file-utils

     

       69
       69
       +
             shared-mime-info

     

       70
       70
        
       

     

       71
       71
        
             # Needed by Xfce's xinitrc script

     

       72
       72
        
             # TODO: replace with command -v

+5 -5

nixos/modules/services/x11/display-managers/gdm.nix

···

       133
       133
        
             StandardError = "inherit";

     

       134
       134
        
           };

     

       135
       135
        
       

     

       136
       136
       -
           systemd.services.display-manager.path = [ pkgs.gnome3.gnome_session ];

     

       136
       136
       +
           systemd.services.display-manager.path = [ pkgs.gnome3.gnome-session ];

     

       137
       137
        
       

     

       138
       138
        
           services.dbus.packages = [ gdm ];

     

       139
       139
        
       

     
···

       193
       193
        
               auth     required       pam_env.so envfile=${config.system.build.pamEnvironment}

     

       194
       194
        
       

     

       195
       195
        
               auth     required       pam_succeed_if.so uid >= 1000 quiet

     

       196
       196
       -
               auth     optional       ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so

     

       196
       196
       +
               auth     optional       ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so

     

       197
       197
        
               auth     ${if config.security.pam.enableEcryptfs then "required" else "sufficient"} pam_unix.so nullok likeauth

     

       198
       198
        
               ${optionalString config.security.pam.enableEcryptfs

     

       199
       199
        
                 "auth required ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"}

     
···

       213
       213
        
                 "session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"}

     

       214
       214
        
               session  required       pam_loginuid.so

     

       215
       215
        
               session  optional       ${pkgs.systemd}/lib/security/pam_systemd.so

     

       216
       216
       -
               session  optional       ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start

     

       216
       216
       +
               session  optional       ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start

     

       217
       217
        
             '';

     

       218
       218
        
       

     

       219
       219
        
             gdm-password.text = ''

     
···

       221
       221
        
               auth     required       pam_env.so envfile=${config.system.build.pamEnvironment}

     

       222
       222
        
       

     

       223
       223
        
               auth     required       pam_succeed_if.so uid >= 1000 quiet

     

       224
       224
       -
               auth     optional       ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so

     

       224
       224
       +
               auth     optional       ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so

     

       225
       225
        
               auth     ${if config.security.pam.enableEcryptfs then "required" else "sufficient"} pam_unix.so nullok likeauth

     

       226
       226
        
               ${optionalString config.security.pam.enableEcryptfs

     

       227
       227
        
                 "auth required ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"}

     
···

       240
       240
        
                 "session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"}

     

       241
       241
        
               session  required       pam_loginuid.so

     

       242
       242
        
               session  optional       ${pkgs.systemd}/lib/security/pam_systemd.so

     

       243
       243
       -
               session  optional       ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start

     

       243
       243
       +
               session  optional       ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start

     

       244
       244
        
             '';

     

       245
       245
        
       

     

       246
       246
        
             gdm-autologin.text = ''

+2 -2

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

···

       68
       68
        
       

     

       69
       69
        
               package = mkOption {

     

       70
       70
        
                 type = types.package;

     

       71
       71
       -
                 default = pkgs.gnome3.gnome_themes_standard;

     

       72
       72
       -
                 defaultText = "pkgs.gnome3.gnome_themes_standard";

     

       71
       71
       +
                 default = pkgs.gnome3.gnome-themes-standard;

     

       72
       72
       +
                 defaultText = "pkgs.gnome3.gnome-themes-standard";

     

       73
       73
        
                 description = ''

     

       74
       74
        
                   The package path that contains the theme given in the name option.

     

       75
       75
        
                 '';

+2 -2

pkgs/applications/audio/ario/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, gettext, gtk2, expat, intltool, libgcrypt,

     

       2
       2
       -
         libunique, gnutls, libxml2, curl, mpd_clientlib, dbus_glib, libnotify,

     

       2
       2
       +
         libunique, gnutls, libxml2, curl, mpd_clientlib, dbus-glib, libnotify,

     

       3
       3
        
         libsoup, avahi, taglib

     

       4
       4
        
         }:

     

       5
       5
        
       

     
···

       17
       17
        
         nativeBuildInputs = [ pkgconfig ];

     

       18
       18
        
         buildInputs = [

     

       19
       19
        
           gettext gtk2 expat intltool libgcrypt libunique gnutls

     

       20
       20
       -
           libxml2 curl mpd_clientlib dbus_glib libnotify libsoup avahi taglib

     

       20
       20
       +
           libxml2 curl mpd_clientlib dbus-glib libnotify libsoup avahi taglib

     

       21
       21
        
         ];

     

       22
       22
        
       

     

       23
       23
        
         meta = {

+2 -2

pkgs/applications/audio/audacious/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, wrapGAppsHook, gettext, glib, gtk3

     

       2
       2
       -
       , libmowgli, dbus_glib, libxml2, xorg, gnome3, alsaLib

     

       2
       2
       +
       , libmowgli, dbus-glib, libxml2, xorg, gnome3, alsaLib

     

       3
       3
        
       , libpulseaudio, libjack2, fluidsynth, libmad, libogg, libvorbis

     

       4
       4
        
       , libcdio, libcddb, flac, ffmpeg, mpg123, libcue, libmms, libbs2b

     

       5
       5
        
       , libsndfile, libmodplug, libsamplerate, soxr, lirc, curl, wavpack

     
···

       25
       25
        
         ];

     

       26
       26
        
       

     

       27
       27
        
         buildInputs = [

     

       28
       28
       -
           gettext glib gtk3 libmowgli dbus_glib libxml2

     

       28
       28
       +
           gettext glib gtk3 libmowgli dbus-glib libxml2

     

       29
       29
        
           xorg.libXcomposite gnome3.defaultIconTheme alsaLib libjack2

     

       30
       30
        
           libpulseaudio fluidsynth libmad libogg libvorbis libcdio

     

       31
       31
        
           libcddb flac ffmpeg mpg123 libcue libmms libbs2b libsndfile

+3 -3

pkgs/applications/audio/deadbeef/default.nix

···

       1
       1
        
       { stdenv, fetchurl, intltool, pkgconfig, fetchpatch, jansson

     

       2
       2
        
       # deadbeef can use either gtk2 or gtk3

     

       3
       3
        
       , gtk2Support ? false, gtk2 ? null

     

       4
       4
       -
       , gtk3Support ? true, gtk3 ? null, gsettings_desktop_schemas ? null, wrapGAppsHook ? null

     

       4
       4
       +
       , gtk3Support ? true, gtk3 ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null

     

       5
       5
        
       # input plugins

     

       6
       6
        
       , vorbisSupport ? true, libvorbis ? null

     

       7
       7
        
       , mp123Support ? true, libmad ? null

     
···

       30
       30
        
       

     

       31
       31
        
       assert gtk2Support || gtk3Support;

     

       32
       32
        
       assert gtk2Support -> gtk2 != null;

     

       33
       33
       -
       assert gtk3Support -> gtk3 != null && gsettings_desktop_schemas != null && wrapGAppsHook != null;

     

       33
       33
       +
       assert gtk3Support -> gtk3 != null && gsettings-desktop-schemas != null && wrapGAppsHook != null;

     

       34
       34
        
       assert vorbisSupport -> libvorbis != null;

     

       35
       35
        
       assert mp123Support -> libmad != null;

     

       36
       36
        
       assert flacSupport -> flac != null;

     
···

       62
       62
        
       

     

       63
       63
        
         buildInputs = with stdenv.lib; [ jansson ]

     

       64
       64
        
           ++ optional gtk2Support gtk2

     

       65
       65
       -
           ++ optionals gtk3Support [ gtk3 gsettings_desktop_schemas ]

     

       65
       65
       +
           ++ optionals gtk3Support [ gtk3 gsettings-desktop-schemas ]

     

       66
       66
        
           ++ optional vorbisSupport libvorbis

     

       67
       67
        
           ++ optional mp123Support libmad

     

       68
       68
        
           ++ optional flacSupport flac

+2 -2

pkgs/applications/audio/easytag/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libid3tag, id3lib, taglib

     

       2
       2
       -
       , libvorbis, libogg, flac, itstool, libxml2, gsettings_desktop_schemas

     

       2
       2
       +
       , libvorbis, libogg, flac, itstool, libxml2, gsettings-desktop-schemas

     

       3
       3
        
       , makeWrapper, gnome3

     

       4
       4
        
       }:

     

       5
       5
        
       

     
···

       24
       24
        
         nativeBuildInputs = [ makeWrapper pkgconfig intltool ];

     

       25
       25
        
         buildInputs = [

     

       26
       26
        
           gtk3 glib libid3tag id3lib taglib libvorbis libogg flac

     

       27
       27
       -
           itstool libxml2 gsettings_desktop_schemas gnome3.defaultIconTheme (stdenv.lib.getLib gnome3.dconf)

     

       27
       27
       +
           itstool libxml2 gsettings-desktop-schemas gnome3.defaultIconTheme (stdenv.lib.getLib gnome3.dconf)

     

       28
       28
        
         ];

     

       29
       29
        
       

     

       30
       30
        
         meta = with stdenv.lib; {

+2 -2

pkgs/applications/audio/gjay/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, mpd_clientlib, dbus_glib, audacious, gtk2, gsl

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, mpd_clientlib, dbus-glib, audacious, gtk2, gsl

     

       2
       2
        
       , libaudclient }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation {

     
···

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ pkgconfig ];

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = [ mpd_clientlib dbus_glib audacious gtk2 gsl libaudclient ];

     

       14
       14
       +
         buildInputs = [ mpd_clientlib dbus-glib audacious gtk2 gsl libaudclient ];

     

       15
       15
        
       

     

       16
       16
        
         hardeningDisable = [ "format" ];

     

       17
       17

+2 -2

pkgs/applications/audio/gmpc/default.nix

···

       1
       1
        
       { stdenv, fetchurl, libtool, intltool, pkgconfig, glib

     

       2
       2
        
       , gtk2, curl, mpd_clientlib, libsoup, gob2, vala, libunique

     

       3
       3
       -
       , libSM, libICE, sqlite, hicolor_icon_theme, wrapGAppsHook

     

       3
       3
       +
       , libSM, libICE, sqlite, hicolor-icon-theme, wrapGAppsHook

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     
···

       27
       27
        
         nativeBuildInputs = [ pkgconfig libtool intltool gob2 vala wrapGAppsHook ];

     

       28
       28
        
         buildInputs = [

     

       29
       29
        
           glib gtk2 curl mpd_clientlib libsoup

     

       30
       30
       -
           libunique libmpd libSM libICE sqlite hicolor_icon_theme

     

       30
       30
       +
           libunique libmpd libSM libICE sqlite hicolor-icon-theme

     

       31
       31
        
         ];

     

       32
       32
        
       

     

       33
       33
        
         meta = with stdenv.lib; {

+6 -6

pkgs/applications/audio/gradio/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, pkgconfig

     

       2
       2
        
       , gcc

     

       3
       3
        
       , python3

     

       4
       4
       -
       , gsettings_desktop_schemas

     

       5
       5
       -
       , desktop_file_utils

     

       4
       4
       +
       , gsettings-desktop-schemas

     

       5
       5
       +
       , desktop-file-utils

     

       6
       6
        
       , glib

     

       7
       7
        
       , gtk3

     

       8
       8
        
       , intltool

     

       9
       9
        
       , libsoup

     

       10
       10
       -
       , json_glib

     

       10
       10
       +
       , json-glib

     

       11
       11
        
       , wrapGAppsHook

     

       12
       12
        
       , meson

     

       13
       13
        
       , ninja

     
···

       44
       44
        
           glib

     

       45
       45
        
           intltool

     

       46
       46
        
           libsoup

     

       47
       47
       -
           json_glib

     

       47
       47
       +
           json-glib

     

       48
       48
        
       

     

       49
       49
        
           gtk3

     

       50
       50
        
           gst_all_1.gstreamer

     

       51
       51
        
           gst_all_1.gst-plugins-base

     

       52
       52
        
       

     

       53
       53
        
           wrapGAppsHook

     

       54
       54
       -
           desktop_file_utils

     

       55
       55
       -
           gsettings_desktop_schemas

     

       54
       54
       +
           desktop-file-utils

     

       55
       55
       +
           gsettings-desktop-schemas

     

       56
       56
        
         ] ++ gst_plugins;

     

       57
       57
        
       

     

       58
       58
        
         enableParallelBuilding = true;

+4 -4

pkgs/applications/audio/gtkpod/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, makeWrapper, intltool, libgpod, curl, flac,

     

       2
       2
        
         gnome, gtk3, glib, gettext, perl, perlXMLParser, flex, libglade, libid3tag,

     

       3
       3
       -
         libvorbis, hicolor_icon_theme, gdk_pixbuf }:

     

       3
       3
       +
         libvorbis, hicolor-icon-theme, gdk_pixbuf }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         version = "2.1.5";

     
···

       11
       11
        
           sha256 = "0xisrpx069f7bjkyc8vqxb4k0480jmx1wscqxr6cpq1qj6pchzd5";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         propagatedUserEnvPkgs = [ gnome.gnome_themes_standard ];

     

       14
       14
       +
         propagatedUserEnvPkgs = [ gnome.gnome-themes-standard ];

     

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [ pkgconfig ];

     

       17
       17
        
         buildInputs = [ makeWrapper intltool curl gettext perl perlXMLParser

     

       18
       18
        
           flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf libglade gnome.anjuta

     

       19
       19
        
           gnome.gdl gnome.defaultIconTheme

     

       20
       20
       -
           hicolor_icon_theme ];

     

       20
       20
       +
           hicolor-icon-theme ];

     

       21
       21
        
       

     

       22
       22
        
         patchPhase = ''

     

       23
       23
        
           sed -i 's/which/type -P/' scripts/*.sh

     
···

       26
       26
        
         preFixup = ''

     

       27
       27
        
           wrapProgram "$out/bin/gtkpod" \

     

       28
       28
        
             --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \

     

       29
       29
       -
             --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"

     

       29
       29
       +
             --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome.gnome-themes-standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"

     

       30
       30
        
         '';

     

       31
       31
        
       

     

       32
       32
        
         enableParallelBuilding = true;

+4 -4

pkgs/applications/audio/guitarix/default.nix

···

       1
       1
        
       { stdenv, fetchurl, gettext, intltool, pkgconfig, python2

     

       2
       2
       -
       , avahi, bluez, boost, eigen, fftw, glib, glib_networking

     

       3
       3
       -
       , glibmm, gsettings_desktop_schemas, gtkmm2, libjack2

     

       2
       2
       +
       , avahi, bluez, boost, eigen, fftw, glib, glib-networking

     

       3
       3
       +
       , glibmm, gsettings-desktop-schemas, gtkmm2, libjack2

     

       4
       4
        
       , ladspaH, libav, librdf, libsndfile, lilv, lv2, serd, sord, sratom

     

       5
       5
        
       , wrapGAppsHook, zita-convolver, zita-resampler

     

       6
       6
        
       , optimizationSupport ? false # Enable support for native CPU extensions

     
···

       22
       22
        
         nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python2 ];

     

       23
       23
        
       

     

       24
       24
        
         buildInputs = [

     

       25
       25
       -
           avahi bluez boost eigen fftw glib glibmm glib_networking.out

     

       26
       26
       -
           gsettings_desktop_schemas gtkmm2 libjack2 ladspaH libav librdf

     

       25
       25
       +
           avahi bluez boost eigen fftw glib glibmm glib-networking.out

     

       26
       26
       +
           gsettings-desktop-schemas gtkmm2 libjack2 ladspaH libav librdf

     

       27
       27
        
           libsndfile lilv lv2 serd sord sratom zita-convolver

     

       28
       28
        
           zita-resampler

     

       29
       29
        
         ];

+2 -2

pkgs/applications/audio/mopidy/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, pythonPackages, wrapGAppsHook

     

       2
       2
       -
       , gst_all_1, glib_networking, gobjectIntrospection

     

       2
       2
       +
       , gst_all_1, glib-networking, gobjectIntrospection

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       pythonPackages.buildPythonApplication rec {

     
···

       18
       18
        
       

     

       19
       19
        
         buildInputs = with gst_all_1; [

     

       20
       20
        
           gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad

     

       21
       21
       -
           glib_networking gobjectIntrospection

     

       21
       21
       +
           glib-networking gobjectIntrospection

     

       22
       22
        
         ];

     

       23
       23
        
       

     

       24
       24
        
         propagatedBuildInputs = with pythonPackages; [

+2 -2

pkgs/applications/audio/paprefs/default.nix

···

       1
       1
        
       { fetchurl, stdenv, pkgconfig, pulseaudioFull, gtkmm2, libglademm

     

       2
       2
       -
       , dbus_glib, GConf, gconfmm, intltool }:

     

       2
       2
       +
       , dbus-glib, GConf, gconfmm, intltool }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         name = "paprefs-0.9.10";

     
···

       9
       9
        
           sha256 = "1c5b3sb881szavly220q31g7rvpn94wr7ywlk00hqb9zaikml716";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = [ pulseaudioFull gtkmm2 libglademm dbus_glib gconfmm ];

     

       12
       12
       +
         buildInputs = [ pulseaudioFull gtkmm2 libglademm dbus-glib gconfmm ];

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ pkgconfig intltool ];

     

       15
       15

+2 -2

pkgs/applications/audio/patchage/default.nix

···

       1
       1
       -
       { stdenv, alsaLib, boost, dbus_glib, fetchsvn, ganv, glibmm

     

       1
       1
       +
       { stdenv, alsaLib, boost, dbus-glib, fetchsvn, ganv, glibmm

     

       2
       2
        
       , gtkmm2, libjack2, pkgconfig, python2

     

       3
       3
        
       }:

     

       4
       4
        
       

     
···

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         buildInputs = [

     

       15
       15
       -
           alsaLib boost dbus_glib ganv glibmm gtkmm2 libjack2

     

       15
       15
       +
           alsaLib boost dbus-glib ganv glibmm gtkmm2 libjack2

     

       16
       16
        
           pkgconfig python2

     

       17
       17
        
         ];

     

       18
       18

+2 -2

pkgs/applications/audio/pavucontrol/default.nix

···

       1
       1
        
       { fetchurl, stdenv, pkgconfig, intltool, libpulseaudio, gtkmm3

     

       2
       2
       -
       , libcanberra_gtk3, makeWrapper, gnome3 }:

     

       2
       2
       +
       , libcanberra-gtk3, makeWrapper, gnome3 }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         name = "pavucontrol-3.0";

     
···

       14
       14
        
            --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS"

     

       15
       15
        
         '';

     

       16
       16
        
       

     

       17
       17
       -
         buildInputs = [ libpulseaudio gtkmm3 libcanberra_gtk3 makeWrapper

     

       17
       17
       +
         buildInputs = [ libpulseaudio gtkmm3 libcanberra-gtk3 makeWrapper

     

       18
       18
        
                         gnome3.defaultIconTheme ];

     

       19
       19
        
       

     

       20
       20
        
         nativeBuildInputs = [ pkgconfig intltool ];

+2 -2

pkgs/applications/audio/radiotray-ng/default.nix

···

       11
       11
        
       , dbus

     

       12
       12
        
       , glibmm

     

       13
       13
        
       , gnome3

     

       14
       14
       -
       , hicolor_icon_theme

     

       14
       14
       +
       , hicolor-icon-theme

     

       15
       15
        
       , libappindicator-gtk3

     

       16
       16
        
       , libnotify

     

       17
       17
        
       , libxdg_basedir

     
···

       54
       54
        
         buildInputs = [

     

       55
       55
        
           curl

     

       56
       56
        
           boost jsoncpp libbsd pcre

     

       57
       57
       -
           glibmm hicolor_icon_theme gnome3.gsettings_desktop_schemas libappindicator-gtk3 libnotify

     

       57
       57
       +
           glibmm hicolor-icon-theme gnome3.gsettings-desktop-schemas libappindicator-gtk3 libnotify

     

       58
       58
        
           libxdg_basedir

     

       59
       59
        
           lsb-release

     

       60
       60
        
           wxGTK

+2 -2

pkgs/applications/audio/rhythmbox/default.nix

···

       7
       7
        
       , libsoup

     

       8
       8
        
       , gnome3

     

       9
       9
        
       , tdb

     

       10
       10
       -
       , json_glib

     

       10
       10
       +
       , json-glib

     

       11
       11
        
       , itstool

     

       12
       12
        
       , wrapGAppsHook

     

       13
       13
        
       , gst_all_1

     
···

       35
       35
        
           intltool

     

       36
       36
        
           libsoup

     

       37
       37
        
           tdb

     

       38
       38
       -
           json_glib

     

       38
       38
       +
           json-glib

     

       39
       39
        
           itstool

     

       40
       40
        
       

     

       41
       41
        
           gtk3

+3 -3

pkgs/applications/audio/sonata/default.nix

···

       19
       19
        
         nativeBuildInputs = [ pkgconfig ];

     

       20
       20
        
         buildInputs = [

     

       21
       21
        
           intltool wrapGAppsHook

     

       22
       22
       -
           gnome3.gnome_themes_standard gnome3.defaultIconTheme

     

       23
       23
       -
           gnome3.gsettings_desktop_schemas

     

       22
       22
       +
           gnome3.gnome-themes-standard gnome3.defaultIconTheme

     

       23
       23
       +
           gnome3.gsettings-desktop-schemas

     

       24
       24
        
         ];

     

       25
       25
        
       

     

       26
       26
        
         postPatch = ''

     
···

       28
       28
        
           sed -i '/localmpd/d' sonata/consts.py

     

       29
       29
        
         '';

     

       30
       30
        
       

     

       31
       31
       -
         propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];

     

       31
       31
       +
         propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];

     

       32
       32
        
       

     

       33
       33
        
         propagatedBuildInputs = [

     

       34
       34
        
           gobjectIntrospection gtk3 pygobject3

+4 -4

pkgs/applications/audio/sound-juicer/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, gtk3, intltool, itstool, libxml2, brasero

     

       2
       2
       -
       , libcanberra_gtk3, gnome3, gst_all_1, libmusicbrainz5, libdiscid, isocodes

     

       2
       2
       +
       , libcanberra-gtk3, gnome3, gst_all_1, libmusicbrainz5, libdiscid, isocodes

     

       3
       3
        
       , makeWrapper }:

     

       4
       4
        
       

     

       5
       5
        
       let

     
···

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         nativeBuildInputs = [ pkgconfig ];

     

       19
       19
       -
         buildInputs = [ gtk3 intltool itstool libxml2 brasero libcanberra_gtk3

     

       20
       20
       -
                         gnome3.gsettings_desktop_schemas libmusicbrainz5 libdiscid isocodes

     

       19
       19
       +
         buildInputs = [ gtk3 intltool itstool libxml2 brasero libcanberra-gtk3

     

       20
       20
       +
                         gnome3.gsettings-desktop-schemas libmusicbrainz5 libdiscid isocodes

     

       21
       21
        
                         makeWrapper (stdenv.lib.getLib gnome3.dconf)

     

       22
       22
        
                         gst_all_1.gstreamer gst_all_1.gst-plugins-base

     

       23
       23
        
                         gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad

     
···

       27
       27
        
         preFixup = ''

     

       28
       28
        
           for f in $out/bin/* $out/libexec/*; do

     

       29
       29
        
             wrapProgram "$f" \

     

       30
       30
       -
               --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \

     

       30
       30
       +
               --prefix XDG_DATA_DIRS : "${gnome3.gnome-themes-standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \

     

       31
       31
        
               --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \

     

       32
       32
        
               --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules"

     

       33
       33
        
           done

+3 -3

pkgs/applications/audio/tomahawk/default.nix

···

       4
       4
        
       

     

       5
       5
        
       , enableXMPP      ? true,  libjreen     ? null

     

       6
       6
        
       , enableKDE       ? false, kdelibs4     ? null

     

       7
       7
       -
       , enableTelepathy ? false, telepathy_qt ? null

     

       7
       7
       +
       , enableTelepathy ? false, telepathy-qt ? null

     

       8
       8
        
       }:

     

       9
       9
        
       

     

       10
       10
        
       assert enableXMPP      -> libjreen     != null;

     

       11
       11
        
       assert enableKDE       -> kdelibs4     != null;

     

       12
       12
       -
       assert enableTelepathy -> telepathy_qt != null;

     

       12
       12
       +
       assert enableTelepathy -> telepathy-qt != null;

     

       13
       13
        
       

     

       14
       14
        
       stdenv.mkDerivation rec {

     

       15
       15
        
         name = "tomahawk-${version}";

     
···

       32
       32
        
           makeWrapper

     

       33
       33
        
         ] ++ stdenv.lib.optional enableXMPP      libjreen

     

       34
       34
        
           ++ stdenv.lib.optional enableKDE       kdelibs4

     

       35
       35
       -
           ++ stdenv.lib.optional enableTelepathy telepathy_qt;

     

       35
       35
       +
           ++ stdenv.lib.optional enableTelepathy telepathy-qt;

     

       36
       36
        
       

     

       37
       37
        
         postInstall = let

     

       38
       38
        
           pluginPath = stdenv.lib.concatStringsSep ":" [

+4 -4

pkgs/applications/backup/deja-dup/default.nix

···

       1
       1
        
       { stdenv, fetchurl, meson, ninja, pkgconfig, vala_0_38, gettext

     

       2
       2
        
       , gnome3, libnotify, intltool, itstool, glib, gtk3, libxml2

     

       3
       3
        
       , coreutils, libsecret, pcre, libxkbcommon, wrapGAppsHook

     

       4
       4
       -
       , libpthreadstubs, libXdmcp, epoxy, at_spi2_core, dbus, libgpgerror

     

       5
       5
       -
       , appstream-glib, desktop_file_utils, duplicity

     

       4
       4
       +
       , libpthreadstubs, libXdmcp, epoxy, at-spi2-core, dbus, libgpgerror

     

       5
       5
       +
       , appstream-glib, desktop-file-utils, duplicity

     

       6
       6
        
       }:

     

       7
       7
        
       

     

       8
       8
        
       stdenv.mkDerivation rec {

     
···

       29
       29
        
       

     

       30
       30
        
         nativeBuildInputs = [

     

       31
       31
        
           meson ninja pkgconfig vala_0_38 gettext intltool itstool

     

       32
       32
       -
           appstream-glib desktop_file_utils libxml2 wrapGAppsHook

     

       32
       32
       +
           appstream-glib desktop-file-utils libxml2 wrapGAppsHook

     

       33
       33
        
         ];

     

       34
       34
        
       

     

       35
       35
        
         buildInputs = [

     

       36
       36
        
          libnotify gnome3.libpeas glib gtk3 libsecret

     

       37
       37
        
          pcre libxkbcommon libpthreadstubs libXdmcp epoxy gnome3.nautilus

     

       38
       38
       -
          at_spi2_core dbus gnome3.gnome_online_accounts libgpgerror

     

       38
       38
       +
          at-spi2-core dbus gnome3.gnome-online-accounts libgpgerror

     

       39
       39
        
         ];

     

       40
       40
        
       

     

       41
       41
        
         propagatedUserEnvPkgs = [ duplicity ];

+2 -2

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

···

       1
       1
        
       { stdenv, fetchurl, lightdm, pkgconfig, intltool

     

       2
       2
       -
       , hicolor_icon_theme, makeWrapper

     

       2
       2
       +
       , hicolor-icon-theme, makeWrapper

     

       3
       3
        
       , useGTK2 ? false, gtk2, gtk3 # gtk3 seems better supported

     

       4
       4
        
       , exo

     

       5
       5
        
       }:

     
···

       37
       37
        
           substituteInPlace "$out/share/xgreeters/lightdm-gtk-greeter.desktop" \

     

       38
       38
        
             --replace "Exec=lightdm-gtk-greeter" "Exec=$out/sbin/lightdm-gtk-greeter"

     

       39
       39
        
           wrapProgram "$out/sbin/lightdm-gtk-greeter" \

     

       40
       40
       -
             --prefix XDG_DATA_DIRS ":" "${hicolor_icon_theme}/share"

     

       40
       40
       +
             --prefix XDG_DATA_DIRS ":" "${hicolor-icon-theme}/share"

     

       41
       41
        
         '';

     

       42
       42
        
       

     

       43
       43
        
         meta = with stdenv.lib; {

+2 -2

pkgs/applications/editors/atom/env.nix

···

       1
       1
        
       { stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig

     

       2
       2
       -
       , libgnome_keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr

     

       2
       2
       +
       , libgnome-keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr

     

       3
       3
        
       , gconf, nss, xorg, libcap, systemd, libnotify, libsecret

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       let

     

       7
       7
        
         packages = [

     

       8
       8
       -
           stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome_keyring3

     

       8
       8
       +
           stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3

     

       9
       9
        
           fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss

     

       10
       10
        
           xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst

     

       11
       11
        
           xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr

+2 -2

pkgs/applications/editors/eclipse/build-eclipse.nix

···

       1
       1
        
       { stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender

     

       2
       2
       -
       , zlib, jdk, glib, gtk2, libXtst, gsettings_desktop_schemas, webkitgtk24x-gtk2

     

       2
       2
       +
       , zlib, jdk, glib, gtk2, libXtst, gsettings-desktop-schemas, webkitgtk24x-gtk2

     

       3
       3
        
       , makeWrapper, ... }:

     

       4
       4
        
       

     

       5
       5
        
       { name, src ? builtins.getAttr stdenv.system sources, sources ? null, description }:

     
···

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         buildInputs = [

     

       21
       21
       -
           fontconfig freetype glib gsettings_desktop_schemas gtk2 jdk libX11

     

       21
       21
       +
           fontconfig freetype glib gsettings-desktop-schemas gtk2 jdk libX11

     

       22
       22
        
           libXrender libXtst makeWrapper zlib

     

       23
       23
        
         ] ++ stdenv.lib.optional (webkitgtk24x-gtk2 != null) webkitgtk24x-gtk2;

     

       24
       24

+2 -2

pkgs/applications/editors/eclipse/default.nix

···

       1
       1
        
       { stdenv, lib, fetchurl, makeDesktopItem, makeWrapper

     

       2
       2
        
       , freetype, fontconfig, libX11, libXext, libXrender, zlib

     

       3
       3
       -
       , glib, gtk2, libXtst, jdk, gsettings_desktop_schemas

     

       3
       3
       +
       , glib, gtk2, libXtst, jdk, gsettings-desktop-schemas

     

       4
       4
        
       , webkitgtk24x-gtk2 ? null  # for internal web browser

     

       5
       5
        
       , buildEnv, writeText, runCommand

     

       6
       6
        
       , callPackage

     
···

       15
       15
        
       

     

       16
       16
        
         buildEclipse = import ./build-eclipse.nix {

     

       17
       17
        
           inherit stdenv makeDesktopItem freetype fontconfig libX11 libXrender zlib

     

       18
       18
       -
                   jdk glib gtk2 libXtst gsettings_desktop_schemas webkitgtk24x-gtk2

     

       18
       18
       +
                   jdk glib gtk2 libXtst gsettings-desktop-schemas webkitgtk24x-gtk2

     

       19
       19
        
                   makeWrapper;

     

       20
       20
        
         };

     

       21
       21

+4 -4

pkgs/applications/editors/emacs/default.nix

···

       4
       4
        
       , alsaLib, cairo, acl, gpm, AppKit, CoreWLAN, Kerberos, GSS, ImageIO

     

       5
       5
        
       , withX ? !stdenv.isDarwin

     

       6
       6
        
       , withGTK2 ? false, gtk2 ? null

     

       7
       7
       -
       , withGTK3 ? true, gtk3 ? null, gsettings_desktop_schemas ? null

     

       8
       8
       -
       , withXwidgets ? false, webkitgtk24x-gtk3 ? null, wrapGAppsHook ? null, glib_networking ? null

     

       7
       7
       +
       , withGTK3 ? true, gtk3 ? null, gsettings-desktop-schemas ? null

     

       8
       8
       +
       , withXwidgets ? false, webkitgtk24x-gtk3 ? null, wrapGAppsHook ? null, glib-networking ? null

     

       9
       9
        
       , withCsrc ? true

     

       10
       10
        
       , srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null

     

       11
       11
        
       }:

     
···

       61
       61
        
             [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft

     

       62
       62
        
               imagemagick gconf ]

     

       63
       63
        
           ++ lib.optional (withX && withGTK2) gtk2

     

       64
       64
       -
           ++ lib.optionals (withX && withGTK3) [ gtk3 gsettings_desktop_schemas ]

     

       64
       64
       +
           ++ lib.optionals (withX && withGTK3) [ gtk3 gsettings-desktop-schemas ]

     

       65
       65
        
           ++ lib.optional (stdenv.isDarwin && withX) cairo

     

       66
       66
       -
           ++ lib.optionals (withX && withXwidgets) [ webkitgtk24x-gtk3 glib_networking ];

     

       66
       66
       +
           ++ lib.optionals (withX && withXwidgets) [ webkitgtk24x-gtk3 glib-networking ];

     

       67
       67
        
       

     

       68
       68
        
         propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ];

     

       69
       69

+2 -2

pkgs/applications/editors/jucipp/default.nix

···

       1
       1
       -
       { config, stdenv, fetchgit, makeWrapper, gnome3, at_spi2_core, libcxx,

     

       1
       1
       +
       { config, stdenv, fetchgit, makeWrapper, gnome3, at-spi2-core, libcxx,

     

       2
       2
        
         boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre,

     

       3
       3
        
         libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts,

     

       4
       4
        
         coreutils, glibc, dbus_libs, openssl, libxml2, gnumake, ctags }:

     
···

       30
       30
        
           openssl

     

       31
       31
        
           libxml2

     

       32
       32
        
           gnome3.gtksourceview

     

       33
       33
       -
           at_spi2_core

     

       33
       33
       +
           at-spi2-core

     

       34
       34
        
           pcre

     

       35
       35
        
           epoxy

     

       36
       36
        
           boost

+2 -2

pkgs/applications/editors/kdevelop5/kdevelop.nix

···

       3
       3
        
       , kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews

     

       4
       4
        
       , kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor

     

       5
       5
        
       , threadweaver, kxmlgui, kwindowsystem, grantlee, kcrash, karchive, kguiaddons

     

       6
       6
       -
       , plasma-framework, krunner, kdevplatform, kdevelop-pg-qt, shared_mime_info

     

       6
       6
       +
       , plasma-framework, krunner, kdevplatform, kdevelop-pg-qt, shared-mime-info

     

       7
       7
        
       , libksysguard, konsole, llvmPackages, makeWrapper

     

       8
       8
        
       }:

     

       9
       9
        
       

     
···

       34
       34
        
           kconfig kdeclarative kdoctools kiconthemes ki18n kitemmodels kitemviews

     

       35
       35
        
           kjobwidgets kcmutils kio knewstuff knotifyconfig kparts ktexteditor

     

       36
       36
        
           threadweaver kxmlgui kwindowsystem grantlee plasma-framework krunner

     

       37
       37
       -
           kdevplatform shared_mime_info libksysguard konsole kcrash karchive kguiaddons

     

       37
       37
       +
           kdevplatform shared-mime-info libksysguard konsole kcrash karchive kguiaddons

     

       38
       38
        
         ];

     

       39
       39
        
       

     

       40
       40
        
         postInstall = ''

+2 -2

pkgs/applications/editors/lighttable/default.nix

···

       1
       1
        
       { stdenv, fetchurl, zlib, glib, alsaLib, makeDesktopItem

     

       2
       2
       -
       , dbus, gtk2, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf

     

       2
       2
       +
       , dbus, gtk2, atk, pango, freetype, fontconfig, libgnome-keyring3, gdk_pixbuf

     

       3
       3
        
       , cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xorg, systemd, libnotify

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       let

     

       7
       7
        
         libPath = stdenv.lib.makeLibraryPath [

     

       8
       8
       -
             stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome_keyring3 nss

     

       8
       8
       +
             stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3 nss

     

       9
       9
        
             fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gnome3.gconf

     

       10
       10
        
             xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst

     

       11
       11
        
             xorg.libXcomposite xorg.libXi xorg.libXfixes libnotify xorg.libXrandr

+2 -2

pkgs/applications/editors/monodevelop/default.nix

···

       1
       1
        
       { stdenv, fetchurl, fetchgit, fetchNuGet

     

       2
       2
       -
       , autoconf, automake, pkgconfig, shared_mime_info, intltool

     

       2
       2
       +
       , autoconf, automake, pkgconfig, shared-mime-info, intltool

     

       3
       3
        
       , glib, mono, gtk-sharp-2_0, gnome2, gnome-sharp, unzip

     

       4
       4
        
       , dotnetPackages

     

       5
       5
        
       }:

     
···

       36
       36
        
       

     

       37
       37
        
         nativeBuildInputs = [ pkgconfig ];

     

       38
       38
        
         buildInputs = [

     

       39
       39
       -
           autoconf automake shared_mime_info intltool

     

       39
       39
       +
           autoconf automake shared-mime-info intltool

     

       40
       40
        
           mono gtk-sharp-2_0 gnome-sharp unzip

     

       41
       41
        
           dotnetPackages.NUnit

     

       42
       42
        
           dotnetPackages.NUnitRunners

+4 -4

pkgs/applications/graphics/darktable/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, libsoup, graphicsmagick, json_glib, wrapGAppsHook

     

       2
       2
       -
       , cairo, cmake, ninja, curl, perl, llvm, desktop_file_utils, exiv2, glib

     

       1
       1
       +
       { stdenv, fetchurl, libsoup, graphicsmagick, json-glib, wrapGAppsHook

     

       2
       2
       +
       , cairo, cmake, ninja, curl, perl, llvm, desktop-file-utils, exiv2, glib

     

       3
       3
        
       , ilmbase, gtk3, intltool, lcms2, lensfun, libX11, libexif, libgphoto2, libjpeg

     

       4
       4
        
       , libpng, librsvg, libtiff, openexr, osm-gps-map, pkgconfig, sqlite, libxslt

     

       5
       5
        
       , openjpeg, lua, pugixml, colord, colord-gtk, libwebp, libsecret, gnome3

     
···

       14
       14
        
           sha256 = "014pq80i5k1kdvvrl7xrgaaq3i4fzv09h7a3pwzlp2ahkczwcm32";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop_file_utils wrapGAppsHook ];

     

       17
       17
       +
         nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop-file-utils wrapGAppsHook ];

     

       18
       18
        
       

     

       19
       19
        
         buildInputs = [

     

       20
       20
        
           cairo curl exiv2 glib gtk3 ilmbase lcms2 lensfun libX11 libexif

     

       21
       21
        
           libgphoto2 libjpeg libpng librsvg libtiff openexr sqlite libxslt

     

       22
       22
       -
           libsoup graphicsmagick json_glib openjpeg lua pugixml

     

       22
       22
       +
           libsoup graphicsmagick json-glib openjpeg lua pugixml

     

       23
       23
        
           colord colord-gtk libwebp libsecret gnome3.adwaita-icon-theme

     

       24
       24
        
           osm-gps-map

     

       25
       25
        
         ];

+2 -2

pkgs/applications/graphics/gcolor3/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, gnome3, libtool, intltool, pkgconfig, gtk3, hicolor_icon_theme, wrapGAppsHook } :

     

       1
       1
       +
       { stdenv, fetchFromGitHub, gnome3, libtool, intltool, pkgconfig, gtk3, hicolor-icon-theme, wrapGAppsHook } :

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         version = "2.2";

     
···

       12
       12
        
           sha256 = "1rbahsi33pfggpj5cigy6wy5333g3rpm8v2q0b35c6m7pwhmf2gr";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       -
         nativeBuildInputs = [ gnome3.gnome_common libtool intltool pkgconfig hicolor_icon_theme wrapGAppsHook ];

     

       15
       15
       +
         nativeBuildInputs = [ gnome3.gnome-common libtool intltool pkgconfig hicolor-icon-theme wrapGAppsHook ];

     

       16
       16
        
       

     

       17
       17
        
         buildInputs = [ gtk3 ];

     

       18
       18

+2 -2

pkgs/applications/graphics/geeqie/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, autoconf, automake, gettext, intltool

     

       2
       2
       -
       , gtk3, lcms2, exiv2, libchamplain, clutter_gtk, ffmpegthumbnailer, fbida

     

       2
       2
       +
       , gtk3, lcms2, exiv2, libchamplain, clutter-gtk, ffmpegthumbnailer, fbida

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     
···

       18
       18
        
       

     

       19
       19
        
         nativeBuildInputs = [ pkgconfig autoconf automake gettext intltool ];

     

       20
       20
        
         buildInputs = [

     

       21
       21
       -
           gtk3 lcms2 exiv2 libchamplain clutter_gtk ffmpegthumbnailer fbida

     

       21
       21
       +
           gtk3 lcms2 exiv2 libchamplain clutter-gtk ffmpegthumbnailer fbida

     

       22
       22
        
         ];

     

       23
       23
        
       

     

       24
       24
        
         postInstall = ''

+2 -2

pkgs/applications/graphics/giv/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, gdk_pixbuf, scons, pkgconfig, gtk2, glib,

     

       2
       2
       -
         pcre, cfitsio, perl, gob2, vala, libtiff, json_glib }:

     

       2
       2
       +
         pcre, cfitsio, perl, gob2, vala, libtiff, json-glib }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         name = "giv-${version}";

     
···

       26
       26
        
         installPhase = "scons install";

     

       27
       27
        
       

     

       28
       28
        
         nativeBuildInputs = [ scons pkgconfig vala perl gob2 ];

     

       29
       29
       -
         buildInputs = [ gdk_pixbuf gtk2 glib pcre cfitsio libtiff json_glib ];

     

       29
       29
       +
         buildInputs = [ gdk_pixbuf gtk2 glib pcre cfitsio libtiff json-glib ];

     

       30
       30
        
       

     

       31
       31
        
         meta = with stdenv.lib; {

     

       32
       32
        
           description = "Cross platform image and hierarchical vector viewer based";

+3 -3

pkgs/applications/graphics/glabels/default.nix

···

       1
       1
        
       { stdenv, fetchurl, barcode, gnome3, autoreconfHook

     

       2
       2
       -
       , gtk3, gtk_doc, libxml2, librsvg , libtool, libe-book

     

       2
       2
       +
       , gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book

     

       3
       3
        
       , intltool, itstool, makeWrapper, pkgconfig, which

     

       4
       4
        
       }:

     

       5
       5
        
       

     
···

       14
       14
        
       

     

       15
       15
        
         nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper intltool ];

     

       16
       16
        
         buildInputs = [

     

       17
       17
       -
           barcode gtk3 gtk_doc gnome3.yelp_tools

     

       18
       18
       -
           gnome3.gnome_common gnome3.gsettings_desktop_schemas

     

       17
       17
       +
           barcode gtk3 gtk-doc gnome3.yelp-tools

     

       18
       18
       +
           gnome3.gnome-common gnome3.gsettings-desktop-schemas

     

       19
       19
        
           itstool libxml2 librsvg libe-book libtool

     

       20
       20
        
           

     

       21
       21
        
         ];

+5 -5

pkgs/applications/graphics/gthumb/default.nix

···

       1
       1
        
       { stdenv,  fetchurl, gnome3, itstool, libxml2, pkgconfig, intltool,

     

       2
       2
        
         exiv2, libjpeg, libtiff, gstreamer, libraw, libsoup, libsecret,

     

       3
       3
       -
         libchamplain, librsvg, libwebp, json_glib, webkit, lcms2, bison,

     

       4
       4
       -
         flex, hicolor_icon_theme, wrapGAppsHook, shared_mime_info }:

     

       3
       3
       +
         libchamplain, librsvg, libwebp, json-glib, webkit, lcms2, bison,

     

       4
       4
       +
         flex, hicolor-icon-theme, wrapGAppsHook, shared-mime-info }:

     

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
        
         name = "${pname}-${version}";

     
···

       17
       17
        
         nativeBuildInputs = [ pkgconfig wrapGAppsHook ];

     

       18
       18
        
       

     

       19
       19
        
         buildInputs = with gnome3;

     

       20
       20
       -
           [ itstool libxml2 intltool glib gtk gsettings_desktop_schemas dconf

     

       20
       20
       +
           [ itstool libxml2 intltool glib gtk gsettings-desktop-schemas dconf

     

       21
       21
        
             exiv2 libjpeg libtiff gstreamer libraw libsoup libsecret libchamplain

     

       22
       22
       -
             librsvg libwebp json_glib webkit lcms2 bison flex hicolor_icon_theme defaultIconTheme ];

     

       22
       22
       +
             librsvg libwebp json-glib webkit lcms2 bison flex hicolor-icon-theme defaultIconTheme ];

     

       23
       23
        
       

     

       24
       24
        
         enableParallelBuilding = true;

     

       25
       25
        
       

     

       26
       26
        
         preFixup = ''

     

       27
       27
       -
           gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared_mime_info}/share")

     

       27
       27
       +
           gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share")

     

       28
       28
        
         '';

     

       29
       29
        
       

     

       30
       30
        
         meta = with stdenv.lib; {

+2 -2

pkgs/applications/graphics/nomacs/default.nix

···

       4
       4
        
       , makeWrapper

     

       5
       5
        
       , pkgconfig

     

       6
       6
        
       , wrapGAppsHook

     

       7
       7
       -
       , gsettings_desktop_schemas

     

       7
       7
       +
       , gsettings-desktop-schemas

     

       8
       8
        
       

     

       9
       9
        
       , qtbase

     

       10
       10
        
       , qttools

     
···

       48
       48
        
                        libraw

     

       49
       49
        
                        libtiff

     

       50
       50
        
                        quazip

     

       51
       51
       -
                        gsettings_desktop_schemas];

     

       51
       51
       +
                        gsettings-desktop-schemas];

     

       52
       52
        
       

     

       53
       53
        
         cmakeFlags = ["-DENABLE_OPENCV=ON"

     

       54
       54
        
                       "-DENABLE_RAW=ON"

+2 -2

pkgs/applications/graphics/rawtherapee/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm3, libXau

     

       2
       2
       -
       , libXdmcp, lcms2, libiptcdata, libcanberra_gtk3, fftw, expat, pcre, libsigcxx, wrapGAppsHook

     

       2
       2
       +
       , libXdmcp, lcms2, libiptcdata, libcanberra-gtk3, fftw, expat, pcre, libsigcxx, wrapGAppsHook

     

       3
       3
        
       , lensfun

     

       4
       4
        
       }:

     

       5
       5
        
       

     
···

       18
       18
        
       

     

       19
       19
        
         buildInputs = [

     

       20
       20
        
           pixman libpthreadstubs gtkmm3 libXau libXdmcp

     

       21
       21
       -
           lcms2 libiptcdata libcanberra_gtk3 fftw expat pcre libsigcxx lensfun

     

       21
       21
       +
           lcms2 libiptcdata libcanberra-gtk3 fftw expat pcre libsigcxx lensfun

     

       22
       22
        
         ];

     

       23
       23
        
       

     

       24
       24
        
         cmakeFlags = [

+5 -5

pkgs/applications/graphics/shotwell/default.nix

···

       1
       1
        
       { fetchurl, stdenv, meson, ninja, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite

     

       2
       2
       -
       , webkitgtk, pkgconfig, gnome3, gst_all_1, libgudev, libraw, glib, json_glib

     

       3
       3
       -
       , gettext, desktop_file_utils, gdk_pixbuf, librsvg, wrapGAppsHook

     

       2
       2
       +
       , webkitgtk, pkgconfig, gnome3, gst_all_1, libgudev, libraw, glib, json-glib

     

       3
       3
       +
       , gettext, desktop-file-utils, gdk_pixbuf, librsvg, wrapGAppsHook

     

       4
       4
        
       , itstool, libgdata }:

     

       5
       5
        
       

     

       6
       6
        
       # for dependencies see https://wiki.gnome.org/Apps/Shotwell/BuildingAndInstalling

     
···

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         nativeBuildInputs = [

     

       20
       20
       -
           meson ninja pkgconfig itstool gettext desktop_file_utils wrapGAppsHook

     

       20
       20
       +
           meson ninja pkgconfig itstool gettext desktop-file-utils wrapGAppsHook

     

       21
       21
        
         ];

     

       22
       22
        
       

     

       23
       23
        
         buildInputs = [

     

       24
       24
        
           gtk3 libexif libgphoto2 libsoup libxml2 vala sqlite webkitgtk

     

       25
       25
        
           gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee

     

       26
       26
       -
           libgudev gnome3.gexiv2 gnome3.gsettings_desktop_schemas

     

       27
       27
       -
           libraw json_glib glib gdk_pixbuf librsvg gnome3.rest

     

       26
       26
       +
           libgudev gnome3.gexiv2 gnome3.gsettings-desktop-schemas

     

       27
       27
       +
           libraw json-glib glib gdk_pixbuf librsvg gnome3.rest

     

       28
       28
        
           gnome3.gcr gnome3.defaultIconTheme libgdata

     

       29
       29
        
         ];

     

       30
       30

+2 -2

pkgs/applications/graphics/viewnior/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk2, libpng, exiv2, lcms

     

       2
       2
       -
       , intltool, gettext, shared_mime_info, glib, gdk_pixbuf, perl}:

     

       2
       2
       +
       , intltool, gettext, shared-mime-info, glib, gdk_pixbuf, perl}:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         name = "viewnior-${version}";

     
···

       15
       15
        
         nativeBuildInputs = [ autoreconfHook ];

     

       16
       16
        
         buildInputs =

     

       17
       17
        
           [ pkgconfig gtk2 libpng exiv2 lcms intltool gettext

     

       18
       18
       -
             shared_mime_info glib gdk_pixbuf perl

     

       18
       18
       +
             shared-mime-info glib gdk_pixbuf perl

     

       19
       19
        
           ];

     

       20
       20
        
       

     

       21
       21
        
         preFixup = ''

+2 -2

pkgs/applications/graphics/vimiv/default.nix

···

       1
       1
        
       { lib, python3Packages, fetchFromGitHub, imagemagick, librsvg, gtk3, jhead

     

       2
       2
       -
       , hicolor_icon_theme, defaultIconTheme

     

       2
       2
       +
       , hicolor-icon-theme, defaultIconTheme

     

       3
       3
        
       

     

       4
       4
        
       # Test requirements

     

       5
       5
        
       , dbus, xvfb_run, xdotool

     
···

       38
       38
        
         '';

     

       39
       39
        
       

     

       40
       40
        
         checkInputs = [ python3Packages.nose dbus.daemon xvfb_run xdotool ];

     

       41
       41
       -
         buildInputs = [ hicolor_icon_theme defaultIconTheme librsvg ];

     

       41
       41
       +
         buildInputs = [ hicolor-icon-theme defaultIconTheme librsvg ];

     

       42
       42
        
         propagatedBuildInputs = with python3Packages; [ pillow pygobject3 gtk3 ];

     

       43
       43
        
       

     

       44
       44
        
         makeWrapperArgs = [

+2 -2

pkgs/applications/kde/akonadi-mime.nix

···

       1
       1
        
       {

     

       2
       2
        
         mkDerivation, lib, kdepimTeam,

     

       3
       3
       -
         extra-cmake-modules, shared_mime_info,

     

       3
       3
       +
         extra-cmake-modules, shared-mime-info,

     

       4
       4
        
         akonadi, kdbusaddons, ki18n, kio, kitemmodels, kmime

     

       5
       5
        
       }:

     

       6
       6
        
       

     
···

       10
       10
        
           license = with lib.licenses; [ gpl2 lgpl21 ];

     

       11
       11
        
           maintainers = kdepimTeam;

     

       12
       12
        
         };

     

       13
       13
       -
         nativeBuildInputs = [ extra-cmake-modules shared_mime_info ];

     

       13
       13
       +
         nativeBuildInputs = [ extra-cmake-modules shared-mime-info ];

     

       14
       14
        
         buildInputs = [ akonadi kdbusaddons ki18n kio kitemmodels kmime ];

     

       15
       15
        
         outputs = [ "out" "dev" ];

     

       16
       16
        
       }

+2 -2

pkgs/applications/kde/akonadi/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         mkDerivation, copyPathsToStore, lib, kdepimTeam,

     

       3
       3
       -
         extra-cmake-modules, shared_mime_info,

     

       3
       3
       +
         extra-cmake-modules, shared-mime-info,

     

       4
       4
        
         boost, kcompletion, kconfigwidgets, kcrash, kdbusaddons, kdesignerplugin,

     

       5
       5
        
         ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mysql, qttools,

     

       6
       6
        
       }:

     
···

       12
       12
        
           maintainers = kdepimTeam;

     

       13
       13
        
         };

     

       14
       14
        
         patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);

     

       15
       15
       -
         nativeBuildInputs = [ extra-cmake-modules shared_mime_info ];

     

       15
       15
       +
         nativeBuildInputs = [ extra-cmake-modules shared-mime-info ];

     

       16
       16
        
         buildInputs = [

     

       17
       17
        
           kcompletion kconfigwidgets kcrash kdbusaddons kdesignerplugin ki18n

     

       18
       18
        
           kiconthemes kio kwindowsystem qttools

+2 -2

pkgs/applications/kde/k3b.nix

···

       1
       1
        
       { mkDerivation, lib

     

       2
       2
       -
       , extra-cmake-modules, kdoctools, makeWrapper, shared_mime_info

     

       2
       2
       +
       , extra-cmake-modules, kdoctools, makeWrapper, shared-mime-info

     

       3
       3
        
       , qtwebkit

     

       4
       4
        
       , libkcddb, karchive, kcmutils, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui

     

       5
       5
        
       , flac, lame, libmad, libmpcdec, libvorbis

     
···

       28
       28
        
           # cd/dvd

     

       29
       29
        
           cdparanoia libdvdcss libdvdread

     

       30
       30
        
           # others

     

       31
       31
       -
           ffmpeg libmusicbrainz3 shared_mime_info

     

       31
       31
       +
           ffmpeg libmusicbrainz3 shared-mime-info

     

       32
       32
        
         ];

     

       33
       33
        
         propagatedUserEnvPkgs = [ (lib.getBin kinit) ];

     

       34
       34
        
         postFixup =

+2 -2

pkgs/applications/kde/kdenlive.nix

···

       21
       21
        
       , kplotting

     

       22
       22
        
       , ktextwidgets

     

       23
       23
        
       , mlt

     

       24
       24
       -
       , shared_mime_info

     

       24
       24
       +
       , shared-mime-info

     

       25
       25
        
       , libv4l

     

       26
       26
        
       , kfilemetadata

     

       27
       27
        
       , ffmpeg

     
···

       62
       62
        
           qtquickcontrols

     

       63
       63
        
           qtscript

     

       64
       64
        
           qtwebkit

     

       65
       65
       -
           shared_mime_info

     

       65
       65
       +
           shared-mime-info

     

       66
       66
        
           libv4l

     

       67
       67
        
           ffmpeg

     

       68
       68
        
         ];

+2 -2

pkgs/applications/kde/kdepim-runtime.nix

···

       1
       1
        
       {

     

       2
       2
        
         mkDerivation, lib, kdepimTeam,

     

       3
       3
        
         extra-cmake-modules, kdoctools,

     

       4
       4
       -
         shared_mime_info,

     

       4
       4
       +
         shared-mime-info,

     

       5
       5
        
         akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes,

     

       6
       6
        
         kalarmcal, kcalutils, kcontacts, kdav, kdelibs4support, kidentitymanagement,

     

       7
       7
        
         kimap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig,

     
···

       14
       14
        
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       15
       15
        
           maintainers = kdepimTeam;

     

       16
       16
        
         };

     

       17
       17
       -
         nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ];

     

       17
       17
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ];

     

       18
       18
        
         buildInputs = [

     

       19
       19
        
           akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes

     

       20
       20
        
           kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap

+2 -2

pkgs/applications/kde/kio-extras.nix

···

       1
       1
        
       {

     

       2
       2
       -
         mkDerivation, lib, extra-cmake-modules, kdoctools, shared_mime_info,

     

       2
       2
       +
         mkDerivation, lib, extra-cmake-modules, kdoctools, shared-mime-info,

     

       3
       3
        
         exiv2, kactivities, karchive, kbookmarks, kconfig, kconfigwidgets,

     

       4
       4
        
         kcoreaddons, kdbusaddons, kguiaddons, kdnssd, kiconthemes, ki18n, kio, khtml,

     

       5
       5
        
         kdelibs4support, kpty, libmtp, libssh, openexr, ilmbase, openslp, phonon,

     
···

       12
       12
        
           license = with lib.licenses; [ gpl2 lgpl21 ];

     

       13
       13
        
           maintainers = [ lib.maintainers.ttuegel ];

     

       14
       14
        
         };

     

       15
       15
       -
         nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ];

     

       15
       15
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ];

     

       16
       16
        
         buildInputs = [

     

       17
       17
        
           exiv2 kactivities karchive kbookmarks kconfig kconfigwidgets kcoreaddons

     

       18
       18
        
           kdbusaddons kguiaddons kdnssd kiconthemes ki18n kio khtml kdelibs4support

+2 -2

pkgs/applications/kde/kmail-account-wizard.nix

···

       1
       1
        
       {

     

       2
       2
        
         mkDerivation, lib, kdepimTeam,

     

       3
       3
       -
         extra-cmake-modules, kdoctools, shared_mime_info,

     

       3
       3
       +
         extra-cmake-modules, kdoctools, shared-mime-info,

     

       4
       4
        
         akonadi, kcmutils, kcrash, kdbusaddons, kidentitymanagement, kldap,

     

       5
       5
        
         kmailtransport, knewstuff, knotifications, knotifyconfig, kparts, kross, ktexteditor,

     

       6
       6
        
         kwallet, libkdepim, libkleo, pimcommon, qttools,

     
···

       12
       12
        
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       13
       13
        
           maintainers = kdepimTeam;

     

       14
       14
        
         };

     

       15
       15
       -
         nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ];

     

       15
       15
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ];

     

       16
       16
        
         buildInputs = [

     

       17
       17
        
           akonadi kcmutils kcrash kdbusaddons kidentitymanagement kldap kmailtransport

     

       18
       18
        
           knewstuff knotifications knotifyconfig kparts kross ktexteditor kwallet libkdepim

+2 -2

pkgs/applications/kde/marble.nix

···

       1
       1
        
       { mkDerivation, lib

     

       2
       2
        
       , extra-cmake-modules, kdoctools

     

       3
       3
        
       , qtscript, qtsvg, qtquickcontrols, qtwebkit

     

       4
       4
       -
       , krunner, shared_mime_info, kparts, knewstuff

     

       4
       4
       +
       , krunner, shared-mime-info, kparts, knewstuff

     

       5
       5
        
       , gpsd, perl

     

       6
       6
        
       }:

     

       7
       7
        
       

     
···

       10
       10
        
         meta.license = with lib.licenses; [ lgpl21 gpl3 ];

     

       11
       11
        
         nativeBuildInputs = [ extra-cmake-modules kdoctools perl ];

     

       12
       12
        
         propagatedBuildInputs = [

     

       13
       13
       -
           qtscript qtsvg qtquickcontrols qtwebkit shared_mime_info krunner kparts

     

       13
       13
       +
           qtscript qtsvg qtquickcontrols qtwebkit shared-mime-info krunner kparts

     

       14
       14
        
           knewstuff gpsd

     

       15
       15
        
         ];

     

       16
       16
        
       }

+2 -2

pkgs/applications/kde/okteta.nix

···

       3
       3
        
         extra-cmake-modules, kdoctools,

     

       4
       4
        
         qtscript, kconfig, kinit, karchive, kcrash,

     

       5
       5
        
         kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5,

     

       6
       6
       -
         shared_mime_info

     

       6
       6
       +
         shared-mime-info

     

       7
       7
        
       }:

     

       8
       8
        
       

     

       9
       9
        
       mkDerivation {

     
···

       13
       13
        
           maintainers = with lib.maintainers; [ peterhoeg ];

     

       14
       14
        
         };

     

       15
       15
        
         nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ];

     

       16
       16
       -
         buildInputs = [ shared_mime_info ];

     

       16
       16
       +
         buildInputs = [ shared-mime-info ];

     

       17
       17
        
         propagatedBuildInputs = [

     

       18
       18
        
           kconfig kinit kcmutils kconfigwidgets knewstuff kparts qca-qt5

     

       19
       19
        
           karchive kcrash

+2 -2

pkgs/applications/misc/artha/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, dbus_glib, gtk2, pkgconfig, wordnet }:

     

       1
       1
       +
       { stdenv, fetchurl, dbus-glib, gtk2, pkgconfig, wordnet }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "artha-${version}";

     
···

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ pkgconfig ];

     

       13
       13
       -
         buildInputs = [ dbus_glib gtk2 wordnet ];

     

       13
       13
       +
         buildInputs = [ dbus-glib gtk2 wordnet ];

     

       14
       14
        
       

     

       15
       15
        
         meta = with stdenv.lib; {

     

       16
       16
        
           description = "An offline thesaurus based on WordNet";

+2 -2

pkgs/applications/misc/clipit/default.nix

···

       1
       1
       -
       { fetchurl, stdenv, intltool, pkgconfig, gtk2, xdotool, hicolor_icon_theme }:

     

       1
       1
       +
       { fetchurl, stdenv, intltool, pkgconfig, gtk2, xdotool, hicolor-icon-theme }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "clipit-${version}";

     
···

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ pkgconfig ];

     

       13
       13
       -
         buildInputs = [ intltool gtk2 xdotool hicolor_icon_theme ];

     

       13
       13
       +
         buildInputs = [ intltool gtk2 xdotool hicolor-icon-theme ];

     

       14
       14
        
       

     

       15
       15
        
         meta = with stdenv.lib; {

     

       16
       16
        
           description = "Lightweight GTK+ Clipboard Manager";

+2 -2

pkgs/applications/misc/deepin-terminal/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, vte, libgee, wnck, zssh, gettext, librsvg, libsecret, json_glib, gobjectIntrospection }:

     

       1
       1
       +
       { stdenv, fetchurl, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, vte, libgee, wnck, zssh, gettext, librsvg, libsecret, json-glib, gobjectIntrospection }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "deepin-terminal-${version}";

     
···

       30
       30
        
           # For setup hook

     

       31
       31
        
           gobjectIntrospection

     

       32
       32
        
         ];

     

       33
       33
       -
         buildInputs = [ gtk3 vte libgee wnck librsvg libsecret json_glib ];

     

       33
       33
       +
         buildInputs = [ gtk3 vte libgee wnck librsvg libsecret json-glib ];

     

       34
       34
        
       

     

       35
       35
        
         meta = with stdenv.lib; {

     

       36
       36
        
           description = "The default terminal emulation for Deepin";

+4 -4

pkgs/applications/misc/finalterm/default.nix

···

       1
       1
        
       { stdenv, lib, fetchFromGitHub, makeWrapper

     

       2
       2
       -
       , pkgconfig, cmake, libxml2, vala_0_26, intltool, libmx, gnome3, gtk3, gtk_doc

     

       3
       3
       -
       , keybinder3, clutter_gtk, libnotify

     

       2
       2
       +
       , pkgconfig, cmake, libxml2, vala_0_26, intltool, libmx, gnome3, gtk3, gtk-doc

     

       3
       3
       +
       , keybinder3, clutter-gtk, libnotify

     

       4
       4
        
       , libxkbcommon, xorg, udev

     

       5
       5
        
       , bashInteractive

     

       6
       6
        
       }:

     
···

       19
       19
        
       

     

       20
       20
        
         nativeBuildInputs = [ pkgconfig cmake intltool makeWrapper ];

     

       21
       21
        
         buildInputs = [

     

       22
       22
       -
           vala_0_26 gtk3 gnome3.gnome_common gnome3.libgee

     

       23
       23
       -
           gtk_doc clutter_gtk libmx keybinder3 libxml2 libnotify

     

       22
       22
       +
           vala_0_26 gtk3 gnome3.gnome-common gnome3.libgee

     

       23
       23
       +
           gtk-doc clutter-gtk libmx keybinder3 libxml2 libnotify

     

       24
       24
        
           xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence

     

       25
       25
        
           libxkbcommon

     

       26
       26
        
         ] ++ optionals stdenv.isLinux [ udev ];

+3 -3

pkgs/applications/misc/font-manager/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, automake, autoconf, libtool,

     

       2
       2
       -
         pkgconfig, file, intltool, libxml2, json_glib , sqlite, itstool,

     

       2
       2
       +
         pkgconfig, file, intltool, libxml2, json-glib , sqlite, itstool,

     

       3
       3
        
         librsvg, vala_0_34, gnome3, wrapGAppsHook, gobjectIntrospection

     

       4
       4
        
       }:

     

       5
       5
        
       

     
···

       20
       20
        
           file

     

       21
       21
        
           intltool

     

       22
       22
        
           vala_0_34

     

       23
       23
       -
           gnome3.yelp_tools

     

       23
       23
       +
           gnome3.yelp-tools

     

       24
       24
        
           wrapGAppsHook

     

       25
       25
        
           # For setup hook

     

       26
       26
        
           gobjectIntrospection

     
···

       28
       28
        
       

     

       29
       29
        
         buildInputs = [

     

       30
       30
        
           libxml2

     

       31
       31
       -
           json_glib

     

       31
       31
       +
           json-glib

     

       32
       32
        
           sqlite

     

       33
       33
        
           itstool

     

       34
       34
        
           librsvg

+3 -3

pkgs/applications/misc/gksu/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, gtk2, gnome3, libgksu,

     

       2
       2
       -
         intltool, libstartup_notification, gtk_doc, wrapGAppsHook

     

       2
       2
       +
         intltool, libstartup_notification, gtk-doc, wrapGAppsHook

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     
···

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         nativeBuildInputs = [

     

       16
       16
       -
           pkgconfig intltool gtk_doc wrapGAppsHook

     

       16
       16
       +
           pkgconfig intltool gtk-doc wrapGAppsHook

     

       17
       17
        
         ];

     

       18
       18
        
       

     

       19
       19
        
         buildInputs = [

     

       20
       20
       -
           gtk2 gnome3.gconf libstartup_notification gnome3.libgnome_keyring

     

       20
       20
       +
           gtk2 gnome3.gconf libstartup_notification gnome3.libgnome-keyring

     

       21
       21
        
         ];

     

       22
       22
        
       

     

       23
       23
        
         propagatedBuildInputs = [

+2 -2

pkgs/applications/misc/gmtp/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, libmtp, libid3tag, flac, libvorbis, gtk3

     

       2
       2
       -
       , gsettings_desktop_schemas, wrapGAppsHook

     

       2
       2
       +
       , gsettings-desktop-schemas, wrapGAppsHook

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       let version = "1.3.10"; in

     
···

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         nativeBuildInputs = [ pkgconfig wrapGAppsHook ];

     

       16
       16
       -
         buildInputs = [ libmtp libid3tag flac libvorbis gtk3 gsettings_desktop_schemas ];

     

       16
       16
       +
         buildInputs = [ libmtp libid3tag flac libvorbis gtk3 gsettings-desktop-schemas ];

     

       17
       17
        
       

     

       18
       18
        
         enableParallelBuilding = true;

     

       19
       19

+3 -3

pkgs/applications/misc/gpx-viewer/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, intltool, pkgconfig, gnome3, shared_mime_info, desktop_file_utils, wrapGAppsHook }:

     

       1
       1
       +
       { stdenv, fetchurl, intltool, pkgconfig, gnome3, shared-mime-info, desktop-file-utils, wrapGAppsHook }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "gpx-viewer-${version}";

     
···

       17
       17
        
       

     

       18
       18
        
         nativeBuildInputs = [

     

       19
       19
        
           intltool pkgconfig

     

       20
       20
       -
           shared_mime_info # For update-mime-database

     

       21
       21
       -
           desktop_file_utils # For update-desktop-database

     

       20
       20
       +
           shared-mime-info # For update-mime-database

     

       21
       21
       +
           desktop-file-utils # For update-desktop-database

     

       22
       22
        
           wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system

     

       23
       23
        
         ];

     

       24
       24
        
         buildInputs = with gnome3; [ gdl libchamplain defaultIconTheme ];

+1 -1

pkgs/applications/misc/gramps/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool,

     

       2
       2
       -
         pango, gsettings_desktop_schemas,

     

       2
       2
       +
         pango, gsettings-desktop-schemas,

     

       3
       3
        
       # Optional packages:

     

       4
       4
        
        enableOSM ? true, osm-gps-map

     

       5
       5
        
        }:

+1 -1

pkgs/applications/misc/guake/default.nix

···

       17
       17
        
       

     

       18
       18
        
       let

     

       19
       19
        
         inherit (python2Packages) python;

     

       20
       20
       -
         inputs = [ dbus gtk2 gconf python libutempter vte keybinder gnome3.gnome_common ];

     

       20
       20
       +
         inputs = [ dbus gtk2 gconf python libutempter vte keybinder gnome3.gnome-common ];

     

       21
       21
        
         pyPath = makeSearchPathOutput "lib" python.sitePackages (attrVals [ "dbus-python" "notify" "pyGtkGlade" "pyxdg" ] python2Packages ++ [ gnome2.gnome_python ]);

     

       22
       22
        
        in stdenv.mkDerivation rec {

     

       23
       23
        
         name = "guake-${version}";

+4 -4

pkgs/applications/misc/hamster-time-tracker/default.nix

···

       1
       1
       -
       { stdenv, fetchzip, pythonPackages, docbook2x, libxslt, gnome_doc_utils

     

       2
       2
       -
       , intltool, dbus_glib, gnome_python, dbus

     

       3
       3
       -
       , hicolor_icon_theme

     

       1
       1
       +
       { stdenv, fetchzip, pythonPackages, docbook2x, libxslt, gnome-doc-utils

     

       2
       2
       +
       , intltool, dbus-glib, gnome_python, dbus

     

       3
       3
       +
       , hicolor-icon-theme

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       # TODO: Add optional dependency 'wnck', for "workspace tracking" support. Fixes

     
···

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         buildInputs = [

     

       21
       21
       -
           docbook2x libxslt gnome_doc_utils intltool dbus_glib hicolor_icon_theme

     

       21
       21
       +
           docbook2x libxslt gnome-doc-utils intltool dbus-glib hicolor-icon-theme

     

       22
       22
        
         ];

     

       23
       23
        
       

     

       24
       24
        
         propagatedBuildInputs = with pythonPackages; [ pygobject2 pygtk pyxdg gnome_python dbus-python ];

+2 -2

pkgs/applications/misc/kiwix/default.nix

···

       1
       1
        
       { stdenv, fetchurl, makeWrapper, pkgconfig

     

       2
       2
        
       , zip, python, zlib, which, icu, libmicrohttpd, lzma, aria2, wget, bc

     

       3
       3
       -
       , libuuid, glibc, libX11, libXext, libXt, libXrender, glib, dbus, dbus_glib

     

       3
       3
       +
       , libuuid, glibc, libX11, libXext, libXt, libXrender, glib, dbus, dbus-glib

     

       4
       4
        
       , gtk2, gdk_pixbuf, pango, cairo, freetype, fontconfig, alsaLib, atk, cmake

     

       5
       5
        
       , xapian, ctpp2, zimlib

     

       6
       6
        
       }:

     
···

       93
       93
        
       

     

       94
       94
        
           rm $out/bin/kiwix

     

       95
       95
        
           makeWrapper $out/lib/kiwix/kiwix-launcher $out/bin/kiwix \

     

       96
       96
       -
             --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]} \

     

       96
       96
       +
             --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]} \

     

       97
       97
        
             --suffix PATH : ${aria2}/bin

     

       98
       98
        
         '';

     

       99
       99

+2 -2

pkgs/applications/misc/kupfer/default.nix

···

       8
       8
        
       , dbus

     

       9
       9
        
       , libwnck3

     

       10
       10
        
       , keybinder3

     

       11
       11
       -
       , hicolor_icon_theme

     

       11
       11
       +
       , hicolor-icon-theme

     

       12
       12
        
       , wrapGAppsHook

     

       13
       13
        
       }:

     

       14
       14
        
       

     
···

       28
       28
        
           # For setup hook

     

       29
       29
        
           gobjectIntrospection

     

       30
       30
        
         ];

     

       31
       31
       -
         buildInputs = [ hicolor_icon_theme docutils libwnck3 keybinder3 ];

     

       31
       31
       +
         buildInputs = [ hicolor-icon-theme docutils libwnck3 keybinder3 ];

     

       32
       32
        
         propagatedBuildInputs = [ pygobject3 gtk3 pyxdg dbus-python pycairo ];

     

       33
       33
        
       

     

       34
       34
        
         configurePhase = ''

+2 -2

pkgs/applications/misc/mediainfo-gui/default.nix

···

       1
       1
        
       { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, wxGTK

     

       2
       2
       -
       , desktop_file_utils, libSM, imagemagick }:

     

       2
       2
       +
       , desktop-file-utils, libSM, imagemagick }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         version = "17.10";

     
···

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ autoreconfHook pkgconfig ];

     

       13
       13
       -
         buildInputs = [ libzen libmediainfo wxGTK desktop_file_utils libSM

     

       13
       13
       +
         buildInputs = [ libzen libmediainfo wxGTK desktop-file-utils libSM

     

       14
       14
        
                         imagemagick ];

     

       15
       15
        
       

     

       16
       16
        
         sourceRoot = "./MediaInfo/Project/GNU/GUI/";

+5 -5

pkgs/applications/misc/mysql-workbench/default.nix

···

       1
       1
        
       { stdenv, fetchurl, makeWrapper, cmake, pkgconfig

     

       2
       2
       -
       , glibc, gnome_keyring, gtk, gtkmm, pcre, swig, sudo

     

       2
       2
       +
       , glibc, gnome-keyring, gtk, gtkmm, pcre, swig, sudo

     

       3
       3
        
       , mysql, libxml2, libctemplate, libmysqlconnectorcpp

     

       4
       4
        
       , vsqlite, tinyxml, gdal, libiodbc, libpthreadstubs

     

       5
       5
       -
       , libXdmcp, libuuid, libzip, libgnome_keyring, file

     

       5
       5
       +
       , libXdmcp, libuuid, libzip, libgnome-keyring, file

     

       6
       6
        
       , pythonPackages, jre, autoconf, automake, libtool

     

       7
       7
        
       , boost, glibmm, libsigcxx, pangomm, libX11, openssl

     

       8
       8
        
       , proj, cairo, libglade

     
···

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         nativeBuildInputs = [ pkgconfig ];

     

       24
       24
       -
         buildInputs = [ cmake gnome_keyring gtk gtk.dev gtkmm pcre swig python sudo

     

       24
       24
       +
         buildInputs = [ cmake gnome-keyring gtk gtk.dev gtkmm pcre swig python sudo

     

       25
       25
        
           paramiko mysql libxml2 libctemplate libmysqlconnectorcpp vsqlite tinyxml gdal libiodbc file

     

       26
       26
       -
           libpthreadstubs libXdmcp libuuid libzip libgnome_keyring libgnome_keyring.dev jre autoconf

     

       26
       26
       +
           libpthreadstubs libXdmcp libuuid libzip libgnome-keyring libgnome-keyring.dev jre autoconf

     

       27
       27
        
           automake libtool boost glibmm glibmm.dev libsigcxx pangomm libX11 pexpect pycrypto openssl

     

       28
       28
        
           proj cairo cairo.dev makeWrapper libglade ] ;

     

       29
       29
        
       

     
···

       82
       82
        
           wrapProgram "$out/bin/mysql-workbench" \

     

       83
       83
        
             --prefix LD_LIBRARY_PATH : "${python}/lib" \

     

       84
       84
        
             --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.cc}/nix-support/orig-cc)/lib64" \

     

       85
       85
       -
             --prefix PATH : "${gnome_keyring}/bin" \

     

       85
       85
       +
             --prefix PATH : "${gnome-keyring}/bin" \

     

       86
       86
        
             --prefix PATH : "${python}/bin" \

     

       87
       87
        
             --set PYTHONPATH $PYTHONPATH \

     

       88
       88
        
             --run '

+3 -3

pkgs/applications/misc/notify-osd/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, glib, libwnck3, libnotify, dbus_glib, makeWrapper, gnome3 }:

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, glib, libwnck3, libnotify, dbus-glib, makeWrapper, gnome3 }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "notify-osd-${version}";

     
···

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ pkgconfig ];

     

       13
       13
        
         buildInputs = [

     

       14
       14
       -
           glib libwnck3 libnotify dbus_glib makeWrapper

     

       15
       15
       -
           gnome3.gsettings_desktop_schemas

     

       14
       14
       +
           glib libwnck3 libnotify dbus-glib makeWrapper

     

       15
       15
       +
           gnome3.gsettings-desktop-schemas

     

       16
       16
        
         ];

     

       17
       17
        
       

     

       18
       18
        
         configureFlags = "--libexecdir=$(out)/bin";

+6 -6

pkgs/applications/misc/onboard/default.nix

···

       1
       1
        
       { fetchurl

     

       2
       2
        
       , stdenv

     

       3
       3
        
       , aspellWithDicts

     

       4
       4
       -
       , at_spi2_core ? null

     

       4
       4
       +
       , at-spi2-core ? null

     

       5
       5
        
       , atspiSupport ? true

     

       6
       6
        
       , bash

     

       7
       7
        
       , glib

     

       8
       8
        
       , glibcLocales

     

       9
       9
        
       , gnome3

     

       10
       10
        
       , gobjectIntrospection

     

       11
       11
       -
       , gsettings_desktop_schemas

     

       11
       11
       +
       , gsettings-desktop-schemas

     

       12
       12
        
       , gtk3

     

       13
       13
        
       , hunspell

     

       14
       14
        
       , hunspellDicts

     

       15
       15
        
       , hunspellWithDicts

     

       16
       16
        
       , intltool

     

       17
       17
        
       , isocodes

     

       18
       18
       -
       , libcanberra_gtk3

     

       18
       18
       +
       , libcanberra-gtk3

     

       19
       19
        
       , libudev

     

       20
       20
        
       , libxkbcommon

     

       21
       21
        
       , pkgconfig

     
···

       74
       74
        
         buildInputs = [

     

       75
       75
        
           bash

     

       76
       76
        
           gnome3.dconf

     

       77
       77
       -
           gsettings_desktop_schemas

     

       77
       77
       +
           gsettings-desktop-schemas

     

       78
       78
        
           gtk3

     

       79
       79
        
           hunspell

     

       80
       80
        
           isocodes

     

       81
       81
       -
           libcanberra_gtk3

     

       81
       81
       +
           libcanberra-gtk3

     

       82
       82
        
           libudev

     

       83
       83
        
           libxkbcommon

     

       84
       84
        
           wrapGAppsHook

     

       85
       85
        
           xorg.libXtst

     

       86
       86
        
           xorg.libxkbfile

     

       87
       87
       -
         ] ++ stdenv.lib.optional atspiSupport at_spi2_core;

     

       87
       87
       +
         ] ++ stdenv.lib.optional atspiSupport at-spi2-core;

     

       88
       88
        
       

     

       89
       89
        
         nativeBuildInputs = [

     

       90
       90
        
           glibcLocales

+5 -5

pkgs/applications/misc/orca/default.nix

···

       1
       1
        
       { stdenv, lib, pkgconfig, fetchurl, buildPythonApplication

     

       2
       2
        
       , autoreconfHook, wrapGAppsHook

     

       3
       3
       -
       , intltool, yelp_tools, itstool, libxmlxx3

     

       3
       3
       +
       , intltool, yelp-tools, itstool, libxmlxx3

     

       4
       4
        
       , python, pygobject3, gtk3, gnome3, substituteAll

     

       5
       5
       -
       , at_spi2_atk, at_spi2_core, pyatspi, dbus, dbus-python, pyxdg

     

       6
       6
       -
       , xkbcomp, gsettings_desktop_schemas, liblouis

     

       5
       5
       +
       , at-spi2-atk, at-spi2-core, pyatspi, dbus, dbus-python, pyxdg

     

       6
       6
       +
       , xkbcomp, gsettings-desktop-schemas, liblouis

     

       7
       7
        
       , speechd, brltty, setproctitle, gst_all_1, gst-python

     

       8
       8
        
       }:

     

       9
       9
        
       

     
···

       30
       30
        
       

     

       31
       31
        
         nativeBuildInputs = [

     

       32
       32
        
           autoreconfHook wrapGAppsHook pkgconfig libxmlxx3

     

       33
       33
       -
           intltool yelp_tools itstool

     

       33
       33
       +
           intltool yelp-tools itstool

     

       34
       34
        
         ];

     

       35
       35
        
       

     

       36
       36
        
         propagatedBuildInputs = [

     
···

       38
       38
        
         ];

     

       39
       39
        
       

     

       40
       40
        
         buildInputs = [

     

       41
       41
       -
           python gtk3 at_spi2_atk at_spi2_core dbus gsettings_desktop_schemas

     

       41
       41
       +
           python gtk3 at-spi2-atk at-spi2-core dbus gsettings-desktop-schemas

     

       42
       42
        
           gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good

     

       43
       43
        
         ];

     

       44
       44

+2 -2

pkgs/applications/misc/pdfmod/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, fetchpatch, pkgconfig, gnome_doc_utils, intltool, lib

     

       1
       1
       +
       { stdenv, fetchurl, fetchpatch, pkgconfig, gnome-doc-utils, intltool, lib

     

       2
       2
        
       , mono, gtk-sharp-2_0, gnome-sharp, hyena

     

       3
       3
        
       , which, makeWrapper, glib, gnome3, poppler, wrapGAppsHook

     

       4
       4
        
       }:

     
···

       20
       20
        
       

     

       21
       21
        
         nativeBuildInputs = [ pkgconfig ];

     

       22
       22
        
         buildInputs = [

     

       23
       23
       -
           gnome_doc_utils intltool mono gtk-sharp-2_0 gnome-sharp

     

       23
       23
       +
           gnome-doc-utils intltool mono gtk-sharp-2_0 gnome-sharp

     

       24
       24
        
           hyena which makeWrapper wrapGAppsHook

     

       25
       25
        
         ];

     

       26
       26

+3 -3

pkgs/applications/misc/pdfshuffler/default.nix

···

       1
       1
        
       { stdenv, fetchsvn

     

       2
       2
        
       , wrapGAppsHook, makeWrapper, gettext

     

       3
       3
        
       , python3Packages, gtk3, poppler_gi

     

       4
       4
       -
       , gnome3, gsettings_desktop_schemas, shared_mime_info,

     

       4
       4
       +
       , gnome3, gsettings-desktop-schemas, shared-mime-info,

     

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
        
       python3Packages.buildPythonApplication rec {

     
···

       16
       16
        
         nativeBuildInputs = [ wrapGAppsHook gettext makeWrapper ];

     

       17
       17
        
       

     

       18
       18
        
         buildInputs = [

     

       19
       19
       -
           gtk3 gsettings_desktop_schemas poppler_gi gnome3.adwaita-icon-theme

     

       19
       19
       +
           gtk3 gsettings-desktop-schemas poppler_gi gnome3.adwaita-icon-theme

     

       20
       20
        
         ];

     

       21
       21
        
       

     

       22
       22
        
         propagatedBuildInputs = with python3Packages; [

     
···

       26
       26
        
         ];

     

       27
       27
        
       

     

       28
       28
        
         preFixup = ''

     

       29
       29
       -
           gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared_mime_info}/share")

     

       29
       29
       +
           gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share")

     

       30
       30
        
         '';

     

       31
       31
        
       

     

       32
       32
        
         doCheck = false; # no tests

+6 -6

pkgs/applications/misc/roxterm/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, docbook_xsl, dbus_libs, dbus_glib, expat, gettext

     

       2
       2
       -
       , gsettings_desktop_schemas, gdk_pixbuf, gtk2, gtk3, hicolor_icon_theme

     

       1
       1
       +
       { stdenv, fetchurl, docbook_xsl, dbus_libs, dbus-glib, expat, gettext

     

       2
       2
       +
       , gsettings-desktop-schemas, gdk_pixbuf, gtk2, gtk3, hicolor-icon-theme

     

       3
       3
        
       , imagemagick, itstool, librsvg, libtool, libxslt, lockfile, makeWrapper

     

       4
       4
        
       , pkgconfig, python, pythonPackages, vte

     

       5
       5
        
       , wrapGAppsHook}:

     
···

       22
       22
        
       

     

       23
       23
        
         buildInputs =

     

       24
       24
        
           [ docbook_xsl expat imagemagick itstool librsvg libtool libxslt

     

       25
       25
       -
             makeWrapper python pythonPackages.lockfile dbus_libs dbus_glib

     

       26
       26
       -
             gdk_pixbuf gsettings_desktop_schemas gtk3

     

       27
       27
       -
             hicolor_icon_theme vte ];

     

       25
       25
       +
             makeWrapper python pythonPackages.lockfile dbus_libs dbus-glib

     

       26
       26
       +
             gdk_pixbuf gsettings-desktop-schemas gtk3

     

       27
       27
       +
             hicolor-icon-theme vte ];

     

       28
       28
        
       

     

       29
       29
       -
         NIX_CFLAGS_COMPILE = [ "-I${dbus_glib.dev}/include/dbus-1.0"

     

       29
       29
       +
         NIX_CFLAGS_COMPILE = [ "-I${dbus-glib.dev}/include/dbus-1.0"

     

       30
       30
        
                                "-I${dbus_libs.dev}/include/dbus-1.0"

     

       31
       31
        
                                "-I${dbus_libs.lib}/lib/dbus-1.0/include" ];

     

       32
       32

+2 -2

pkgs/applications/misc/simplenote/default.nix

···

       1
       1
        
       { fetchurl, stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig

     

       2
       2
       -
       , libgnome_keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr

     

       2
       2
       +
       , libgnome-keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr

     

       3
       3
        
       , nss, xorg, libcap, systemd, libnotify ,libXScrnSaver, gnome3 }:

     

       4
       4
        
       

     

       5
       5
        
        stdenv.mkDerivation rec {

     
···

       15
       15
        
         buildCommand = let

     

       16
       16
        
       

     

       17
       17
        
           packages = [

     

       18
       18
       -
             stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome_keyring3

     

       18
       18
       +
             stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3

     

       19
       19
        
             fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr nss

     

       20
       20
        
             xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst

     

       21
       21
        
             xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr

+4 -4

pkgs/applications/misc/spacefm/default.nix

···

       1
       1
       -
       { pkgs, fetchFromGitHub, stdenv, gtk3, udev, desktop_file_utils

     

       2
       2
       -
       , shared_mime_info, intltool, pkgconfig, wrapGAppsHook, ffmpegthumbnailer

     

       3
       3
       -
       , jmtpfs, ifuseSupport ? false, ifuse ? null, lsof, udisks, hicolor_icon_theme, adwaita-icon-theme }:

     

       1
       1
       +
       { pkgs, fetchFromGitHub, stdenv, gtk3, udev, desktop-file-utils

     

       2
       2
       +
       , shared-mime-info, intltool, pkgconfig, wrapGAppsHook, ffmpegthumbnailer

     

       3
       3
       +
       , jmtpfs, ifuseSupport ? false, ifuse ? null, lsof, udisks, hicolor-icon-theme, adwaita-icon-theme }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         name = "spacefm-${version}";

     
···

       28
       28
        
       

     

       29
       29
        
         nativeBuildInputs = [ pkgconfig ];

     

       30
       30
        
         buildInputs = [

     

       31
       31
       -
           gtk3 udev desktop_file_utils shared_mime_info intltool

     

       31
       31
       +
           gtk3 udev desktop-file-utils shared-mime-info intltool

     

       32
       32
        
           wrapGAppsHook ffmpegthumbnailer jmtpfs lsof udisks

     

       33
       33
        
         ] ++ (if ifuseSupport then [ ifuse ] else []);

     

       34
       34
        
         # Introduced because ifuse doesn't build due to CVEs in libplist

+3 -3

pkgs/applications/misc/sweethome3d/default.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant

     

       2
       2
       -
       , gtk3, gsettings_desktop_schemas, p7zip, libXxf86vm }:

     

       2
       2
       +
       , gtk3, gsettings-desktop-schemas, p7zip, libXxf86vm }:

     

       3
       3
        
       

     

       4
       4
        
       let

     

       5
       5
        
       

     
···

       36
       36
        
             patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/i586/libnativewindow_x11.so

     

       37
       37
        
           '';

     

       38
       38
        
       

     

       39
       39
       -
           buildInputs = [ ant jdk jre makeWrapper p7zip gtk3 gsettings_desktop_schemas ];

     

       39
       39
       +
           buildInputs = [ ant jdk jre makeWrapper p7zip gtk3 gsettings-desktop-schemas ];

     

       40
       40
        
       

     

       41
       41
        
           buildPhase = ''

     

       42
       42
        
             ant furniture textures help

     
···

       54
       54
        
             cp "${sweethome3dItem}/share/applications/"* $out/share/applications

     

       55
       55
        
       

     

       56
       56
        
             makeWrapper ${jre}/bin/java $out/bin/$exec \

     

       57
       57
       -
               --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings_desktop_schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \

     

       57
       57
       +
               --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings-desktop-schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \

     

       58
       58
        
               --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"}"

     

       59
       59
        
           '';

     

       60
       60

+3 -3

pkgs/applications/misc/sweethome3d/editors.nix

···

       1
       1
        
       { stdenv, fetchurl, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant

     

       2
       2
       -
       , gtk3, gsettings_desktop_schemas, p7zip, sweethome3dApp }:

     

       2
       2
       +
       , gtk3, gsettings-desktop-schemas, p7zip, sweethome3dApp }:

     

       3
       3
        
       

     

       4
       4
        
       let

     

       5
       5
        
       

     
···

       26
       26
        
             categories = "Application;Graphics;2DGraphics;3DGraphics;";

     

       27
       27
        
           };

     

       28
       28
        
       

     

       29
       29
       -
           buildInputs = [ ant jre jdk makeWrapper gtk3 gsettings_desktop_schemas ];

     

       29
       29
       +
           buildInputs = [ ant jre jdk makeWrapper gtk3 gsettings-desktop-schemas ];

     

       30
       30
        
       

     

       31
       31
        
           patchPhase = ''

     

       32
       32
        
             sed -i -e 's,../SweetHome3D,${application.src},g' build.xml

     
···

       43
       43
        
             cp ${module}-${version}.jar $out/share/java/.

     

       44
       44
        
             cp "${editorItem}/share/applications/"* $out/share/applications

     

       45
       45
        
             makeWrapper ${jre}/bin/java $out/bin/$exec \

     

       46
       46
       -
               --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings_desktop_schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \

     

       46
       46
       +
               --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings-desktop-schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \

     

       47
       47
        
               --add-flags "-jar $out/share/java/${module}-${version}.jar ${if stdenv.system == "x86_64-linux" then "-d64" else "-d32"}"

     

       48
       48
        
           '';

     

       49
       49

+3 -3

pkgs/applications/misc/synapse/default.nix

···

       1
       1
        
       { stdenv, fetchurl, gettext, pkgconfig, glib, libnotify, gtk3, libgee

     

       2
       2
       -
       , keybinder3, json_glib, zeitgeist, vala_0_38, hicolor_icon_theme, gobjectIntrospection

     

       2
       2
       +
       , keybinder3, json-glib, zeitgeist, vala_0_38, hicolor-icon-theme, gobjectIntrospection

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       let

     
···

       18
       18
        
           gobjectIntrospection

     

       19
       19
        
         ];

     

       20
       20
        
         buildInputs = [

     

       21
       21
       -
           glib libnotify gtk3 libgee keybinder3 json_glib zeitgeist

     

       22
       22
       -
           hicolor_icon_theme

     

       21
       21
       +
           glib libnotify gtk3 libgee keybinder3 json-glib zeitgeist

     

       22
       22
       +
           hicolor-icon-theme

     

       23
       23
        
         ];

     

       24
       24
        
       

     

       25
       25
        
         meta = with stdenv.lib; {

+3 -3

pkgs/applications/misc/tilix/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, dmd, gnome3, dbus

     

       2
       2
       -
       , gsettings_desktop_schemas, libsecret, desktop_file_utils, gettext, gtkd

     

       2
       2
       +
       , gsettings-desktop-schemas, libsecret, desktop-file-utils, gettext, gtkd

     

       3
       3
        
       , perlPackages, wrapGAppsHook, xdg_utils }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     
···

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [

     

       17
       17
       -
           autoreconfHook dmd desktop_file_utils perlPackages.Po4a pkgconfig xdg_utils

     

       17
       17
       +
           autoreconfHook dmd desktop-file-utils perlPackages.Po4a pkgconfig xdg_utils

     

       18
       18
        
           wrapGAppsHook

     

       19
       19
        
         ];

     

       20
       20
       -
         buildInputs = [ gnome3.dconf gettext gsettings_desktop_schemas gtkd dbus ];

     

       20
       20
       +
         buildInputs = [ gnome3.dconf gettext gsettings-desktop-schemas gtkd dbus ];

     

       21
       21
        
       

     

       22
       22
        
         preBuild = ''

     

       23
       23
        
           makeFlagsArray=(PERL5LIB="${perlPackages.Po4a}/lib/perl5")

+2 -2

pkgs/applications/misc/tint2/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitLab, pkgconfig, cmake, gettext, cairo, pango, pcre

     

       2
       2
        
       , glib, imlib2, gtk2, libXinerama, libXrender, libXcomposite, libXdamage

     

       3
       3
        
       , libX11, libXrandr, librsvg, libpthreadstubs, libXdmcp

     

       4
       4
       -
       , libstartup_notification, hicolor_icon_theme, wrapGAppsHook

     

       4
       4
       +
       , libstartup_notification, hicolor-icon-theme, wrapGAppsHook

     

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     
···

       21
       21
        
       

     

       22
       22
        
         buildInputs = [ cairo pango pcre glib imlib2 gtk2 libXinerama libXrender

     

       23
       23
        
           libXcomposite libXdamage libX11 libXrandr librsvg libpthreadstubs

     

       24
       24
       -
           libXdmcp libstartup_notification hicolor_icon_theme ];

     

       24
       24
       +
           libXdmcp libstartup_notification hicolor-icon-theme ];

     

       25
       25
        
       

     

       26
       26
        
         postPatch = ''

     

       27
       27
        
           substituteInPlace CMakeLists.txt --replace /etc $out/etc

+2 -2

pkgs/applications/misc/udiskie/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, asciidoc-full, gettext

     

       2
       2
       -
       , gobjectIntrospection, gtk3, hicolor_icon_theme, libnotify, librsvg

     

       2
       2
       +
       , gobjectIntrospection, gtk3, hicolor-icon-theme, libnotify, librsvg

     

       3
       3
        
       , udisks2, wrapGAppsHook

     

       4
       4
        
       , buildPythonApplication

     

       5
       5
        
       , docopt

     
···

       21
       21
        
       

     

       22
       22
        
         buildInputs = [

     

       23
       23
        
           asciidoc-full        # For building man page.

     

       24
       24
       -
           hicolor_icon_theme

     

       24
       24
       +
           hicolor-icon-theme

     

       25
       25
        
           wrapGAppsHook

     

       26
       26
        
           librsvg              # required for loading svg icons (udiskie uses svg icons)

     

       27
       27
        
         ];

+2 -2

pkgs/applications/misc/viking/default.nix

···

       1
       1
        
       { fetchurl, stdenv, makeWrapper, pkgconfig, intltool, gettext, gtk2, expat, curl

     

       2
       2
       -
       , gpsd, bc, file, gnome_doc_utils, libexif, libxml2, libxslt, scrollkeeper

     

       2
       2
       +
       , gpsd, bc, file, gnome-doc-utils, libexif, libxml2, libxslt, scrollkeeper

     

       3
       3
        
       , docbook_xml_dtd_412, gexiv2, sqlite, gpsbabel, expect }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     
···

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ pkgconfig ];

     

       15
       15
       -
         buildInputs = [ makeWrapper intltool gettext gtk2 expat curl gpsd bc file gnome_doc_utils

     

       15
       15
       +
         buildInputs = [ makeWrapper intltool gettext gtk2 expat curl gpsd bc file gnome-doc-utils

     

       16
       16
        
           libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 sqlite

     

       17
       17
        
         ];

     

       18
       18

+2 -2

pkgs/applications/misc/volnoti/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, fetchpatch

     

       2
       2
        
       , pkgconfig, dbus, gdk_pixbuf, glib, libX11, gtk2, librsvg

     

       3
       3
       -
       , dbus_glib, autoreconfHook, wrapGAppsHook }:

     

       3
       3
       +
       , dbus-glib, autoreconfHook, wrapGAppsHook }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         name = "volnoti-unstable-${version}";

     
···

       25
       25
        
         nativeBuildInputs = [ pkgconfig autoreconfHook wrapGAppsHook ];

     

       26
       26
        
       

     

       27
       27
        
         buildInputs = [

     

       28
       28
       -
           dbus gdk_pixbuf glib libX11 gtk2 dbus_glib librsvg

     

       28
       28
       +
           dbus gdk_pixbuf glib libX11 gtk2 dbus-glib librsvg

     

       29
       29
        
         ];

     

       30
       30
        
       

     

       31
       31
        
         meta = with stdenv.lib; {

+2 -2

pkgs/applications/misc/workrave/default.nix

···

       2
       2
        
       , autoconf, automake, gettext, intltool, libtool, pkgconfig

     

       3
       3
        
       , libICE, libSM, libXScrnSaver, libXtst, cheetah

     

       4
       4
        
       , glib, glibmm, gtkmm2, atk, pango, pangomm, cairo, cairomm

     

       5
       5
       -
       , dbus, dbus_glib, GConf, gconfmm, gdome2, gstreamer, libsigcxx }:

     

       5
       5
       +
       , dbus, dbus-glib, GConf, gconfmm, gdome2, gstreamer, libsigcxx }:

     

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     

       8
       8
        
         name = "workrave-${version}";

     
···

       33
       33
        
         buildInputs = [

     

       34
       34
        
           libICE libSM libXScrnSaver libXtst cheetah

     

       35
       35
        
           glib glibmm gtkmm2 atk pango pangomm cairo cairomm

     

       36
       36
       -
           dbus dbus_glib GConf gconfmm gdome2 gstreamer libsigcxx

     

       36
       36
       +
           dbus dbus-glib GConf gconfmm gdome2 gstreamer libsigcxx

     

       37
       37
        
         ];

     

       38
       38
        
       

     

       39
       39
        
         preConfigure = "./autogen.sh";

+4 -4

pkgs/applications/misc/xiphos/default.nix

···

       3
       3
        
       , intltool

     

       4
       4
        
       , docbook2x, docbook_xml_dtd_412, libxslt

     

       5
       5
        
       , sword, clucene_core, biblesync

     

       6
       6
       -
       , gnome_doc_utils

     

       6
       6
       +
       , gnome-doc-utils

     

       7
       7
        
       , libgsf, gconf

     

       8
       8
        
       , gtkhtml, libglade, scrollkeeper

     

       9
       9
        
       , webkitgtk

     

       10
       10
       -
       , dbus_glib, enchant, isocodes, libuuid, icu

     

       10
       10
       +
       , dbus-glib, enchant, isocodes, libuuid, icu

     

       11
       11
        
       , wrapGAppsHook

     

       12
       12
        
       }:

     

       13
       13
        
       

     
···

       24
       24
        
       

     

       25
       25
        
         nativeBuildInputs = [ pkgconfig wrapGAppsHook ];

     

       26
       26
        
         buildInputs = [ python intltool docbook2x docbook_xml_dtd_412 libxslt

     

       27
       27
       -
                         sword clucene_core biblesync gnome_doc_utils libgsf gconf gtkhtml

     

       28
       28
       -
                         libglade scrollkeeper webkitgtk dbus_glib enchant isocodes libuuid icu ];

     

       27
       27
       +
                         sword clucene_core biblesync gnome-doc-utils libgsf gconf gtkhtml

     

       28
       28
       +
                         libglade scrollkeeper webkitgtk dbus-glib enchant isocodes libuuid icu ];

     

       29
       29
        
       

     

       30
       30
        
         prePatch = ''

     

       31
       31
        
           patchShebangs .;

+4 -4

pkgs/applications/networking/browsers/chromium/common.nix

···

       11
       11
        
       , nspr, systemd, kerberos

     

       12
       12
        
       , utillinux, alsaLib

     

       13
       13
        
       , bison, gperf

     

       14
       14
       -
       , glib, gtk2, gtk3, dbus_glib

     

       14
       14
       +
       , glib, gtk2, gtk3, dbus-glib

     

       15
       15
        
       , libXScrnSaver, libXcursor, libXtst, mesa

     

       16
       16
        
       , protobuf, speechd, libXdamage, cups

     

       17
       17
        
       , ffmpeg, harfbuzz, harfbuzz-icu, libxslt, libxml2

     
···

       25
       25
        
       , enableHotwording ? false

     

       26
       26
        
       , enableWideVine ? false

     

       27
       27
        
       , gnomeSupport ? false, gnome ? null

     

       28
       28
       -
       , gnomeKeyringSupport ? false, libgnome_keyring3 ? null

     

       28
       28
       +
       , gnomeKeyringSupport ? false, libgnome-keyring3 ? null

     

       29
       29
        
       , proprietaryCodecs ? true

     

       30
       30
        
       , cupsSupport ? true

     

       31
       31
        
       , pulseSupport ? false, libpulseaudio ? null

     
···

       125
       125
        
             nspr nss systemd

     

       126
       126
        
             utillinux alsaLib

     

       127
       127
        
             bison gperf kerberos

     

       128
       128
       -
             glib gtk2 gtk3 dbus_glib

     

       128
       128
       +
             glib gtk2 gtk3 dbus-glib

     

       129
       129
        
             libXScrnSaver libXcursor libXtst mesa

     

       130
       130
        
             pciutils protobuf speechd libXdamage

     

       131
       131
       -
           ] ++ optional gnomeKeyringSupport libgnome_keyring3

     

       131
       131
       +
           ] ++ optional gnomeKeyringSupport libgnome-keyring3

     

       132
       132
        
             ++ optionals gnomeSupport [ gnome.GConf libgcrypt ]

     

       133
       133
        
             ++ optionals cupsSupport [ libgcrypt cups ]

     

       134
       134
        
             ++ optional pulseSupport libpulseaudio;

+2 -2

pkgs/applications/networking/browsers/chromium/default.nix

···

       1
       1
        
       { newScope, stdenv, makeWrapper, makeDesktopItem, ed

     

       2
       2
       -
       , glib, gtk3, gnome3, gsettings_desktop_schemas

     

       2
       2
       +
       , glib, gtk3, gnome3, gsettings-desktop-schemas

     

       3
       3
        
       

     

       4
       4
        
       # package customization

     

       5
       5
        
       , channel ? "stable"

     
···

       75
       75
        
           makeWrapper ed

     

       76
       76
        
       

     

       77
       77
        
           # needed for GSETTINGS_SCHEMAS_PATH

     

       78
       78
       -
           gsettings_desktop_schemas glib gtk3

     

       78
       78
       +
           gsettings-desktop-schemas glib gtk3

     

       79
       79
        
       

     

       80
       80
        
           # needed for XDG_ICON_DIRS

     

       81
       81
        
           gnome3.defaultIconTheme

+4 -4

pkgs/applications/networking/browsers/dwb/default.nix

···

       1
       1
        
       { stdenv, fetchgit, pkgconfig, makeWrapper, libsoup, webkitgtk24x-gtk2, gtk2, gnutls

     

       2
       2
       -
       , json_c, m4, glib_networking, gsettings_desktop_schemas, dconf }:

     

       2
       2
       +
       , json_c, m4, glib-networking, gsettings-desktop-schemas, dconf }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation {

     

       5
       5
        
         name = "dwb-2016-03-21";

     
···

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         nativeBuildInputs = [ pkgconfig ];

     

       14
       14
       -
         buildInputs = [ makeWrapper gsettings_desktop_schemas libsoup

     

       14
       14
       +
         buildInputs = [ makeWrapper gsettings-desktop-schemas libsoup

     

       15
       15
        
           webkitgtk24x-gtk2 gtk2 gnutls json_c m4 ];

     

       16
       16
        
       

     

       17
       17
        
         # There are Xlib and gtk warnings therefore I have set Wno-error

     
···

       19
       19
        
       

     

       20
       20
        
         preFixup=''

     

       21
       21
        
           wrapProgram "$out/bin/dwb" \

     

       22
       22
       -
            --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules:${stdenv.lib.getLib dconf}/lib/gio/modules" \

     

       22
       22
       +
            --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules:${stdenv.lib.getLib dconf}/lib/gio/modules" \

     

       23
       23
        
            --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share"

     

       24
       24
        
           wrapProgram "$out/bin/dwbem" \

     

       25
       25
       -
            --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules"

     

       25
       25
       +
            --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules"

     

       26
       26
        
         '';

     

       27
       27
        
       

     

       28
       28
        
         meta = with stdenv.lib; {

+3 -3

pkgs/applications/networking/browsers/eolie/default.nix

···

       1
       1
        
       { stdenv, fetchgit, intltool, itstool, meson, ninja, pkgconfig, wrapGAppsHook

     

       2
       2
       -
       , git, glib, glib_networking, gsettings_desktop_schemas, gst_all_1, gtk3

     

       2
       2
       +
       , git, glib, glib-networking, gsettings-desktop-schemas, gst_all_1, gtk3

     

       3
       3
        
       , gtkspell3, libsecret, python36, python36Packages, webkitgtk }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     
···

       23
       23
        
       

     

       24
       24
        
         buildInputs = [

     

       25
       25
        
           git # required to download ad blocking DB

     

       26
       26
       -
           glib_networking

     

       27
       27
       -
           gsettings_desktop_schemas

     

       26
       26
       +
           glib-networking

     

       27
       27
       +
           gsettings-desktop-schemas

     

       28
       28
        
           gst_all_1.gstreamer

     

       29
       29
        
           gst_all_1.gst-plugins-base

     

       30
       30
        
           gst_all_1.gst-plugins-good

+4 -4

pkgs/applications/networking/browsers/firefox-bin/default.nix

···

       4
       4
        
       , cairo

     

       5
       5
        
       , curl

     

       6
       6
        
       , cups

     

       7
       7
       -
       , dbus_glib

     

       7
       7
       +
       , dbus-glib

     

       8
       8
        
       , dbus_libs

     

       9
       9
        
       , fontconfig

     

       10
       10
        
       , freetype

     
···

       27
       27
        
       , libXinerama

     

       28
       28
        
       , libXrender

     

       29
       29
        
       , libXt

     

       30
       30
       -
       , libcanberra_gtk2

     

       30
       30
       +
       , libcanberra-gtk2

     

       31
       31
        
       , libgnome

     

       32
       32
        
       , libgnomeui

     

       33
       33
        
       , defaultIconTheme

     
···

       92
       92
        
             cairo

     

       93
       93
        
             curl

     

       94
       94
        
             cups

     

       95
       95
       -
             dbus_glib

     

       95
       95
       +
             dbus-glib

     

       96
       96
        
             dbus_libs

     

       97
       97
        
             fontconfig

     

       98
       98
        
             freetype

     
···

       115
       115
        
             libXinerama

     

       116
       116
        
             libXrender

     

       117
       117
        
             libXt

     

       118
       118
       -
             libcanberra_gtk2

     

       118
       118
       +
             libcanberra-gtk2

     

       119
       119
        
             libgnome

     

       120
       120
        
             libgnomeui

     

       121
       121
        
             mesa

+2 -2

pkgs/applications/networking/browsers/firefox/common.nix

···

       3
       3
        
       , isTorBrowserLike ? false }:

     

       4
       4
        
       

     

       5
       5
        
       { lib, stdenv, pkgconfig, pango, perl, python, zip, libIDL

     

       6
       6
       -
       , libjpeg, zlib, dbus, dbus_glib, bzip2, xorg

     

       6
       6
       +
       , libjpeg, zlib, dbus, dbus-glib, bzip2, xorg

     

       7
       7
        
       , freetype, fontconfig, file, nspr, nss, libnotify

     

       8
       8
        
       , yasm, mesa, sqlite, unzip, makeWrapper

     

       9
       9
        
       , hunspell, libevent, libstartup_notification, libvpx

     
···

       73
       73
        
       

     

       74
       74
        
         buildInputs = [

     

       75
       75
        
           gtk2 perl zip libIDL libjpeg zlib bzip2

     

       76
       76
       -
           dbus dbus_glib pango freetype fontconfig xorg.libXi

     

       76
       76
       +
           dbus dbus-glib pango freetype fontconfig xorg.libXi

     

       77
       77
        
           xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file

     

       78
       78
        
           nspr libnotify xorg.pixman yasm mesa

     

       79
       79
        
           xorg.libXScrnSaver xorg.scrnsaverproto

+4 -4

pkgs/applications/networking/browsers/firefox/wrapper.nix

···

       2
       2
        
       

     

       3
       3
        
       ## various stuff that can be plugged in

     

       4
       4
        
       , flashplayer, hal-flash

     

       5
       5
       -
       , MPlayerPlugin, ffmpeg, gst_all, xorg, libpulseaudio, libcanberra_gtk2

     

       5
       5
       +
       , MPlayerPlugin, ffmpeg, gst_all, xorg, libpulseaudio, libcanberra-gtk2

     

       6
       6
        
       , jrePlugin, icedtea_web

     

       7
       7
        
       , trezor-bridge, bluejeans, djview4, adobe-reader

     

       8
       8
       -
       , google_talk_plugin, fribid, gnome3/*.gnome_shell*/

     

       8
       8
       +
       , google_talk_plugin, fribid, gnome3/*.gnome-shell*/

     

       9
       9
        
       , esteidfirefoxplugin

     

       10
       10
        
       , vlc_npapi

     

       11
       11
        
       , browserpass, chrome-gnome-shell

     
···

       52
       52
        
                 ++ lib.optional icedtea icedtea_web

     

       53
       53
        
                 ++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin

     

       54
       54
        
                 ++ lib.optional (cfg.enableFriBIDPlugin or false) fribid

     

       55
       55
       -
                 ++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome_shell

     

       55
       55
       +
                 ++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome-shell

     

       56
       56
        
                 ++ lib.optional (cfg.enableTrezor or false) trezor-bridge

     

       57
       57
        
                 ++ lib.optional (cfg.enableBluejeans or false) bluejeans

     

       58
       58
        
                 ++ lib.optional (cfg.enableAdobeReader or false) adobe-reader

     
···

       73
       73
        
                   ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash

     

       74
       74
        
                   ++ lib.optional (config.pulseaudio or true) libpulseaudio;

     

       75
       75
        
             gst-plugins = with gst_all; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ];

     

       76
       76
       -
             gtk_modules = [ libcanberra_gtk2 ];

     

       76
       76
       +
             gtk_modules = [ libcanberra-gtk2 ];

     

       77
       77
        
       

     

       78
       78
        
           in stdenv.mkDerivation {

     

       79
       79
        
             inherit name;

+4 -4

pkgs/applications/networking/browsers/google-chrome/default.nix

···

       4
       4
        
       , glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr

     

       5
       5
        
       , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb

     

       6
       6
        
       , alsaLib, libXdamage, libXtst, libXrandr, expat, cups

     

       7
       7
       -
       , dbus_libs, gtk2, gtk3, gdk_pixbuf, gcc-unwrapped, at_spi2_atk

     

       7
       7
       +
       , dbus_libs, gtk2, gtk3, gdk_pixbuf, gcc-unwrapped, at-spi2-atk

     

       8
       8
        
       , kerberos

     

       9
       9
        
       

     

       10
       10
        
       # command line arguments which are always set e.g "--disable-gpu"

     
···

       33
       33
        
       # Only needed for getting information about upstream binaries

     

       34
       34
        
       , chromium

     

       35
       35
        
       

     

       36
       36
       -
       , gsettings_desktop_schemas

     

       36
       36
       +
       , gsettings-desktop-schemas

     

       37
       37
        
       , gnome2, gnome3

     

       38
       38
        
       }:

     

       39
       39
        
       

     
···

       57
       57
        
           libexif

     

       58
       58
        
           liberation_ttf curl utillinux xdg_utils wget

     

       59
       59
        
           flac harfbuzz icu libpng opusWithCustomModes snappy speechd

     

       60
       60
       -
           bzip2 libcap at_spi2_atk

     

       60
       60
       +
           bzip2 libcap at-spi2-atk

     

       61
       61
        
           kerberos

     

       62
       62
        
         ] ++ optional pulseSupport libpulseaudio

     

       63
       63
        
           ++ [ gtk ];

     
···

       75
       75
        
           patchelf

     

       76
       76
        
       

     

       77
       77
        
           # needed for GSETTINGS_SCHEMAS_PATH

     

       78
       78
       -
           gsettings_desktop_schemas glib gtk

     

       78
       78
       +
           gsettings-desktop-schemas glib gtk

     

       79
       79
        
       

     

       80
       80
        
           # needed for XDG_ICON_DIRS

     

       81
       81
        
           gnome.defaultIconTheme

+4 -4

pkgs/applications/networking/browsers/jumanji/default.nix

···

       1
       1
       -
       { stdenv, fetchgit, pkgconfig, girara, gtk, webkitgtk, glib_networking, makeWrapper

     

       2
       2
       -
       , gsettings_desktop_schemas }:

     

       1
       1
       +
       { stdenv, fetchgit, pkgconfig, girara, gtk, webkitgtk, glib-networking, makeWrapper

     

       2
       2
       +
       , gsettings-desktop-schemas }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         name = "jumanji-${version}";

     
···

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ pkgconfig ];

     

       15
       15
       -
         buildInputs = [ girara gtk webkitgtk makeWrapper gsettings_desktop_schemas ];

     

       15
       15
       +
         buildInputs = [ girara gtk webkitgtk makeWrapper gsettings-desktop-schemas ];

     

       16
       16
        
       

     

       17
       17
        
         makeFlags = [ "PREFIX=$(out)" ];

     

       18
       18
        
       

     

       19
       19
        
         preFixup=''

     

       20
       20
        
           wrapProgram "$out/bin/jumanji" \

     

       21
       21
       -
            --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \

     

       21
       21
       +
            --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \

     

       22
       22
        
            --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"

     

       23
       23
        
         '';

     

       24
       24

+5 -5

pkgs/applications/networking/browsers/midori/default.nix

···

       1
       1
        
       { stdenv, fetchurl, cmake, pkgconfig, intltool, vala_0_34, wrapGAppsHook

     

       2
       2
        
       , gtk3, webkitgtk, librsvg, libnotify, sqlite

     

       3
       3
       -
       , glib_networking, gsettings_desktop_schemas, libsoup, pcre, gnome3

     

       4
       4
       -
       , libxcb, libpthreadstubs, libXdmcp, libxkbcommon, epoxy, at_spi2_core

     

       3
       3
       +
       , glib-networking, gsettings-desktop-schemas, libsoup, pcre, gnome3

     

       4
       4
       +
       , libxcb, libpthreadstubs, libXdmcp, libxkbcommon, epoxy, at-spi2-core

     

       5
       5
        
       , zeitgeistSupport ? false, zeitgeist ? null

     

       6
       6
        
       }:

     

       7
       7
        
       

     
···

       33
       33
        
         ];

     

       34
       34
        
       

     

       35
       35
        
         buildInputs = [

     

       36
       36
       -
           gtk3 webkitgtk librsvg libnotify sqlite gsettings_desktop_schemas pcre gnome3.gcr

     

       37
       37
       -
           libxcb libpthreadstubs libXdmcp libxkbcommon epoxy at_spi2_core

     

       36
       36
       +
           gtk3 webkitgtk librsvg libnotify sqlite gsettings-desktop-schemas pcre gnome3.gcr

     

       37
       37
       +
           libxcb libpthreadstubs libXdmcp libxkbcommon epoxy at-spi2-core

     

       38
       38
        
           (libsoup.override {gnomeSupport = true; valaSupport = true;})

     

       39
       39
        
         ] ++ stdenv.lib.optionals zeitgeistSupport [

     

       40
       40
        
           zeitgeist

     
···

       49
       49
        
         NIX_LDFLAGS="-lX11";

     

       50
       50
        
       

     

       51
       51
        
         preFixup = ''

     

       52
       52
       -
           gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules")

     

       52
       52
       +
           gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules")

     

       53
       53
        
         '';

     

       54
       54
        
       }

+2 -2

pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix

···

       1
       1
        
       { stdenv, fetchurl, rpm, cpio, mesa_noglu, xorg, cairo

     

       2
       2
        
       , libpng, gtk2, glib, gdk_pixbuf, fontconfig, freetype, curl

     

       3
       3
       -
       , dbus_glib, alsaLib, libpulseaudio, systemd, pango

     

       3
       3
       +
       , dbus-glib, alsaLib, libpulseaudio, systemd, pango

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       with stdenv.lib;

     
···

       36
       36
        
             stdenv.cc.cc

     

       37
       37
        
             alsaLib

     

       38
       38
        
             libpulseaudio

     

       39
       39
       -
             dbus_glib

     

       39
       39
       +
             dbus-glib

     

       40
       40
        
             systemd

     

       41
       41
        
             curl

     

       42
       42
        
             pango

+2 -2

pkgs/applications/networking/browsers/palemoon/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, makeDesktopItem

     

       2
       2
        
       , pkgconfig, autoconf213, alsaLib, bzip2, cairo

     

       3
       3
       -
       , dbus, dbus_glib, file, fontconfig, freetype

     

       3
       3
       +
       , dbus, dbus-glib, file, fontconfig, freetype

     

       4
       4
        
       , gstreamer, gst-plugins-base, gst_all_1

     

       5
       5
        
       , gtk2, hunspell, icu, libevent, libjpeg, libnotify

     

       6
       6
        
       , libstartup_notification, libvpx, makeWrapper, mesa

     
···

       39
       39
        
         };

     

       40
       40
        
       

     

       41
       41
        
         buildInputs = [

     

       42
       42
       -
           alsaLib bzip2 cairo dbus dbus_glib file fontconfig freetype

     

       42
       42
       +
           alsaLib bzip2 cairo dbus dbus-glib file fontconfig freetype

     

       43
       43
        
           gst-plugins-base gstreamer gst_all_1.gst-plugins-base gtk2

     

       44
       44
        
           hunspell icu libevent libjpeg libnotify libstartup_notification

     

       45
       45
        
           libvpx makeWrapper mesa nspr nss pango perl pkgconfig python

+2 -2

pkgs/applications/networking/browsers/qutebrowser/default.nix

···

       1
       1
        
       { stdenv, lib, fetchurl, fetchzip, python3Packages

     

       2
       2
       -
       , makeWrapper, wrapGAppsHook, qtbase, glib_networking

     

       2
       2
       +
       , makeWrapper, wrapGAppsHook, qtbase, glib-networking

     

       3
       3
        
       , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2

     

       4
       4
        
       , libxslt, gst_all_1 ? null

     

       5
       5
        
       , withPdfReader        ? true

     
···

       43
       43
        
       

     

       44
       44
        
         buildInputs = [

     

       45
       45
        
           qtbase

     

       46
       46
       -
           glib_networking

     

       46
       46
       +
           glib-networking

     

       47
       47
        
         ] ++ lib.optionals withMediaPlayback (with gst_all_1; [

     

       48
       48
        
           gst-plugins-base gst-plugins-good

     

       49
       49
        
           gst-plugins-bad gst-plugins-ugly gst-libav

+2 -2

pkgs/applications/networking/browsers/surf/default.nix

···

       1
       1
        
       { stdenv, fetchurl

     

       2
       2
        
       , pkgconfig, wrapGAppsHook

     

       3
       3
       -
       , glib, glib_networking, gsettings_desktop_schemas, gtk, libsoup, webkitgtk

     

       3
       3
       +
       , glib, glib-networking, gsettings-desktop-schemas, gtk, libsoup, webkitgtk

     

       4
       4
        
       , patches ? null

     

       5
       5
        
       }:

     

       6
       6
        
       

     
···

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [ pkgconfig wrapGAppsHook ];

     

       17
       17
       -
         buildInputs = [ glib glib_networking gsettings_desktop_schemas gtk libsoup webkitgtk ];

     

       17
       17
       +
         buildInputs = [ glib glib-networking gsettings-desktop-schemas gtk libsoup webkitgtk ];

     

       18
       18
        
       

     

       19
       19
        
         inherit patches;

     

       20
       20

+6 -6

pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix

···

       9
       9
        
       , atk

     

       10
       10
        
       , cairo

     

       11
       11
        
       , dbus

     

       12
       12
       -
       , dbus_glib

     

       12
       12
       +
       , dbus-glib

     

       13
       13
        
       , fontconfig

     

       14
       14
        
       , freetype

     

       15
       15
        
       , gdk_pixbuf

     
···

       42
       42
        
       # Wrapper runtime

     

       43
       43
        
       , coreutils

     

       44
       44
        
       , glibcLocales

     

       45
       45
       -
       , hicolor_icon_theme

     

       46
       46
       -
       , shared_mime_info

     

       45
       45
       +
       , hicolor-icon-theme

     

       46
       46
       +
       , shared-mime-info

     

       47
       47
        
       

     

       48
       48
        
       # Whether to disable multiprocess support to work around crashing tabs

     

       49
       49
        
       # TODO: fix the underlying problem instead of this terrible work-around

     
···

       62
       62
        
           atk

     

       63
       63
        
           cairo

     

       64
       64
        
           dbus

     

       65
       65
       -
           dbus_glib

     

       65
       65
       +
           dbus-glib

     

       66
       66
        
           fontconfig

     

       67
       67
        
           freetype

     

       68
       68
        
           gdk_pixbuf

     
···

       261
       261
        
           EOF

     

       262
       262
        
       

     

       263
       263
        
           WRAPPER_XDG_DATA_DIRS=${concatMapStringsSep ":" (x: "${x}/share") [

     

       264
       264
       -
             hicolor_icon_theme

     

       265
       265
       -
             shared_mime_info

     

       264
       264
       +
             hicolor-icon-theme

     

       265
       265
       +
             shared-mime-info

     

       266
       266
        
           ]}

     

       267
       267
        
       

     

       268
       268
        
           # Generate wrapper

+4 -4

pkgs/applications/networking/browsers/tor-browser-bundle/default.nix

···

       8
       8
        
       

     

       9
       9
        
       # Wrapper runtime

     

       10
       10
        
       , coreutils

     

       11
       11
       -
       , hicolor_icon_theme

     

       12
       12
       -
       , shared_mime_info

     

       11
       11
       +
       , hicolor-icon-theme

     

       12
       12
       +
       , shared-mime-info

     

       13
       13
        
       , noto-fonts

     

       14
       14
        
       , noto-fonts-emoji

     

       15
       15
        
       

     
···

       197
       197
        
           # Generate a suitable wrapper

     

       198
       198
        
           wrapper_PATH=${makeBinPath [ coreutils ]}

     

       199
       199
        
           wrapper_XDG_DATA_DIRS=${concatMapStringsSep ":" (x: "${x}/share") [

     

       200
       200
       -
             hicolor_icon_theme

     

       201
       201
       -
             shared_mime_info

     

       200
       200
       +
             hicolor-icon-theme

     

       201
       201
       +
             shared-mime-info

     

       202
       202
        
           ]}

     

       203
       203
        
       

     

       204
       204
        
           ${optionalString audioSupport ''

+3 -3

pkgs/applications/networking/browsers/uzbl/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, python3, makeWrapper

     

       2
       2
       -
       , webkit, glib_networking, gsettings_desktop_schemas, python2Packages

     

       2
       2
       +
       , webkit, glib-networking, gsettings-desktop-schemas, python2Packages

     

       3
       3
        
       }:

     

       4
       4
        
       # This package needs python3 during buildtime,

     

       5
       5
        
       # but Python 2 + packages during runtime.

     
···

       31
       31
        
         preFixup = ''

     

       32
       32
        
           for f in $out/bin/*; do

     

       33
       33
        
             wrapProgram $f \

     

       34
       34
       -
               --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \

     

       34
       34
       +
               --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \

     

       35
       35
        
               --prefix PYTHONPATH : "$PYTHONPATH" \

     

       36
       36
        
               --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share"

     

       37
       37
        
           done

     
···

       39
       39
        
       

     

       40
       40
        
         nativeBuildInputs = [ pkgconfig python3 makeWrapper ];

     

       41
       41
        
       

     

       42
       42
       -
         buildInputs = [ gsettings_desktop_schemas webkit ];

     

       42
       42
       +
         buildInputs = [ gsettings-desktop-schemas webkit ];

     

       43
       43
        
         propagatedBuildInputs = with python2Packages; [ pygtk six ];

     

       44
       44
        
       }

+4 -4

pkgs/applications/networking/browsers/vimb/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, libsoup, webkit, gtk2, glib_networking

     

       2
       2
       -
       , gsettings_desktop_schemas, makeWrapper

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, libsoup, webkit, gtk2, glib-networking

     

       2
       2
       +
       , gsettings-desktop-schemas, makeWrapper

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     
···

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ pkgconfig ];

     

       15
       15
       -
         buildInputs = [ makeWrapper gtk2 libsoup webkit gsettings_desktop_schemas ];

     

       15
       15
       +
         buildInputs = [ makeWrapper gtk2 libsoup webkit gsettings-desktop-schemas ];

     

       16
       16
        
       

     

       17
       17
        
         makeFlags = [ "PREFIX=$(out)" ];

     

       18
       18
        
       

     

       19
       19
        
         preFixup = ''

     

       20
       20
        
           wrapProgram "$out/bin/vimb" \

     

       21
       21
       -
             --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \

     

       21
       21
       +
             --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \

     

       22
       22
        
             --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"

     

       23
       23
        
         '';

     

       24
       24

+4 -4

pkgs/applications/networking/browsers/vimprobable2/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, makeWrapper, glib, glib_networking, gtk2, libsoup, libX11, perl,

     

       2
       2
       -
         pkgconfig, webkit, gsettings_desktop_schemas }:

     

       1
       1
       +
       { stdenv, fetchurl, makeWrapper, glib, glib-networking, gtk2, libsoup, libX11, perl,

     

       2
       2
       +
         pkgconfig, webkit, gsettings-desktop-schemas }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         version = "1.4.2";

     
···

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ pkgconfig ];

     

       13
       13
       -
         buildInputs = [ makeWrapper gtk2 libsoup libX11 perl webkit gsettings_desktop_schemas ];

     

       13
       13
       +
         buildInputs = [ makeWrapper gtk2 libsoup libX11 perl webkit gsettings-desktop-schemas ];

     

       14
       14
        
       

     

       15
       15
        
         hardeningDisable = [ "format" ];

     

       16
       16
        
       

     
···

       18
       18
        
       

     

       19
       19
        
         preFixup = ''

     

       20
       20
        
           wrapProgram "$out/bin/vimprobable2" \

     

       21
       21
       -
             --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \

     

       21
       21
       +
             --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \

     

       22
       22
        
             --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"

     

       23
       23
        
         '';

     

       24
       24

+2 -2

pkgs/applications/networking/browsers/vivaldi/default.nix

···

       4
       4
        
       , freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp

     

       5
       5
        
       , libuuid, xz

     

       6
       6
        
       , gstreamer, gst-plugins-base, libxml2

     

       7
       7
       -
       , glib, gtk3, pango, gdk_pixbuf, cairo, atk, at_spi2_atk, gnome3

     

       7
       7
       +
       , glib, gtk3, pango, gdk_pixbuf, cairo, atk, at-spi2-atk, gnome3

     

       8
       8
        
       , nss, nspr

     

       9
       9
        
       , patchelf, makeWrapper

     

       10
       10
        
       , proprietaryCodecs ? false, vivaldi-ffmpeg-codecs ? null

     
···

       30
       30
        
         buildInputs = [

     

       31
       31
        
           stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb

     

       32
       32
        
           libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr

     

       33
       33
       -
           atk at_spi2_atk alsaLib dbus_libs cups gtk3 gdk_pixbuf libexif ffmpeg systemd

     

       33
       33
       +
           atk at-spi2-atk alsaLib dbus_libs cups gtk3 gdk_pixbuf libexif ffmpeg systemd

     

       34
       34
        
           freetype fontconfig libXrender libuuid expat glib nss nspr

     

       35
       35
        
           gstreamer libxml2 gst-plugins-base pango cairo gnome3.gconf

     

       36
       36
        
         ] ++ stdenv.lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs;

+2 -2

pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix

···

       1
       1
        
       { stdenv, fetchurl, fetchpatch

     

       2
       2
       -
       , dbus_glib, gtk2, gtk3, libexif, libpulseaudio, libXScrnSaver, ninja, nss

     

       2
       2
       +
       , dbus-glib, gtk2, gtk3, libexif, libpulseaudio, libXScrnSaver, ninja, nss

     

       3
       3
        
       , pciutils, pkgconfig, python2, xdg_utils

     

       4
       4
        
       }:

     

       5
       5
        
       

     
···

       16
       16
        
         buildInputs = [ ];

     

       17
       17
        
       

     

       18
       18
        
         nativeBuildInputs = [

     

       19
       19
       -
           dbus_glib gtk2 gtk3 libexif libpulseaudio libXScrnSaver ninja nss pciutils pkgconfig

     

       19
       19
       +
           dbus-glib gtk2 gtk3 libexif libpulseaudio libXScrnSaver ninja nss pciutils pkgconfig

     

       20
       20
        
           python2 xdg_utils

     

       21
       21
        
         ];

     

       22
       22

+3 -3

pkgs/applications/networking/corebird/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, gtk3, json_glib, sqlite, libsoup, gettext, vala_0_32

     

       1
       1
       +
       { stdenv, fetchFromGitHub, gtk3, json-glib, sqlite, libsoup, gettext, vala_0_32

     

       2
       2
        
       , automake, autoconf, libtool, pkgconfig, gnome3, gst_all_1, wrapGAppsHook

     

       3
       3
       -
       , glib_networking }:

     

       3
       3
       +
       , glib-networking }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         version = "1.7.3";

     
···

       20
       20
        
         nativeBuildInputs = [ automake autoconf libtool pkgconfig wrapGAppsHook ];

     

       21
       21
        
       

     

       22
       22
        
         buildInputs = [

     

       23
       23
       -
           gtk3 json_glib sqlite libsoup gettext vala_0_32 gnome3.dconf gnome3.gspell glib_networking

     

       23
       23
       +
           gtk3 json-glib sqlite libsoup gettext vala_0_32 gnome3.dconf gnome3.gspell glib-networking

     

       24
       24
        
         ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good (gst-plugins-bad.override { gtkSupport = true; }) gst-libav ]);

     

       25
       25
        
       

     

       26
       26
        
         meta = {

+2 -2

pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix

···

       1
       1
       -
       { fetchurl, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, json_glib }:

     

       1
       1
       +
       { fetchurl, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, json-glib }:

     

       2
       2
        
       

     

       3
       3
        
       with stdenv.lib;

     

       4
       4
        
       stdenv.mkDerivation rec {

     
···

       14
       14
        
       

     

       15
       15
        
         nativeBuildInputs = [ autoconf automake libtool pkgconfig ];

     

       16
       16
        
       

     

       17
       17
       -
         buildInputs = [ bitlbee glib json_glib ];

     

       17
       17
       +
         buildInputs = [ bitlbee glib json-glib ];

     

       18
       18
        
       

     

       19
       19
        
         preConfigure = ''

     

       20
       20
        
           export BITLBEE_PLUGINDIR=$out/lib/bitlbee

+4 -4

pkgs/applications/networking/instant-messengers/dino/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub

     

       2
       2
        
       , vala, cmake, ninja, wrapGAppsHook, pkgconfig, gettext

     

       3
       3
       -
       , gobjectIntrospection, gnome3, glib, gdk_pixbuf, gtk3, glib_networking

     

       3
       3
       +
       , gobjectIntrospection, gnome3, glib, gdk_pixbuf, gtk3, glib-networking

     

       4
       4
        
       , xorg, libXdmcp, libxkbcommon

     

       5
       5
        
       , libnotify, libsoup

     

       6
       6
        
       , libgcrypt

     

       7
       7
        
       , epoxy

     

       8
       8
       -
       , at_spi2_core

     

       8
       8
       +
       , at-spi2-core

     

       9
       9
        
       , sqlite

     

       10
       10
        
       , dbus

     

       11
       11
        
       , gpgme

     
···

       33
       33
        
       

     

       34
       34
        
         buildInputs = [

     

       35
       35
        
           gobjectIntrospection

     

       36
       36
       -
           glib_networking

     

       36
       36
       +
           glib-networking

     

       37
       37
        
           glib

     

       38
       38
        
           gnome3.libgee

     

       39
       39
        
           gnome3.defaultIconTheme

     
···

       50
       50
        
           libXdmcp

     

       51
       51
        
           libxkbcommon

     

       52
       52
        
           epoxy

     

       53
       53
       -
           at_spi2_core

     

       53
       53
       +
           at-spi2-core

     

       54
       54
        
           dbus

     

       55
       55
        
           gettext

     

       56
       56
        
         ];

+5 -5

pkgs/applications/networking/instant-messengers/ekiga/default.nix

···

       1
       1
        
       { stdenv, glib, fetchurl, fetchpatch, cyrus_sasl, gettext, openldap, ptlib, opal, libXv, rarian, intltool

     

       2
       2
       -
       , perl, perlXMLParser, evolution_data_server, gnome_doc_utils, avahi, autoreconfHook

     

       3
       3
       -
       , libsigcxx, gtk, dbus_glib, libnotify, libXext, xextproto, gnome3, boost, libsecret

     

       4
       4
       -
       , pkgconfig, libxml2, videoproto, unixODBC, db, nspr, nss, zlib, hicolor_icon_theme

     

       2
       2
       +
       , perl, perlXMLParser, evolution-data-server, gnome-doc-utils, avahi, autoreconfHook

     

       3
       3
       +
       , libsigcxx, gtk, dbus-glib, libnotify, libXext, xextproto, gnome3, boost, libsecret

     

       4
       4
       +
       , pkgconfig, libxml2, videoproto, unixODBC, db, nspr, nss, zlib, hicolor-icon-theme

     

       5
       5
        
       , libXrandr, randrproto, which, libxslt, libtasn1, gmp, nettle, sqlite, makeWrapper }:

     

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     
···

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         buildInputs = [ cyrus_sasl gettext openldap ptlib opal libXv rarian intltool

     

       16
       16
       -
                         perl perlXMLParser evolution_data_server gnome_doc_utils avahi

     

       17
       17
       -
                         libsigcxx gtk dbus_glib libnotify libXext xextproto sqlite

     

       16
       16
       +
                         perl perlXMLParser evolution-data-server gnome-doc-utils avahi

     

       17
       17
       +
                         libsigcxx gtk dbus-glib libnotify libXext xextproto sqlite

     

       18
       18
        
                         gnome3.libsoup glib gnome3.defaultIconTheme boost

     

       19
       19
        
                         autoreconfHook pkgconfig libxml2 videoproto unixODBC db nspr

     

       20
       20
        
                         nss zlib libsecret libXrandr randrproto which libxslt libtasn1

+2 -2

pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, pidgin, unzip, glib, json_glib, nss, nspr, libgnome_keyring } :

     

       1
       1
       +
       { stdenv, fetchFromGitHub, pidgin, unzip, glib, json-glib, nss, nspr, libgnome-keyring } :

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "pidgin-opensteamworks-${version}";

     
···

       19
       19
        
           unzip releases/icons.zip -d $out/share/pixmaps/pidgin/protocols/

     

       20
       20
        
         '';

     

       21
       21
        
       

     

       22
       22
       -
         buildInputs = [ pidgin unzip glib json_glib nss nspr libgnome_keyring ];

     

       22
       22
       +
         buildInputs = [ pidgin unzip glib json-glib nss nspr libgnome-keyring ];

     

       23
       23
        
       

     

       24
       24
        
         meta = with stdenv.lib; {

     

       25
       25
        
           homepage = https://github.com/EionRobb/pidgin-opensteamworks;

+2 -2

pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, pkgconfig, pidgin, json_glib }:

     

       1
       1
       +
       { stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "pidgin-skypeweb-${version}";

     
···

       16
       16
        
         '';

     

       17
       17
        
       

     

       18
       18
        
         nativeBuildInputs = [ pkgconfig ];

     

       19
       19
       -
         buildInputs = [ pidgin json_glib ];

     

       19
       19
       +
         buildInputs = [ pidgin json-glib ];

     

       20
       20
        
       

     

       21
       21
        
         makeFlags = [

     

       22
       22
        
           "PLUGIN_DIR_PURPLE=/lib/pidgin/"

+2 -2

pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, fetchhg, pidgin, glib, json_glib, mercurial, autoreconfHook } :

     

       1
       1
       +
       { stdenv, fetchFromGitHub, fetchhg, pidgin, glib, json-glib, mercurial, autoreconfHook } :

     

       2
       2
        
       

     

       3
       3
        
       

     

       4
       4
        
       let

     
···

       53
       53
        
         '';

     

       54
       54
        
       

     

       55
       55
        
         nativeBuildInputs = [ autoreconfHook ];

     

       56
       56
       -
         buildInputs = [pidgin glib json_glib mercurial];

     

       56
       56
       +
         buildInputs = [pidgin glib json-glib mercurial];

     

       57
       57
        
       

     

       58
       58
        
         meta = with stdenv.lib; {

     

       59
       59
        
           inherit (src.meta) homepage;

+2 -2

pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix

···

       1
       1
       -
       { stdenv, fetchhg, pidgin, glib, json_glib, protobuf, protobufc }:

     

       1
       1
       +
       { stdenv, fetchhg, pidgin, glib, json-glib, protobuf, protobufc }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "purple-hangouts-hg-${version}";

     
···

       10
       10
        
           sha256 = "0cs7dcd44lkc2anradyddjvmfvnl46ixw4idaf1m9fd7j35mg7b1";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
       -
         buildInputs = [ pidgin glib json_glib protobuf protobufc ];

     

       13
       13
       +
         buildInputs = [ pidgin glib json-glib protobuf protobufc ];

     

       14
       14
        
       

     

       15
       15
        
         installPhase = ''

     

       16
       16
        
           install -Dm755 -t $out/lib/pidgin/ libhangouts.so

+2 -2

pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix

···

       1
       1
       -
       { stdenv, fetchgit, pkgconfig, pidgin, json_glib, glib, http-parser } :

     

       1
       1
       +
       { stdenv, fetchgit, pkgconfig, pidgin, json-glib, glib, http-parser } :

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         version = "2016-07-11";

     
···

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         nativeBuildInputs = [ pkgconfig ];

     

       16
       16
       -
         buildInputs = [ pidgin json_glib glib http-parser ];

     

       16
       16
       +
         buildInputs = [ pidgin json-glib glib http-parser ];

     

       17
       17
        
       

     

       18
       18
        
         installPhase = ''

     

       19
       19
        
           install -Dm755 -t $out/lib/pidgin/ libmatrix.so

+2 -2

pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, pidgin, libnotify, gdk_pixbuf, glib, dbus

     

       2
       2
       -
       , dbus_glib }:

     

       2
       2
       +
       , dbus-glib }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         name = "skype4pidgin-novas0x2a-20120411-6c53f7c48f";

     
···

       30
       30
        
         postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-otr";

     

       31
       31
        
       

     

       32
       32
        
         nativeBuildInputs = [ pkgconfig ];

     

       33
       33
       -
         buildInputs = [ pidgin libnotify gdk_pixbuf glib dbus dbus_glib ];

     

       33
       33
       +
         buildInputs = [ pidgin libnotify gdk_pixbuf glib dbus dbus-glib ];

     

       34
       34
        
       

     

       35
       35
        
         meta = {

     

       36
       36
        
           homepage = https://github.com/novas0x2a/skype4pidgin;

+2 -2

pkgs/applications/networking/instant-messengers/pidgin/default.nix

···

       1
       1
        
       { stdenv, fetchurl, makeWrapper, pkgconfig, gtk2, gtkspell2, aspell

     

       2
       2
        
       , gst_all_1, startupnotification, gettext

     

       3
       3
        
       , perl, perlXMLParser, libxml2, nss, nspr, farstream

     

       4
       4
       -
       , libXScrnSaver, ncurses, avahi, dbus, dbus_glib, intltool, libidn

     

       4
       4
       +
       , libXScrnSaver, ncurses, avahi, dbus, dbus-glib, intltool, libidn

     

       5
       5
        
       , lib, python, libICE, libXext, libSM

     

       6
       6
        
       , cyrus_sasl ? null

     

       7
       7
        
       , openssl ? null

     
···

       33
       33
        
           gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good

     

       34
       34
        
           libxml2 nss nspr farstream

     

       35
       35
        
           libXScrnSaver ncurses python

     

       36
       36
       -
           avahi dbus dbus_glib intltool libidn

     

       36
       36
       +
           avahi dbus dbus-glib intltool libidn

     

       37
       37
        
           libICE libXext libSM cyrus_sasl

     

       38
       38
        
         ]

     

       39
       39
        
         ++ (lib.optional (openssl != null) openssl)

+1 -1

pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix

···

       27
       27
        
           gnome2.gtk

     

       28
       28
        
           gnome2.pango

     

       29
       29
        
       

     

       30
       30
       -
           gnome2.gnome_keyring

     

       30
       30
       +
           gnome2.gnome-keyring

     

       31
       31
        
       

     

       32
       32
        
           libnotify

     

       33
       33
        
           libpulseaudio

+2 -2

pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, libxslt, telepathy_glib, libxml2, dbus_glib, dbus_daemon

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, libxslt, telepathy-glib, libxml2, dbus-glib, dbus_daemon

     

       2
       2
        
       , sqlite, libsoup, libnice, gnutls}:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     
···

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ pkgconfig libxslt ];

     

       13
       13
       -
         buildInputs = [ libxml2 dbus_glib sqlite libsoup libnice telepathy_glib gnutls telepathy_glib.python ]

     

       13
       13
       +
         buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls telepathy-glib.python ]

     

       14
       14
        
           ++ stdenv.lib.optional doCheck dbus_daemon;

     

       15
       15
        
       

     

       16
       16
        
         configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt";

+2 -2

pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, fetchpatch, pidgin, telepathy_glib, glib, dbus_glib, pkgconfig, libxslt }:

     

       1
       1
       +
       { stdenv, fetchurl, fetchpatch, pidgin, telepathy-glib, glib, dbus-glib, pkgconfig, libxslt }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "telepathy-haze";

     
···

       9
       9
        
           sha256 = "1jgrp32p6rllj089ynbsk3n9xrvsvzmwzhf0ql05kkgj0nf08xiy";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = [ glib telepathy_glib dbus_glib pidgin telepathy_glib.python ];

     

       12
       12
       +
         buildInputs = [ glib telepathy-glib dbus-glib pidgin telepathy-glib.python ];

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ pkgconfig libxslt ];

     

       15
       15

+2 -2

pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, glib, gnome3, pkgconfig, dbus_glib, telepathy_glib, libxslt, makeWrapper }:

     

       1
       1
       +
       { stdenv, fetchurl, glib, gnome3, pkgconfig, dbus-glib, telepathy-glib, libxslt, makeWrapper }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "telepathy-idle";

     
···

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         nativeBuildInputs = [ pkgconfig ];

     

       14
       14
       -
         buildInputs = [ glib telepathy_glib dbus_glib libxslt telepathy_glib.python (stdenv.lib.getLib gnome3.dconf) makeWrapper ];

     

       14
       14
       +
         buildInputs = [ glib telepathy-glib dbus-glib libxslt telepathy-glib.python (stdenv.lib.getLib gnome3.dconf) makeWrapper ];

     

       15
       15
        
       

     

       16
       16
        
         preFixup = ''

     

       17
       17
        
           wrapProgram "$out/libexec/telepathy-idle" \

+3 -3

pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, dbus_glib, libxml2, sqlite, telepathy_glib, pkgconfig

     

       1
       1
       +
       { stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, pkgconfig

     

       2
       2
        
       , gnome3, makeWrapper, intltool, libxslt, gobjectIntrospection, dbus_libs }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     
···

       14
       14
        
           makeWrapper pkgconfig intltool libxslt gobjectIntrospection

     

       15
       15
        
         ];

     

       16
       16
        
         buildInputs = [

     

       17
       17
       -
           dbus_glib libxml2 sqlite telepathy_glib

     

       18
       18
       -
           dbus_libs telepathy_glib.python

     

       17
       17
       +
           dbus-glib libxml2 sqlite telepathy-glib

     

       18
       18
       +
           dbus_libs telepathy-glib.python

     

       19
       19
        
         ];

     

       20
       20
        
       

     

       21
       21
        
         configureFlags = "--enable-call";

+2 -2

pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, gnome3, telepathy_glib, libxslt, makeWrapper }:

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, gnome3, telepathy-glib, libxslt, makeWrapper }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "${pname}-5.16.4";

     
···

       9
       9
        
           sha256 = "1jz6wwgsfxixha6ys2hbzbk5faqnj9kh2m5qdlgx5anqgandsscp";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = [ telepathy_glib telepathy_glib.python ]; # ToDo: optional stuff missing

     

       12
       12
       +
         buildInputs = [ telepathy-glib telepathy-glib.python ]; # ToDo: optional stuff missing

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ pkgconfig libxslt makeWrapper ];

     

       15
       15

+3 -3

pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, libxslt, glib, libxml2, telepathy_glib, avahi, libsoup

     

       1
       1
       +
       { stdenv, fetchurl, libxslt, glib, libxml2, telepathy-glib, avahi, libsoup

     

       2
       2
        
       , libuuid, openssl, pcre, sqlite, pkgconfigUpstream }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     
···

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         # pcre needed because https://github.com/NixOS/nixpkgs/pull/15046

     

       14
       14
       -
         buildInputs = [ glib libxml2 telepathy_glib avahi libsoup libuuid openssl

     

       15
       15
       -
           sqlite pcre telepathy_glib.python ];

     

       14
       14
       +
         buildInputs = [ glib libxml2 telepathy-glib avahi libsoup libuuid openssl

     

       15
       15
       +
           sqlite pcre telepathy-glib.python ];

     

       16
       16
        
       

     

       17
       17
        
         nativeBuildInputs = [ libxslt pkgconfigUpstream ];

     

       18
       18

+4 -4

pkgs/applications/networking/irc/hexchat/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, pkgconfig, gtk2, lua, perl, python2

     

       2
       2
       -
       , libtool, pciutils, dbus_glib, libcanberra_gtk2, libproxy

     

       2
       2
       +
       , libtool, pciutils, dbus-glib, libcanberra-gtk2, libproxy

     

       3
       3
        
       , libsexy, enchant, libnotify, openssl, intltool

     

       4
       4
       -
       , desktop_file_utils, hicolor_icon_theme

     

       4
       4
       +
       , desktop-file-utils, hicolor-icon-theme

     

       5
       5
        
       , autoconf, automake, autoconf-archive

     

       6
       6
        
       }:

     

       7
       7
        
       

     
···

       22
       22
        
         ];

     

       23
       23
        
       

     

       24
       24
        
         buildInputs = [

     

       25
       25
       -
           gtk2 lua perl python2 pciutils dbus_glib libcanberra_gtk2 libproxy

     

       26
       26
       -
           libsexy libnotify openssl desktop_file_utils hicolor_icon_theme

     

       25
       25
       +
           gtk2 lua perl python2 pciutils dbus-glib libcanberra-gtk2 libproxy

     

       26
       26
       +
           libsexy libnotify openssl desktop-file-utils hicolor-icon-theme

     

       27
       27
        
         ];

     

       28
       28
        
       

     

       29
       29
        
         enableParallelBuilding = true;

+1 -1

pkgs/applications/networking/mailreaders/astroid/default.nix

···

       15
       15
        
         nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ];

     

       16
       16
        
       

     

       17
       17
        
         buildInputs = [ gnome3.gtkmm gmime3 webkitgtk24x-gtk3 libsass gnome3.libpeas

     

       18
       18
       -
                         notmuch boost gnome3.gsettings_desktop_schemas ];

     

       18
       18
       +
                         notmuch boost gnome3.gsettings-desktop-schemas ];

     

       19
       19
        
       

     

       20
       20
        
         buildPhase = "scons --propagate-environment --prefix=$out build";

     

       21
       21
        
         installPhase = "scons --propagate-environment --prefix=$out install";

+9 -9

pkgs/applications/networking/mailreaders/claws-mail/default.nix

···

       1
       1
        
       { fetchurl, stdenv, wrapGAppsHook

     

       2
       2
       -
       , curl, dbus, dbus_glib, enchant, gtk2, gnutls, gnupg, gpgme, hicolor_icon_theme

     

       3
       3
       -
       , libarchive, libcanberra_gtk2, libetpan, libnotify, libsoup, libxml2, networkmanager

     

       4
       4
       -
       , openldap , perl, pkgconfig, poppler, python, shared_mime_info, webkitgtk24x-gtk2

     

       5
       5
       -
       , glib_networking, gsettings_desktop_schemas, libSM, libytnef

     

       2
       2
       +
       , curl, dbus, dbus-glib, enchant, gtk2, gnutls, gnupg, gpgme, hicolor-icon-theme

     

       3
       3
       +
       , libarchive, libcanberra-gtk2, libetpan, libnotify, libsoup, libxml2, networkmanager

     

       4
       4
       +
       , openldap , perl, pkgconfig, poppler, python, shared-mime-info, webkitgtk24x-gtk2

     

       5
       5
       +
       , glib-networking, gsettings-desktop-schemas, libSM, libytnef

     

       6
       6
        
       

     

       7
       7
        
       # Build options

     

       8
       8
        
       # TODO: A flag to build the manual.

     
···

       45
       45
        
       

     

       46
       46
        
         postPatch = ''

     

       47
       47
        
           substituteInPlace src/procmime.c \

     

       48
       48
       -
               --subst-var-by MIMEROOTDIR ${shared_mime_info}/share

     

       48
       48
       +
               --subst-var-by MIMEROOTDIR ${shared-mime-info}/share

     

       49
       49
        
         '';

     

       50
       50
        
       

     

       51
       51
        
         nativeBuildInputs = [ pkgconfig wrapGAppsHook ];

     

       52
       52
        
       

     

       53
       53
        
         buildInputs =

     

       54
       54
       -
           [ curl dbus dbus_glib gtk2 gnutls gsettings_desktop_schemas hicolor_icon_theme

     

       55
       55
       -
             libetpan perl python glib_networking libSM libytnef

     

       54
       54
       +
           [ curl dbus dbus-glib gtk2 gnutls gsettings-desktop-schemas hicolor-icon-theme

     

       55
       55
       +
             libetpan perl python glib-networking libSM libytnef

     

       56
       56
        
           ]

     

       57
       57
        
           ++ optional enableSpellcheck enchant

     

       58
       58
        
           ++ optionals (enablePgp || enablePluginSmime) [ gnupg gpgme ]

     

       59
       59
        
           ++ optional enablePluginArchive libarchive

     

       60
       60
       -
           ++ optional enablePluginNotificationSounds libcanberra_gtk2

     

       60
       60
       +
           ++ optional enablePluginNotificationSounds libcanberra-gtk2

     

       61
       61
        
           ++ optional enablePluginNotificationDialogs libnotify

     

       62
       62
        
           ++ optional enablePluginFancy libsoup

     

       63
       63
        
           ++ optional enablePluginRssyl libxml2

     
···

       88
       88
        
         enableParallelBuilding = true;

     

       89
       89
        
       

     

       90
       90
        
         preFixup = ''

     

       91
       91
       -
           gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared_mime_info}/share")

     

       91
       91
       +
           gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share")

     

       92
       92
        
         '';

     

       93
       93
        
       

     

       94
       94
        
         postInstall = ''

+2 -2

pkgs/applications/networking/mailreaders/mailnag/default.nix

···

       1
       1
        
       { stdenv, fetchurl, gettext, gtk3, pythonPackages

     

       2
       2
        
       , gdk_pixbuf, libnotify, gst_all_1

     

       3
       3
       -
       , libgnome_keyring3, networkmanager

     

       3
       3
       +
       , libgnome-keyring3, networkmanager

     

       4
       4
        
       , wrapGAppsHook, gnome3

     

       5
       5
        
       # otherwise passwords are stored unencrypted

     

       6
       6
        
       , withGnomeKeyring ? true

     
···

       22
       22
        
           gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good

     

       23
       23
        
           gst_all_1.gst-plugins-bad

     

       24
       24
        
           gnome3.defaultIconTheme

     

       25
       25
       -
         ] ++ stdenv.lib.optional withGnomeKeyring libgnome_keyring3;

     

       25
       25
       +
         ] ++ stdenv.lib.optional withGnomeKeyring libgnome-keyring3;

     

       26
       26
        
       

     

       27
       27
        
         nativeBuildInputs = [

     

       28
       28
        
           wrapGAppsHook

+6 -6

pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix

···

       5
       5
        
       , coreutils

     

       6
       6
        
       , cups

     

       7
       7
        
       , dbus

     

       8
       8
       -
       , desktop_file_utils

     

       8
       8
       +
       , desktop-file-utils

     

       9
       9
        
       , expat

     

       10
       10
        
       , fontconfig

     

       11
       11
        
       , freetype

     
···

       14
       14
        
       , glib

     

       15
       15
        
       , gnome2

     

       16
       16
        
       , libgcrypt

     

       17
       17
       -
       , libgnome_keyring

     

       17
       17
       +
       , libgnome-keyring

     

       18
       18
        
       , libnotify

     

       19
       19
        
       , makeWrapper

     

       20
       20
        
       , nodejs

     
···

       49
       49
        
           coreutils

     

       50
       50
        
           cups

     

       51
       51
        
           dbus

     

       52
       52
       -
           desktop_file_utils

     

       52
       52
       +
           desktop-file-utils

     

       53
       53
        
           expat

     

       54
       54
        
           fontconfig

     

       55
       55
        
           freetype

     
···

       58
       58
        
           glib

     

       59
       59
        
           gnome2.GConf

     

       60
       60
        
           gnome2.gtk

     

       61
       61
       -
           libgnome_keyring

     

       61
       61
       +
           libgnome-keyring

     

       62
       62
        
           libnotify

     

       63
       63
        
           nodejs

     

       64
       64
        
           nspr

     
···

       82
       82
        
         ];

     

       83
       83
        
       

     

       84
       84
        
       

     

       85
       85
       -
         buildInputs = [ gnome2.gnome_keyring ];

     

       85
       85
       +
         buildInputs = [ gnome2.gnome-keyring ];

     

       86
       86
        
       

     

       87
       87
        
         nativeBuildInputs = [ makeWrapper ];

     

       88
       88
        
       

     
···

       111
       111
        
             --set-rpath $binrp:$out/lib:${stdenv.cc.cc.lib}/lib:${lib.makeLibraryPath propagatedBuildInputs } \

     

       112
       112
        
             $out/share/nylas-mail/nylas

     

       113
       113
        
       

     

       114
       114
       -
           wrapProgram $out/share/nylas-mail/nylas --set LD_LIBRARY_PATH "${xorg.libxkbfile}/lib:${pkgs.gnome3.libgnome_keyring}/lib";

     

       114
       114
       +
           wrapProgram $out/share/nylas-mail/nylas --set LD_LIBRARY_PATH "${xorg.libxkbfile}/lib:${pkgs.gnome3.libgnome-keyring}/lib";

     

       115
       115
        
       

     

       116
       116
        
           # Fix path to bash so apm can install plugins.

     

       117
       117
        
           substituteInPlace $out/share/nylas-mail/resources/apm/bin/apm \

+6 -6

pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix

···

       1
       1
        
       { stdenv, fetchurl, config, makeWrapper

     

       2
       2
        
       , gconf

     

       3
       3
        
       , alsaLib

     

       4
       4
       -
       , at_spi2_atk

     

       4
       4
       +
       , at-spi2-atk

     

       5
       5
        
       , atk

     

       6
       6
        
       , cairo

     

       7
       7
        
       , cups

     

       8
       8
        
       , curl

     

       9
       9
       -
       , dbus_glib

     

       9
       9
       +
       , dbus-glib

     

       10
       10
        
       , dbus_libs

     

       11
       11
        
       , fontconfig

     

       12
       12
        
       , freetype

     
···

       27
       27
        
       , libXinerama

     

       28
       28
        
       , libXrender

     

       29
       29
        
       , libXt

     

       30
       30
       -
       , libcanberra_gtk2

     

       30
       30
       +
       , libcanberra-gtk2

     

       31
       31
        
       , libgnome

     

       32
       32
        
       , libgnomeui

     

       33
       33
        
       , defaultIconTheme

     
···

       82
       82
        
           [ stdenv.cc.cc

     

       83
       83
        
             gconf

     

       84
       84
        
             alsaLib

     

       85
       85
       -
             at_spi2_atk

     

       85
       85
       +
             at-spi2-atk

     

       86
       86
        
             atk

     

       87
       87
        
             cairo

     

       88
       88
        
             cups

     

       89
       89
        
             curl

     

       90
       90
       -
             dbus_glib

     

       90
       90
       +
             dbus-glib

     

       91
       91
        
             dbus_libs

     

       92
       92
        
             fontconfig

     

       93
       93
        
             freetype

     
···

       108
       108
        
             libXinerama

     

       109
       109
        
             libXrender

     

       110
       110
        
             libXt

     

       111
       111
       -
             libcanberra_gtk2

     

       111
       111
       +
             libcanberra-gtk2

     

       112
       112
        
             libgnome

     

       113
       113
        
             libgnomeui

     

       114
       114
        
             mesa

+2 -2

pkgs/applications/networking/mailreaders/thunderbird/default.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, pkgconfig, gtk2, pango, perl, python, zip, libIDL

     

       2
       2
       -
       , libjpeg, zlib, dbus, dbus_glib, bzip2, xorg

     

       2
       2
       +
       , libjpeg, zlib, dbus, dbus-glib, bzip2, xorg

     

       3
       3
        
       , freetype, fontconfig, file, nspr, nss, libnotify

     

       4
       4
        
       , yasm, mesa, sqlite, unzip

     

       5
       5
        
       , hunspell, libevent, libstartup_notification

     
···

       39
       39
        
         # from firefox, but without sound libraries

     

       40
       40
        
         buildInputs =

     

       41
       41
        
           [ gtk2 zip libIDL libjpeg zlib bzip2

     

       42
       42
       -
             dbus dbus_glib pango freetype fontconfig xorg.libXi

     

       42
       42
       +
             dbus dbus-glib pango freetype fontconfig xorg.libXi

     

       43
       43
        
             xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file

     

       44
       44
        
             nspr nss libnotify xorg.pixman yasm mesa

     

       45
       45
        
             xorg.libXScrnSaver xorg.scrnsaverproto

+6 -6

pkgs/applications/networking/newsreaders/liferea/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, intltool, python3Packages, wrapGAppsHook

     

       2
       2
       -
       , glib, libxml2, libxslt, sqlite, libsoup , webkitgtk, json_glib, gst_all_1

     

       3
       3
       -
       , libnotify, gtk3, gsettings_desktop_schemas, libpeas, dconf, librsvg

     

       4
       4
       -
       , gobjectIntrospection, glib_networking

     

       2
       2
       +
       , glib, libxml2, libxslt, sqlite, libsoup , webkitgtk, json-glib, gst_all_1

     

       3
       3
       +
       , libnotify, gtk3, gsettings-desktop-schemas, libpeas, dconf, librsvg

     

       4
       4
       +
       , gobjectIntrospection, glib-networking

     

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
        
       let

     
···

       18
       18
        
         nativeBuildInputs = [ wrapGAppsHook python3Packages.wrapPython intltool pkgconfig ];

     

       19
       19
        
       

     

       20
       20
        
         buildInputs = [

     

       21
       21
       -
           glib gtk3 webkitgtk libxml2 libxslt sqlite libsoup gsettings_desktop_schemas

     

       22
       22
       -
           libpeas gsettings_desktop_schemas json_glib dconf gobjectIntrospection

     

       23
       23
       -
           librsvg glib_networking libnotify

     

       21
       21
       +
           glib gtk3 webkitgtk libxml2 libxslt sqlite libsoup gsettings-desktop-schemas

     

       22
       22
       +
           libpeas gsettings-desktop-schemas json-glib dconf gobjectIntrospection

     

       23
       23
       +
           librsvg glib-networking libnotify

     

       24
       24
        
         ] ++ (with gst_all_1; [

     

       25
       25
        
           gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad

     

       26
       26
        
         ]);

+2 -2

pkgs/applications/networking/newsreaders/pan/default.nix

···

       1
       1
        
       { spellChecking ? true

     

       2
       2
        
       , stdenv, fetchurl, pkgconfig, gtk2, gtkspell2 ? null

     

       3
       3
       -
       , perl, pcre, gmime, gettext, intltool, dbus_glib, libnotify

     

       3
       3
       +
       , perl, pcre, gmime, gettext, intltool, dbus-glib, libnotify

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       assert spellChecking -> gtkspell2 != null;

     
···

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         nativeBuildInputs = [ pkgconfig ];

     

       19
       19
       -
         buildInputs = [ gtk2 perl gmime gettext intltool dbus_glib libnotify ]

     

       19
       19
       +
         buildInputs = [ gtk2 perl gmime gettext intltool dbus-glib libnotify ]

     

       20
       20
        
           ++ stdenv.lib.optional spellChecking gtkspell2;

     

       21
       21
        
       

     

       22
       22
        
         enableParallelBuilding = true;

+2 -2

pkgs/applications/networking/nextcloud-client/default.nix

···

       1
       1
        
       { stdenv, fetchgit, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, qttools, sqlite

     

       2
       2
       -
       , inotify-tools, withGnomeKeyring ? false, makeWrapper, libgnome_keyring }:

     

       2
       2
       +
       , inotify-tools, withGnomeKeyring ? false, makeWrapper, libgnome-keyring }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         name = "nextcloud-client-${version}";

     
···

       41
       41
        
             $out/share/applications/nextcloud.desktop

     

       42
       42
        
         '' + stdenv.lib.optionalString (withGnomeKeyring) ''

     

       43
       43
        
           wrapProgram "$out/bin/nextcloud" \

     

       44
       44
       -
             --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libgnome_keyring ]}

     

       44
       44
       +
             --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libgnome-keyring ]}

     

       45
       45
        
         '';

     

       46
       46
        
       

     

       47
       47
        
         meta = with stdenv.lib; {

+1 -1

pkgs/applications/networking/p2p/retroshare/default.nix

···

       23
       23
        
       

     

       24
       24
        
         nativeBuildInputs = [ pkgconfig qmake ];

     

       25
       25
        
         buildInputs = [

     

       26
       26
       -
           speex libupnp gpgme gnome3.libgnome_keyring glib libssh qtmultimedia qtx11extras qttools

     

       26
       26
       +
           speex libupnp gpgme gnome3.libgnome-keyring glib libssh qtmultimedia qtx11extras qttools

     

       27
       27
        
           protobuf bzip2 libXScrnSaver curl libxml2 libxslt sqlcipher libmicrohttpd opencv ffmpeg

     

       28
       28
        
         ];

     

       29
       29

+2 -2

pkgs/applications/networking/p2p/tixati/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, glib, zlib, dbus, dbus_glib, gtk2, gdk_pixbuf, cairo, pango }:

     

       1
       1
       +
       { stdenv, fetchurl, glib, zlib, dbus, dbus-glib, gtk2, gdk_pixbuf, cairo, pango }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "tixati-${version}";

     
···

       11
       11
        
       

     

       12
       12
        
         installPhase = ''

     

       13
       13
        
           patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       14
       14
       -
                    --set-rpath ${stdenv.lib.makeLibraryPath [ glib zlib dbus dbus_glib gtk2 gdk_pixbuf cairo pango ]} \

     

       14
       14
       +
                    --set-rpath ${stdenv.lib.makeLibraryPath [ glib zlib dbus dbus-glib gtk2 gdk_pixbuf cairo pango ]} \

     

       15
       15
        
                    tixati

     

       16
       16
        
           install -D tixati         $out/bin/tixati

     

       17
       17
        
           install -D tixati.desktop $out/share/applications/tixati.desktop

+3 -3

pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix

···

       1
       1
        
       { stdenv, autoconf, automake, libtool, wrapGAppsHook, fetchFromGitHub, pkgconfig

     

       2
       2
       -
       , intltool, gtk3, json_glib, curl, glib, autoconf-archive, appstream-glib

     

       3
       3
       -
       , hicolor_icon_theme }:

     

       2
       2
       +
       , intltool, gtk3, json-glib, curl, glib, autoconf-archive, appstream-glib

     

       3
       3
       +
       , hicolor-icon-theme }:

     

       4
       4
        
       

     

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     
···

       21
       21
        
           pkgconfig intltool autoconf-archive

     

       22
       22
        
           appstream-glib

     

       23
       23
        
         ];

     

       24
       24
       -
         buildInputs = [ gtk3 json_glib curl glib hicolor_icon_theme ];

     

       24
       24
       +
         buildInputs = [ gtk3 json-glib curl glib hicolor-icon-theme ];

     

       25
       25
        
       

     

       26
       26
        
         meta = with stdenv.lib;

     

       27
       27
        
           { description = "GTK remote control for the Transmission BitTorrent client";

+1 -1

pkgs/applications/networking/remote/citrix-receiver/default.nix

···

       202
       202
        
               makeWrapper "$ICAInstDir/wfica" "$out/bin/wfica" \

     

       203
       203
        
                 --add-flags "-icaroot $ICAInstDir" \

     

       204
       204
        
                 --set ICAROOT "$ICAInstDir" \

     

       205
       205
       -
                 --set GTK_PATH "${gtk2.out}/lib/gtk-2.0:${gnome3.gnome_themes_standard}/lib/gtk-2.0" \

     

       205
       205
       +
                 --set GTK_PATH "${gtk2.out}/lib/gtk-2.0:${gnome3.gnome-themes-standard}/lib/gtk-2.0" \

     

       206
       206
        
                 --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \

     

       207
       207
        
                 --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \

     

       208
       208
        
                 --set LD_LIBRARY_PATH "$libPath" \

+8 -8

pkgs/applications/networking/remote/remmina/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, cmake, pkgconfig, wrapGAppsHook

     

       2
       2
       -
       , glib, gtk3, gettext, libxkbfile, libgnome_keyring, libX11

     

       2
       2
       +
       , glib, gtk3, gettext, libxkbfile, libgnome-keyring, libX11

     

       3
       3
        
       , freerdp, libssh, libgcrypt, gnutls, makeDesktopItem

     

       4
       4
        
       , pcre, webkitgtk, libdbusmenu-gtk3, libappindicator-gtk3

     

       5
       5
        
       , libvncserver, libpthreadstubs, libXdmcp, libxkbcommon

     

       6
       6
       -
       , libsecret, spice_protocol, spice_gtk, epoxy, at_spi2_core

     

       7
       7
       -
       , openssl, gsettings_desktop_schemas

     

       6
       6
       +
       , libsecret, spice-protocol, spice-gtk, epoxy, at-spi2-core

     

       7
       7
       +
       , openssl, gsettings-desktop-schemas

     

       8
       8
        
       # The themes here are soft dependencies; only icons are missing without them.

     

       9
       9
       -
       , hicolor_icon_theme, adwaita-icon-theme

     

       9
       9
       +
       , hicolor-icon-theme, adwaita-icon-theme

     

       10
       10
        
       }:

     

       11
       11
        
       

     

       12
       12
        
       let

     
···

       33
       33
        
         };

     

       34
       34
        
       

     

       35
       35
        
         nativeBuildInputs = [ pkgconfig ];

     

       36
       36
       -
         buildInputs = [ cmake wrapGAppsHook gsettings_desktop_schemas

     

       37
       37
       -
                         glib gtk3 gettext libxkbfile libgnome_keyring libX11

     

       36
       36
       +
         buildInputs = [ cmake wrapGAppsHook gsettings-desktop-schemas

     

       37
       37
       +
                         glib gtk3 gettext libxkbfile libgnome-keyring libX11

     

       38
       38
        
                         freerdp libssh libgcrypt gnutls

     

       39
       39
        
                         pcre webkitgtk libdbusmenu-gtk3 libappindicator-gtk3

     

       40
       40
        
                         libvncserver libpthreadstubs libXdmcp libxkbcommon

     

       41
       41
       -
                         libsecret spice_protocol spice_gtk epoxy at_spi2_core

     

       42
       42
       -
                         openssl hicolor_icon_theme adwaita-icon-theme ];

     

       41
       41
       +
                         libsecret spice-protocol spice-gtk epoxy at-spi2-core

     

       42
       42
       +
                         openssl hicolor-icon-theme adwaita-icon-theme ];

     

       43
       43
        
       

     

       44
       44
        
         cmakeFlags = [

     

       45
       45
        
           "-DWITH_VTE=OFF"

+2 -2

pkgs/applications/networking/sniffers/wireshark/default.nix

···

       1
       1
        
       { stdenv, lib, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares

     

       2
       2
        
       , gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, makeDesktopItem, python, libcap, glib

     

       3
       3
        
       , libssh, zlib, cmake, extra-cmake-modules, fetchpatch

     

       4
       4
       -
       , withGtk ? false, gtk3 ? null, librsvg ? null, gsettings_desktop_schemas ? null, wrapGAppsHook ? null

     

       4
       4
       +
       , withGtk ? false, gtk3 ? null, librsvg ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null

     

       5
       5
        
       , withQt ? false, qt5 ? null

     

       6
       6
        
       , ApplicationServices, SystemConfiguration, gmp

     

       7
       7
        
       }:

     
···

       36
       36
        
           gettext pcre perl libpcap lua5 libssh openssl libgcrypt

     

       37
       37
        
           libgpgerror gnutls geoip c-ares python glib zlib

     

       38
       38
        
         ] ++ optionals withQt  (with qt5; [ qtbase qtmultimedia qtsvg qttools ])

     

       39
       39
       -
           ++ optionals withGtk [ gtk3 librsvg gsettings_desktop_schemas ]

     

       39
       39
       +
           ++ optionals withGtk [ gtk3 librsvg gsettings-desktop-schemas ]

     

       40
       40
        
           ++ optionals stdenv.isLinux  [ libcap libnl ]

     

       41
       41
        
           ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ];

     

       42
       42

+1 -1

pkgs/applications/networking/syncthing-gtk/default.nix

···

       21
       21
        
           gtk3 (librsvg.override { enableIntrospection = true; })

     

       22
       22
        
           libnotify

     

       23
       23
        
           # Schemas with proxy configuration

     

       24
       24
       -
           gnome3.gsettings_desktop_schemas

     

       24
       24
       +
           gnome3.gsettings-desktop-schemas

     

       25
       25
        
         ];

     

       26
       26
        
       

     

       27
       27
        
         propagatedBuildInputs = [

+2 -2

pkgs/applications/office/calligra/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         mkDerivation, lib, fetchurl, fetchpatch, extra-cmake-modules, kdoctools, makeWrapper,

     

       3
       3
       -
         boost, qtwebkit, qtx11extras, shared_mime_info,

     

       3
       3
       +
         boost, qtwebkit, qtx11extras, shared-mime-info,

     

       4
       4
        
         breeze-icons, kactivities, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets,

     

       5
       5
        
         kcoreaddons, kdbusaddons, kdiagram, kguiaddons, khtml, ki18n,

     

       6
       6
        
         kiconthemes, kitemviews, kjobwidgets, kcmutils, kdelibs4support, kio, kross,

     
···

       36
       36
        
         nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];

     

       37
       37
        
       

     

       38
       38
        
         buildInputs = [

     

       39
       39
       -
           boost qtwebkit qtx11extras shared_mime_info

     

       39
       39
       +
           boost qtwebkit qtx11extras shared-mime-info

     

       40
       40
        
           kactivities karchive kcodecs kcompletion kconfig kconfigwidgets kcoreaddons

     

       41
       41
        
           kdbusaddons kdiagram kguiaddons khtml ki18n kiconthemes kitemviews

     

       42
       42
        
           kjobwidgets kcmutils kdelibs4support kio kross knotifications knotifyconfig kparts

+2 -2

pkgs/applications/office/gnucash/2.6.nix

···

       1
       1
        
       { fetchurl, fetchpatch, stdenv, intltool, pkgconfig, file, makeWrapper

     

       2
       2
        
       , libxml2, libxslt, perl, perlPackages, gconf, guile

     

       3
       3
        
       , glib, gtk2, libofx, aqbanking, gwenhywfar, libgnomecanvas, goffice

     

       4
       4
       -
       , webkit, glibcLocales, gsettings_desktop_schemas, dconf

     

       4
       4
       +
       , webkit, glibcLocales, gsettings-desktop-schemas, dconf

     

       5
       5
        
       , gettext, swig, slibGuile, enchant, bzip2, isocodes, libdbi, libdbiDrivers

     

       6
       6
        
       , pango, gdk_pixbuf

     

       7
       7
        
       }:

     
···

       38
       38
        
           # glib, gtk...

     

       39
       39
        
           glib gtk2 goffice webkit

     

       40
       40
        
           # gnome...

     

       41
       41
       -
           dconf gconf libgnomecanvas gsettings_desktop_schemas

     

       41
       41
       +
           dconf gconf libgnomecanvas gsettings-desktop-schemas

     

       42
       42
        
           # financial

     

       43
       43
        
           libofx aqbanking gwenhywfar

     

       44
       44
        
           # perl

+2 -2

pkgs/applications/office/grisbi/default.nix

···

       1
       1
        
       { fetchurl, stdenv, gtk, pkgconfig, libofx, intltool, wrapGAppsHook

     

       2
       2
       -
       , hicolor_icon_theme, libsoup, gnome3 }:

     

       2
       2
       +
       , hicolor-icon-theme, libsoup, gnome3 }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         name = "grisbi-${version}";

     
···

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         nativeBuildInputs = [ pkgconfig wrapGAppsHook ];

     

       14
       14
       -
         buildInputs = [ gtk libofx intltool hicolor_icon_theme libsoup

     

       14
       14
       +
         buildInputs = [ gtk libofx intltool hicolor-icon-theme libsoup

     

       15
       15
        
           gnome3.defaultIconTheme ];

     

       16
       16
        
       

     

       17
       17
        
         meta = with stdenv.lib; {

+2 -2

pkgs/applications/office/homebank/default.nix

···

       1
       1
        
       { fetchurl, stdenv, gtk, pkgconfig, libofx, intltool, wrapGAppsHook

     

       2
       2
       -
       , hicolor_icon_theme, libsoup, gnome3 }:

     

       2
       2
       +
       , hicolor-icon-theme, libsoup, gnome3 }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         name = "homebank-5.1.7";

     
···

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         nativeBuildInputs = [ pkgconfig wrapGAppsHook ];

     

       12
       12
       -
         buildInputs = [ gtk libofx intltool hicolor_icon_theme libsoup

     

       12
       12
       +
         buildInputs = [ gtk libofx intltool hicolor-icon-theme libsoup

     

       13
       13
        
           gnome3.defaultIconTheme ];

     

       14
       14
        
       

     

       15
       15
        
         meta = with stdenv.lib; {

+2 -2

pkgs/applications/office/jabref/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, makeWrapper, makeDesktopItem, jdk, jre, wrapGAppsHook, gtk3, gsettings_desktop_schemas }:

     

       1
       1
       +
       { stdenv, fetchurl, makeWrapper, makeDesktopItem, jdk, jre, wrapGAppsHook, gtk3, gsettings-desktop-schemas }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         version = "3.8.1";

     
···

       19
       19
        
           exec = "jabref";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
       -
         buildInputs = [ makeWrapper jdk wrapGAppsHook gtk3 gsettings_desktop_schemas ];

     

       22
       22
       +
         buildInputs = [ makeWrapper jdk wrapGAppsHook gtk3 gsettings-desktop-schemas ];

     

       23
       23
        
       

     

       24
       24
        
         unpackPhase = "#";

     

       25
       25

+2 -2

pkgs/applications/office/libreoffice/default.nix

···

       6
       6
        
       , openssl, gperf, cppunit, GConf, ORBit2, poppler

     

       7
       7
        
       , librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw

     

       8
       8
        
       , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr

     

       9
       9
       -
       , libwpg, dbus_glib, glibc, qt4, clucene_core, libcdr, lcms, vigra

     

       9
       9
       +
       , libwpg, dbus-glib, glibc, qt4, clucene_core, libcdr, lcms, vigra

     

       10
       10
        
       , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio

     

       11
       11
        
       , fontsConf, pkgconfig, libzip, bluez5, libtool, maven

     

       12
       12
        
       , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf

     
···

       242
       242
        
       

     

       243
       243
        
         buildInputs = with xorg;

     

       244
       244
        
           [ ant ArchiveZip autoconf automake bison boost cairo clucene_core

     

       245
       245
       -
             CompressZlib cppunit cups curl db dbus_glib expat file flex fontconfig

     

       245
       245
       +
             CompressZlib cppunit cups curl db dbus-glib expat file flex fontconfig

     

       246
       246
        
             freetype GConf getopt gnome_vfs gperf gtk3 gtk2

     

       247
       247
        
             hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg

     

       248
       248
        
             libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11

+2 -2

pkgs/applications/office/libreoffice/still.nix

···

       6
       6
        
       , openssl, gperf, cppunit, GConf, ORBit2, poppler

     

       7
       7
        
       , librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw, libzmf

     

       8
       8
        
       , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr

     

       9
       9
       -
       , libwpg, dbus_glib, glibc, qt4, clucene_core, libcdr, lcms, vigra

     

       9
       9
       +
       , libwpg, dbus-glib, glibc, qt4, clucene_core, libcdr, lcms, vigra

     

       10
       10
        
       , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio

     

       11
       11
        
       , fontsConf, pkgconfig, libzip, bluez5, libtool, maven

     

       12
       12
        
       , libatomic_ops, graphite2, harfbuzz, libodfgen

     
···

       235
       235
        
       

     

       236
       236
        
         buildInputs = with xorg;

     

       237
       237
        
           [ ant ArchiveZip autoconf automake bison boost cairo clucene_core

     

       238
       238
       -
             CompressZlib cppunit cups curl db dbus_glib expat file flex fontconfig

     

       238
       238
       +
             CompressZlib cppunit cups curl db dbus-glib expat file flex fontconfig

     

       239
       239
        
             freetype GConf getopt gnome_vfs gperf gtk3 gtk2

     

       240
       240
        
             hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg

     

       241
       241
        
             libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11

+2 -2

pkgs/applications/office/mendeley/default.nix

···

       1
       1
        
       { fetchurl, stdenv, dpkg, which

     

       2
       2
        
       , makeWrapper

     

       3
       3
        
       , alsaLib

     

       4
       4
       -
       , desktop_file_utils

     

       4
       4
       +
       , desktop-file-utils

     

       5
       5
        
       , dbus

     

       6
       6
        
       , libcap

     

       7
       7
        
       , fontconfig

     
···

       129
       129
        
       

     

       130
       130
        
           # Patch up link handler script

     

       131
       131
        
           wrapProgram $out/bin/install-mendeley-link-handler.sh \

     

       132
       132
       -
             --prefix PATH ':' ${stdenv.lib.makeBinPath [ which gconf desktop_file_utils ] }

     

       132
       132
       +
             --prefix PATH ':' ${stdenv.lib.makeBinPath [ which gconf desktop-file-utils ] }

     

       133
       133
        
         '';

     

       134
       134
        
       

     

       135
       135
        
         dontStrip = true;

+2 -2

pkgs/applications/office/paperwork/default.nix

···

       1
       1
        
       { lib, python3Packages, fetchFromGitHub, gtk3, cairo

     

       2
       2
        
       , aspellDicts, buildEnv

     

       3
       3
       -
       , gnome3, hicolor_icon_theme, librsvg

     

       3
       3
       +
       , gnome3, hicolor-icon-theme, librsvg

     

       4
       4
        
       , xvfb_run, dbus, libnotify

     

       5
       5
        
       }:

     

       6
       6
        
       

     
···

       48
       48
        
       

     

       49
       49
        
         checkInputs = [ xvfb_run dbus.daemon ];

     

       50
       50
        
         buildInputs = [

     

       51
       51
       -
           gnome3.defaultIconTheme hicolor_icon_theme libnotify librsvg

     

       51
       51
       +
           gnome3.defaultIconTheme hicolor-icon-theme libnotify librsvg

     

       52
       52
        
         ];

     

       53
       53
        
       

     

       54
       54
        
         # A few parts of chkdeps need to have a display and a dbus session, so we not

+2 -2

pkgs/applications/office/pinpoint/default.nix

···

       1
       1
        
       { fetchurl, stdenv, pkgconfig, autoconf, automake, clutter, clutter-gst

     

       2
       2
       -
       , gdk_pixbuf, cairo, clutter_gtk }:

     

       2
       2
       +
       , gdk_pixbuf, cairo, clutter-gtk }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         name = "pinpoint-${version}";

     
···

       10
       10
        
         };

     

       11
       11
        
         nativeBuildInputs = [ pkgconfig ];

     

       12
       12
        
         buildInputs = [ autoconf automake clutter clutter-gst gdk_pixbuf

     

       13
       13
       -
                         cairo clutter_gtk ];

     

       13
       13
       +
                         cairo clutter-gtk ];

     

       14
       14
        
       

     

       15
       15
        
         meta = with stdenv.lib; {

     

       16
       16
        
           homepage = https://wiki.gnome.org/action/show/Apps/Pinpoint;

+2 -2

pkgs/applications/office/planner/default.nix

···

       28
       28
        
           autoconf

     

       29
       29
        
           libtool

     

       30
       30
        
       

     

       31
       31
       -
           gnome_common

     

       32
       32
       -
           gtk_doc

     

       31
       31
       +
           gnome-common

     

       32
       32
       +
           gtk-doc

     

       33
       33
        
       

     

       34
       34
        
           GConf

     

       35
       35
        
           gtk

+2 -2

pkgs/applications/office/skrooge/default.nix

···

       2
       2
        
         cmake, extra-cmake-modules, qtwebkit, qtscript, grantlee,

     

       3
       3
        
         kxmlgui, kwallet, kparts, kdoctools, kjobwidgets, kdesignerplugin,

     

       4
       4
        
         kiconthemes, knewstuff, sqlcipher, qca-qt5, kactivities, karchive,

     

       5
       5
       -
         kguiaddons, knotifyconfig, krunner, kwindowsystem, libofx, shared_mime_info

     

       5
       5
       +
         kguiaddons, knotifyconfig, krunner, kwindowsystem, libofx, shared-mime-info

     

       6
       6
        
       }:

     

       7
       7
        
       

     

       8
       8
        
       mkDerivation rec {

     
···

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         nativeBuildInputs = [

     

       18
       18
       -
           cmake extra-cmake-modules kdoctools shared_mime_info

     

       18
       18
       +
           cmake extra-cmake-modules kdoctools shared-mime-info

     

       19
       19
        
         ];

     

       20
       20
        
       

     

       21
       21
        
         buildInputs = [

+3 -3

pkgs/applications/office/spice-up/default.nix

···

       6
       6
        
       , gtk3

     

       7
       7
        
       , granite

     

       8
       8
        
       , gnome3

     

       9
       9
       -
       , json_glib

     

       9
       9
       +
       , json-glib

     

       10
       10
        
       , cmake

     

       11
       11
        
       , ninja

     

       12
       12
        
       , libgudev

     
···

       44
       44
        
           gtk3

     

       45
       45
        
           granite

     

       46
       46
        
           gnome3.libgee

     

       47
       47
       -
           json_glib

     

       47
       47
       +
           json-glib

     

       48
       48
        
           libgudev

     

       49
       49
        
           libevdev

     

       50
       50
       -
           gnome3.gnome_themes_standard

     

       50
       50
       +
           gnome3.gnome-themes-standard

     

       51
       51
        
         ];

     

       52
       52
        
       

     

       53
       53
        
         meta = with stdenv.lib; {

+3 -3

pkgs/applications/office/zotero/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, buildFHSUserEnv, makeDesktopItem, runCommand, bash, wrapGAppsHook, gsettings_desktop_schemas, gtk3, gnome3 }:

     

       1
       1
       +
       { stdenv, fetchurl, buildFHSUserEnv, makeDesktopItem, runCommand, bash, wrapGAppsHook, gsettings-desktop-schemas, gtk3, gnome3 }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
       version = "5.0.25";

     
···

       18
       18
        
           sha256 = "1y3q5582xp4inpz137x0r9iscs1g0cjlqcfjpzl3klsq3yas688k";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
       -
         buildInputs= [ wrapGAppsHook gsettings_desktop_schemas gtk3 gnome3.adwaita-icon-theme gnome3.dconf ];

     

       21
       21
       +
         buildInputs= [ wrapGAppsHook gsettings-desktop-schemas gtk3 gnome3.adwaita-icon-theme gnome3.dconf ];

     

       22
       22
        
         phases = [ "unpackPhase" "installPhase" "fixupPhase"];

     

       23
       23
        
       

     

       24
       24
        
         installPhase = ''

     
···

       32
       32
        
       fhsEnv = buildFHSUserEnv {

     

       33
       33
        
         name = "zotero-fhs-env";

     

       34
       34
        
         targetPkgs = pkgs: with pkgs; with xlibs; [

     

       35
       35
       -
           gtk3 dbus_glib

     

       35
       35
       +
           gtk3 dbus-glib

     

       36
       36
        
           libXt nss

     

       37
       37
        
         ];

     

       38
       38
        
       };

+2 -2

pkgs/applications/science/electronics/pcb/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, gtk2, bison, intltool, flex, netpbm, imagemagick, dbus, xlibsWrapper, mesa, shared_mime_info, tcl, tk, gnome2, pangox_compat, gd, xorg }:

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, gtk2, bison, intltool, flex, netpbm, imagemagick, dbus, xlibsWrapper, mesa, shared-mime-info, tcl, tk, gnome2, pangox_compat, gd, xorg }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "pcb-${version}";

     
···

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ pkgconfig ];

     

       13
       13
       -
         buildInputs = [ gtk2 bison intltool flex netpbm imagemagick dbus xlibsWrapper mesa tcl shared_mime_info tk gnome2.gtkglext pangox_compat gd xorg.libXmu ];

     

       13
       13
       +
         buildInputs = [ gtk2 bison intltool flex netpbm imagemagick dbus xlibsWrapper mesa tcl shared-mime-info tk gnome2.gtkglext pangox_compat gd xorg.libXmu ];

     

       14
       14
        
       

     

       15
       15
        
         configureFlags = ["--disable-update-desktop-database"];

     

       16
       16

+2 -2

pkgs/applications/search/catfish/default.nix

···

       1
       1
        
       { stdenv, fetchurl, file, which, intltool, gobjectIntrospection,

     

       2
       2
       -
         findutils, xdg_utils, gnome3, pythonPackages, hicolor_icon_theme,

     

       2
       2
       +
         findutils, xdg_utils, gnome3, pythonPackages, hicolor-icon-theme,

     

       3
       3
        
         wrapGAppsHook

     

       4
       4
        
       }:

     

       5
       5
        
       

     
···

       29
       29
        
           pythonPackages.pyxdg

     

       30
       30
        
           pythonPackages.ptyprocess

     

       31
       31
        
           pythonPackages.pycairo

     

       32
       32
       -
           hicolor_icon_theme

     

       32
       32
       +
           hicolor-icon-theme

     

       33
       33
        
         ];

     

       34
       34
        
       

     

       35
       35
        
         propagatedBuildInputs = [

+3 -3

pkgs/applications/version-management/gitkraken/default.nix

···

       1
       1
       -
       { stdenv, lib, libXcomposite, libgnome_keyring, makeWrapper, udev, curl, alsaLib

     

       1
       1
       +
       { stdenv, lib, libXcomposite, libgnome-keyring, makeWrapper, udev, curl, alsaLib

     

       2
       2
        
       , libXfixes, atk, gtk2, libXrender, pango, gnome2, cairo, freetype, fontconfig

     

       3
       3
        
       , libX11, libXi, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst

     

       4
       4
        
       , nss, nspr, cups, fetchurl, expat, gdk_pixbuf, libXdamage, libXrandr, dbus

     
···

       47
       47
        
           libXrender

     

       48
       48
        
           gtk2

     

       49
       49
        
           gnome2.GConf

     

       50
       50
       -
           libgnome_keyring

     

       50
       50
       +
           libgnome-keyring

     

       51
       51
        
         ];

     

       52
       52
        
       

     

       53
       53
        
         nativeBuildInputs = [ makeWrapper ];

     
···

       84
       84
        
                    --set-rpath "$libPath:$out/opt/gitkraken" "$out/opt/gitkraken/gitkraken"

     

       85
       85
        
           wrapProgram $out/opt/gitkraken/gitkraken \

     

       86
       86
        
             --prefix LD_PRELOAD : "${makeLibraryPath [ curl ]}/libcurl.so.4" \

     

       87
       87
       -
             --prefix LD_PRELOAD : "${makeLibraryPath [ libgnome_keyring ]}/libgnome-keyring.so.0"

     

       87
       87
       +
             --prefix LD_PRELOAD : "${makeLibraryPath [ libgnome-keyring ]}/libgnome-keyring.so.0"

     

       88
       88
        
           mkdir "$out/bin"

     

       89
       89
        
           ln -s "$out/opt/gitkraken/gitkraken" "$out/bin/gitkraken"

     

       90
       90
        
         '';

+1 -1

pkgs/applications/version-management/meld/default.nix

···

       17
       17
        
       

     

       18
       18
        
         buildInputs = [

     

       19
       19
        
           intltool wrapGAppsHook itstool libxml2

     

       20
       20
       -
           gnome3.gtksourceview gnome3.gsettings_desktop_schemas pycairo cairo

     

       20
       20
       +
           gnome3.gtksourceview gnome3.gsettings-desktop-schemas pycairo cairo

     

       21
       21
        
           gnome3.defaultIconTheme gnome3.dconf file

     

       22
       22
        
         ];

     

       23
       23
        
         propagatedBuildInputs = [ gobjectIntrospection pygobject3 gtk3 ];

+1 -1

pkgs/applications/video/byzanz/default.nix

···

       19
       19
        
         NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";

     

       20
       20
        
       

     

       21
       21
        
         nativeBuildInputs = [ pkgconfig ];

     

       22
       22
       -
         buildInputs = [ which gnome3.gnome_common glib intltool libtool cairo gtk3 xorg.xwininfo ]

     

       22
       22
       +
         buildInputs = [ which gnome3.gnome-common glib intltool libtool cairo gtk3 xorg.xwininfo ]

     

       23
       23
        
         ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-bad gst-plugins-good gst-plugins-ugly gst-libav wrapGAppsHook ]);

     

       24
       24
        
       

     

       25
       25
        
         meta = with stdenv.lib; {

+2 -2

pkgs/applications/video/gnome-mplayer/default.nix

···

       1
       1
       -
       {stdenv, substituteAll, fetchFromGitHub, pkgconfig, gettext, glib, gtk3, gmtk, dbus, dbus_glib

     

       1
       1
       +
       {stdenv, substituteAll, fetchFromGitHub, pkgconfig, gettext, glib, gtk3, gmtk, dbus, dbus-glib

     

       2
       2
        
       , libnotify, libpulseaudio, mplayer, wrapGAppsHook }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     
···

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         nativeBuildInputs = [ pkgconfig gettext wrapGAppsHook ];

     

       16
       16
       -
         buildInputs = [ glib gtk3 gmtk dbus dbus_glib libnotify libpulseaudio ];

     

       16
       16
       +
         buildInputs = [ glib gtk3 gmtk dbus dbus-glib libnotify libpulseaudio ];

     

       17
       17
        
       

     

       18
       18
        
         patches = [

     

       19
       19
        
           (substituteAll {

+2 -2

pkgs/applications/video/gnome-mpv/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, meson, ninja

     

       2
       2
       -
       , gettext, pkgconfig, desktop_file_utils, wrapGAppsHook

     

       2
       2
       +
       , gettext, pkgconfig, desktop-file-utils, wrapGAppsHook

     

       3
       3
        
       , appstream-glib, epoxy, glib, gtk3, mpv

     

       4
       4
        
       }:

     

       5
       5
        
       

     
···

       15
       15
        
           sha256 = "1cjhw3kz163iwj2japhnv354i1lr112xyyfkxw82cwy2554cfim4";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
       -
         nativeBuildInputs = [ meson ninja appstream-glib gettext pkgconfig desktop_file_utils wrapGAppsHook ];

     

       18
       18
       +
         nativeBuildInputs = [ meson ninja appstream-glib gettext pkgconfig desktop-file-utils wrapGAppsHook ];

     

       19
       19
        
         buildInputs = [ epoxy glib gtk3 mpv ];

     

       20
       20
        
       

     

       21
       21
        
         enableParallelBuilding = true;

+3 -3

pkgs/applications/video/handbrake/default.nix

···

       16
       16
        
         libogg, libopus, libtheora, libvorbis, libdvdcss, a52dec, fdk_aac,

     

       17
       17
        
         lame, ffmpeg, libdvdread, libdvdnav, libbluray,

     

       18
       18
        
         mp4v2, mpeg2dec, x264, x265, libmkv,

     

       19
       19
       -
         fontconfig, freetype, hicolor_icon_theme,

     

       19
       19
       +
         fontconfig, freetype, hicolor-icon-theme,

     

       20
       20
        
         glib, gtk3, intltool, libnotify,

     

       21
       21
       -
         gst_all_1, dbus_glib, udev, libgudev, libvpx,

     

       21
       21
       +
         gst_all_1, dbus-glib, udev, libgudev, libvpx,

     

       22
       22
        
         useGtk ? true, wrapGAppsHook ? null, libappindicator-gtk3 ? null

     

       23
       23
        
       }:

     

       24
       24
        
       

     
···

       46
       46
        
           lame ffmpeg libdvdread libdvdnav libbluray mp4v2 mpeg2dec x264 x265 libvpx

     

       47
       47
        
         ] ++ (lib.optionals useGtk [

     

       48
       48
        
           glib gtk3 libappindicator-gtk3 libnotify

     

       49
       49
       -
           gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus_glib udev

     

       49
       49
       +
           gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus-glib udev

     

       50
       50
        
           libgudev

     

       51
       51
        
         ]);

     

       52
       52

+2 -2

pkgs/applications/video/kazam/default.nix

···

       1
       1
        
       { stdenv, fetchurl, python3Packages, gst_all_1, makeWrapper, gobjectIntrospection

     

       2
       2
       -
       , gtk3, libwnck3, keybinder, intltool, libcanberra_gtk2 }:

     

       2
       2
       +
       , gtk3, libwnck3, keybinder, intltool, libcanberra-gtk2 }:

     

       3
       3
        
       

     

       4
       4
        
       

     

       5
       5
        
       python3Packages.buildPythonApplication rec {

     
···

       25
       25
        
         patches = [ ./datadir.patch ./bug_1190693.patch ];

     

       26
       26
        
         prePatch = ''

     

       27
       27
        
           rm setup.cfg

     

       28
       28
       -
           substituteInPlace kazam/backend/grabber.py --replace "/usr/bin/canberra-gtk-play" "${libcanberra_gtk2}/bin/canberra-gtk-play"

     

       28
       28
       +
           substituteInPlace kazam/backend/grabber.py --replace "/usr/bin/canberra-gtk-play" "${libcanberra-gtk2}/bin/canberra-gtk-play"

     

       29
       29
        
         '';

     

       30
       30
        
       

     

       31
       31
        
         # no tests

+3 -3

pkgs/applications/video/kodi/default.nix

···

       18
       18
        
       , libcec, libcec_platform, dcadec, libuuid

     

       19
       19
        
       , libcrossguid, libmicrohttpd

     

       20
       20
        
       , bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn, libpthreadstubs, libtasn1, libXdmcp

     

       21
       21
       -
       , libplist, p11_kit, zlib

     

       21
       21
       +
       , libplist, p11-kit, zlib

     

       22
       22
        
       , dbusSupport ? true, dbus_libs ? null

     

       23
       23
        
       , joystickSupport ? true, cwiid ? null

     

       24
       24
        
       , nfsSupport ? true, libnfs ? null

     
···

       78
       78
        
           preConfigure = ''

     

       79
       79
        
             cp ${kodi_src}/tools/depends/target/ffmpeg/{CMakeLists.txt,*.cmake} .

     

       80
       80
        
           '';

     

       81
       81
       -
           buildInputs = [ gnutls libidn libtasn1 p11_kit zlib libva ]

     

       81
       81
       +
           buildInputs = [ gnutls libidn libtasn1 p11-kit zlib libva ]

     

       82
       82
        
             ++ lib.optional  vdpauSupport    libvdpau;

     

       83
       83
        
           nativeBuildInputs = [ cmake nasm pkgconfig ];

     

       84
       84
        
         };

     
···

       118
       118
        
           src = kodi_src;

     

       119
       119
        
       

     

       120
       120
        
           buildInputs = [

     

       121
       121
       -
             gnutls libidn libtasn1 nasm p11_kit

     

       121
       121
       +
             gnutls libidn libtasn1 nasm p11-kit

     

       122
       122
        
             libxml2 yasm python2

     

       123
       123
        
             boost libmicrohttpd

     

       124
       124
        
             gettext pcre-cpp yajl fribidi libva

+3 -3

pkgs/applications/video/miro/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig

     

       2
       2
        
       , pythonPackages, pyrex096, ffmpeg, boost, glib, gtk2, webkitgtk24x-gtk2, libsoup

     

       3
       3
        
       , taglib, sqlite

     

       4
       4
       -
       , libtorrentRasterbar, glib_networking, gsettings_desktop_schemas

     

       4
       4
       +
       , libtorrentRasterbar, glib-networking, gsettings-desktop-schemas

     

       5
       5
        
       , gst-python, gst-plugins-base, gst-plugins-good, gst-ffmpeg

     

       6
       6
        
       , enableBonjour ? false, avahi ? null

     

       7
       7
        
       }:

     
···

       65
       65
        
           mv "$out/bin/miro.real" "$out/bin/miro"

     

       66
       66
        
           wrapProgram "$out/bin/miro" \

     

       67
       67
        
             --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \

     

       68
       68
       -
             --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \

     

       68
       68
       +
             --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \

     

       69
       69
        
             --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share"

     

       70
       70
        
         '';

     

       71
       71
        
       

     

       72
       72
        
         buildInputs = with pythonPackages; [ pygtk pygobject2 ] ++ [

     

       73
       73
        
           pkgconfig pyrex096 ffmpeg boost glib gtk2 webkitgtk24x-gtk2 libsoup

     

       74
       74
       -
           taglib gsettings_desktop_schemas sqlite

     

       74
       74
       +
           taglib gsettings-desktop-schemas sqlite

     

       75
       75
        
         ];

     

       76
       76
        
       

     

       77
       77
        
         propagatedBuildInputs = with pythonPackages; [

+1 -1

pkgs/applications/video/mkcast/default.nix

···

       17
       17
        
       

     

       18
       18
        
         postInstall = ''

     

       19
       19
        
           for f in $out/bin/*; do #*/

     

       20
       20
       -
             wrapProgram $f --prefix PATH : "${stdenv.lib.makeBinPath [ xdpyinfo wmctrl byzanz gnome3.gnome_terminal ]}:$out/bin"

     

       20
       20
       +
             wrapProgram $f --prefix PATH : "${stdenv.lib.makeBinPath [ xdpyinfo wmctrl byzanz gnome3.gnome-terminal ]}:$out/bin"

     

       21
       21
        
           done

     

       22
       22
        
       

     

       23
       23
        
           rm -r screenkey/.bzr

+2 -2

pkgs/applications/video/peek/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, cmake, gettext, libxml2, pkgconfig, txt2man, vala, wrapGAppsHook

     

       2
       2
       -
       , gsettings_desktop_schemas, gtk3, keybinder3

     

       2
       2
       +
       , gsettings-desktop-schemas, gtk3, keybinder3

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     
···

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [ cmake gettext pkgconfig libxml2.bin txt2man vala wrapGAppsHook ];

     

       17
       17
        
       

     

       18
       18
       -
         buildInputs = [ gsettings_desktop_schemas gtk3 keybinder3 ];

     

       18
       18
       +
         buildInputs = [ gsettings-desktop-schemas gtk3 keybinder3 ];

     

       19
       19
        
       

     

       20
       20
        
         enableParallelBuilding = true;

     

       21
       21

+3 -3

pkgs/applications/video/pitivi/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, intltool, itstool, wrapGAppsHook

     

       2
       2
       -
       , python3Packages, gst, gtk3, hicolor_icon_theme

     

       2
       2
       +
       , python3Packages, gst, gtk3, hicolor-icon-theme

     

       3
       3
        
       , gobjectIntrospection, librsvg, gnome3, libnotify

     

       4
       4
        
       # for gst-transcoder:

     

       5
       5
        
       , which, meson, ninja

     
···

       34
       34
        
         nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ];

     

       35
       35
        
       

     

       36
       36
        
         buildInputs = [

     

       37
       37
       -
           gobjectIntrospection gtk3 librsvg gnome3.gnome_desktop

     

       37
       37
       +
           gobjectIntrospection gtk3 librsvg gnome3.gnome-desktop

     

       38
       38
        
           gnome3.defaultIconTheme

     

       39
       39
       -
           gnome3.gsettings_desktop_schemas libnotify

     

       39
       39
       +
           gnome3.gsettings-desktop-schemas libnotify

     

       40
       40
        
           gst-transcoder

     

       41
       41
        
         ] ++ (with gst; [

     

       42
       42
        
           gstreamer gst-editing-services

+3 -3

pkgs/applications/video/subtitleeditor/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, intltool, file,

     

       2
       2
       -
         desktop_file_utils, enchant, gnome3, gst_all_1, hicolor_icon_theme,

     

       2
       2
       +
         desktop-file-utils, enchant, gnome3, gst_all_1, hicolor-icon-theme,

     

       3
       3
        
         libsigcxx, libxmlxx, xdg_utils, isocodes, wrapGAppsHook

     

       4
       4
        
       }:

     

       5
       5
        
       

     
···

       26
       26
        
         ];

     

       27
       27
        
       

     

       28
       28
        
         buildInputs =  [

     

       29
       29
       -
           desktop_file_utils

     

       29
       29
       +
           desktop-file-utils

     

       30
       30
        
           enchant

     

       31
       31
        
           gnome3.gtk

     

       32
       32
        
           gnome3.gtkmm

     
···

       34
       34
        
           gst_all_1.gstreamermm

     

       35
       35
        
           gst_all_1.gst-plugins-base

     

       36
       36
        
           gst_all_1.gst-plugins-good

     

       37
       37
       -
           hicolor_icon_theme

     

       37
       37
       +
           hicolor-icon-theme

     

       38
       38
        
           libsigcxx

     

       39
       39
        
           libxmlxx

     

       40
       40
        
           xdg_utils

+2 -2

pkgs/applications/video/xine-ui/default.nix

···

       1
       1
        
       {stdenv, fetchurl, pkgconfig, xorg, libpng, xineLib, readline, ncurses, curl

     

       2
       2
       -
       , lirc, shared_mime_info, libjpeg }:

     

       2
       2
       +
       , lirc, shared-mime-info, libjpeg }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         name = "xine-ui-0.99.9";

     
···

       9
       9
        
           sha256 = "18liwmkbj75xs9bipw3vr67a7cwmdfcp04v5lph7nsjlkwhq1lcd";

     

       10
       10
        
         };

     

       11
       11
        
         

     

       12
       12
       -
         nativeBuildInputs = [ pkgconfig shared_mime_info ];

     

       12
       12
       +
         nativeBuildInputs = [ pkgconfig shared-mime-info ];

     

       13
       13
        
       

     

       14
       14
        
         buildInputs =

     

       15
       15
        
           [ xineLib libpng readline ncurses curl lirc libjpeg

+2 -2

pkgs/applications/virtualization/looking-glass-client/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub

     

       2
       2
       -
       , pkgconfig, SDL2, SDL, SDL2_ttf, openssl, spice_protocol, fontconfig

     

       2
       2
       +
       , pkgconfig, SDL2, SDL, SDL2_ttf, openssl, spice-protocol, fontconfig

     

       3
       3
        
       , libX11, freefont_ttf

     

       4
       4
        
       }:

     

       5
       5
        
       

     
···

       17
       17
        
         nativeBuildInputs = [ pkgconfig ];

     

       18
       18
        
       

     

       19
       19
        
         buildInputs = [

     

       20
       20
       -
           SDL SDL2 SDL2_ttf openssl spice_protocol fontconfig

     

       20
       20
       +
           SDL SDL2 SDL2_ttf openssl spice-protocol fontconfig

     

       21
       21
        
           libX11 freefont_ttf

     

       22
       22
        
         ];

     

       23
       23

+2 -2

pkgs/applications/virtualization/qemu/default.nix

···

       9
       9
        
       , pulseSupport ? !stdenv.isDarwin, libpulseaudio

     

       10
       10
        
       , sdlSupport ? !stdenv.isDarwin, SDL

     

       11
       11
        
       , vncSupport ? true, libjpeg, libpng

     

       12
       12
       -
       , spiceSupport ? !stdenv.isDarwin, spice, spice_protocol

     

       12
       12
       +
       , spiceSupport ? !stdenv.isDarwin, spice, spice-protocol

     

       13
       13
        
       , usbredirSupport ? spiceSupport, usbredir

     

       14
       14
        
       , xenSupport ? false, xen

     

       15
       15
        
       , hostCpuOnly ? false

     
···

       54
       54
        
           ++ optionals pulseSupport [ libpulseaudio ]

     

       55
       55
        
           ++ optionals sdlSupport [ SDL ]

     

       56
       56
        
           ++ optionals vncSupport [ libjpeg libpng ]

     

       57
       57
       -
           ++ optionals spiceSupport [ spice_protocol spice ]

     

       57
       57
       +
           ++ optionals spiceSupport [ spice-protocol spice ]

     

       58
       58
        
           ++ optionals usbredirSupport [ usbredir ]

     

       59
       59
        
           ++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ]

     

       60
       60
        
           ++ optionals xenSupport [ xen ];

+2 -2

pkgs/applications/virtualization/spice-vdagent/default.nix

···

       1
       1
       -
       {stdenv, fetchurl, pkgconfig, alsaLib, spice_protocol, glib,

     

       1
       1
       +
       {stdenv, fetchurl, pkgconfig, alsaLib, spice-protocol, glib,

     

       2
       2
        
        libpciaccess, libxcb, libXrandr, libXinerama, libXfixes, dbus,

     

       3
       3
        
        systemd}:

     

       4
       4
        
       stdenv.mkDerivation rec {

     
···

       11
       11
        
           substituteInPlace data/spice-vdagent.desktop --replace /usr $out

     

       12
       12
        
         '';

     

       13
       13
        
         nativeBuildInputs = [ pkgconfig ];

     

       14
       14
       -
         buildInputs = [ alsaLib spice_protocol glib

     

       14
       14
       +
         buildInputs = [ alsaLib spice-protocol glib

     

       15
       15
        
                         libpciaccess libxcb libXrandr libXinerama libXfixes

     

       16
       16
        
                         dbus systemd ] ;

     

       17
       17
        
         meta = {

+4 -4

pkgs/applications/virtualization/virt-manager/default.nix

···

       1
       1
        
       { stdenv, fetchurl, python2Packages, intltool, file

     

       2
       2
        
       , wrapGAppsHook, gtkvnc, vte, avahi, dconf

     

       3
       3
        
       , gobjectIntrospection, libvirt-glib, system-libvirt

     

       4
       4
       -
       , gsettings_desktop_schemas, glib, libosinfo, gnome3, gtk3

     

       5
       5
       -
       , spiceSupport ? true, spice_gtk ? null

     

       4
       4
       +
       , gsettings-desktop-schemas, glib, libosinfo, gnome3, gtk3

     

       5
       5
       +
       , spiceSupport ? true, spice-gtk ? null

     

       6
       6
        
       }:

     

       7
       7
        
       

     

       8
       8
        
       with stdenv.lib;

     
···

       24
       24
        
       

     

       25
       25
        
         buildInputs =

     

       26
       26
        
           [ libvirt-glib vte dconf gtkvnc gnome3.defaultIconTheme avahi

     

       27
       27
       -
             gsettings_desktop_schemas libosinfo gtk3

     

       28
       28
       -
           ] ++ optional spiceSupport spice_gtk;

     

       27
       27
       +
             gsettings-desktop-schemas libosinfo gtk3

     

       28
       28
       +
           ] ++ optional spiceSupport spice-gtk;

     

       29
       29
        
       

     

       30
       30
        
         propagatedBuildInputs = with python2Packages;

     

       31
       31
        
           [

+2 -2

pkgs/applications/virtualization/virt-manager/qt.nix

···

       1
       1
        
       { mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig

     

       2
       2
        
       , qtbase, qtmultimedia, qtsvg, qttools

     

       3
       3
       -
       , libvncserver, libvirt, pcre, pixman, qtermwidget, spice_gtk, spice_protocol

     

       3
       3
       +
       , libvncserver, libvirt, pcre, pixman, qtermwidget, spice-gtk, spice-protocol

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       mkDerivation rec {

     
···

       21
       21
        
       

     

       22
       22
        
         buildInputs = [

     

       23
       23
        
           qtbase qtmultimedia qtsvg

     

       24
       24
       -
           libvirt libvncserver pcre pixman qtermwidget spice_gtk spice_protocol

     

       24
       24
       +
           libvirt libvncserver pcre pixman qtermwidget spice-gtk spice-protocol

     

       25
       25
        
         ];

     

       26
       26
        
       

     

       27
       27
        
         nativeBuildInputs = [ cmake pkgconfig qttools ];

+7 -7

pkgs/applications/virtualization/virt-viewer/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtkvnc, gmp

     

       2
       2
       -
       , libgcrypt, gnupg, cyrus_sasl, shared_mime_info, libvirt, yajl, xen

     

       3
       3
       -
       , gsettings_desktop_schemas, makeWrapper, libvirt-glib, libcap_ng, numactl

     

       2
       2
       +
       , libgcrypt, gnupg, cyrus_sasl, shared-mime-info, libvirt, yajl, xen

     

       3
       3
       +
       , gsettings-desktop-schemas, makeWrapper, libvirt-glib, libcap_ng, numactl

     

       4
       4
        
       , libapparmor

     

       5
       5
        
       , spiceSupport ? true

     

       6
       6
       -
       , spice_gtk ? null, spice_protocol ? null, libcap ? null, gdbm ? null

     

       6
       6
       +
       , spice-gtk ? null, spice-protocol ? null, libcap ? null, gdbm ? null

     

       7
       7
        
       }:

     

       8
       8
        
       

     

       9
       9
        
       assert spiceSupport ->

     

       10
       10
       -
         spice_gtk != null && spice_protocol != null && libcap != null && gdbm != null;

     

       10
       10
       +
         spice-gtk != null && spice-protocol != null && libcap != null && gdbm != null;

     

       11
       11
        
       

     

       12
       12
        
       with stdenv.lib;

     

       13
       13
        
       

     
···

       23
       23
        
       

     

       24
       24
        
         nativeBuildInputs = [ pkgconfig intltool ];

     

       25
       25
        
         buildInputs = [

     

       26
       26
       -
           glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl shared_mime_info

     

       27
       27
       -
           libvirt yajl gsettings_desktop_schemas makeWrapper libvirt-glib

     

       26
       26
       +
           glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl shared-mime-info

     

       27
       27
       +
           libvirt yajl gsettings-desktop-schemas makeWrapper libvirt-glib

     

       28
       28
        
           libcap_ng numactl libapparmor

     

       29
       29
        
         ] ++ optionals stdenv.isx86_64 [

     

       30
       30
        
           xen

     

       31
       31
        
         ] ++ optionals spiceSupport [

     

       32
       32
       -
           spice_gtk spice_protocol libcap gdbm

     

       32
       32
       +
           spice-gtk spice-protocol libcap gdbm

     

       33
       33
        
         ];

     

       34
       34
        
       

     

       35
       35
        
         postInstall = ''

+2 -2

pkgs/applications/virtualization/xen/4.5.nix

···

       9
       9
        
       , withLibHVM ? true

     

       10
       10
        
       

     

       11
       11
        
       # qemu

     

       12
       12
       -
       , udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice_protocol, usbredir

     

       12
       12
       +
       , udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice-protocol, usbredir

     

       13
       13
        
       , alsaLib

     

       14
       14
        
       , ... } @ args:

     

       15
       15
        
       

     
···

       29
       29
        
         });

     

       30
       30
        
       

     

       31
       31
        
         qemuDeps = [

     

       32
       32
       -
           udev pciutils xorg.libX11 SDL pixman acl glusterfs spice_protocol usbredir

     

       32
       32
       +
           udev pciutils xorg.libX11 SDL pixman acl glusterfs spice-protocol usbredir

     

       33
       33
        
           alsaLib

     

       34
       34
        
         ];

     

       35
       35

+2 -2

pkgs/applications/virtualization/xen/4.8.nix

···

       8
       8
        
       , withLibHVM ? true

     

       9
       9
        
       

     

       10
       10
        
       # qemu

     

       11
       11
       -
       , udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice_protocol, usbredir

     

       11
       11
       +
       , udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice-protocol, usbredir

     

       12
       12
        
       , alsaLib

     

       13
       13
        
       , ... } @ args:

     

       14
       14
        
       

     
···

       30
       30
        
         xsa = import ./xsa-patches.nix { inherit fetchpatch; };

     

       31
       31
        
       

     

       32
       32
        
         qemuDeps = [

     

       33
       33
       -
           udev pciutils xorg.libX11 SDL pixman acl glusterfs spice_protocol usbredir

     

       33
       33
       +
           udev pciutils xorg.libX11 SDL pixman acl glusterfs spice-protocol usbredir

     

       34
       34
        
           alsaLib

     

       35
       35
        
         ];

     

       36
       36
        
       in

+2 -2

pkgs/applications/window-managers/awesome/default.nix

···

       4
       4
        
       , compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm

     

       5
       5
        
       , which, dbus, nettools, git, asciidoc, doxygen

     

       6
       6
        
       , xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs

     

       7
       7
       -
       , libxkbcommon, xcbutilxrm, hicolor_icon_theme

     

       7
       7
       +
       , libxkbcommon, xcbutilxrm, hicolor-icon-theme

     

       8
       8
        
       }:

     

       9
       9
        
       

     

       10
       10
        
       with luaPackages; stdenv.mkDerivation rec {

     
···

       29
       29
        
           docbook_xsl findXMLCatalogs

     

       30
       30
        
         ];

     

       31
       31
        
       

     

       32
       32
       -
         propagatedUserEnvPkgs = [ hicolor_icon_theme ];

     

       32
       32
       +
         propagatedUserEnvPkgs = [ hicolor-icon-theme ];

     

       33
       33
        
         buildInputs = [ cairo librsvg dbus gdk_pixbuf gobjectIntrospection

     

       34
       34
        
                         git lgi libpthreadstubs libstartup_notification

     

       35
       35
        
                         libxdg_basedir lua nettools pango xcb-util-cursor

+2 -2

pkgs/applications/window-managers/kbdd/default.nix

···

       1
       1
       -
       { stdenv, fetchgit, pkgconfig, dbus_glib, autoreconfHook, xorg }:

     

       1
       1
       +
       { stdenv, fetchgit, pkgconfig, dbus-glib, autoreconfHook, xorg }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "kbdd";

     
···

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ autoreconfHook pkgconfig ];

     

       13
       13
       -
         buildInputs = [ xorg.libX11 dbus_glib ];

     

       13
       13
       +
         buildInputs = [ xorg.libX11 dbus-glib ];

     

       14
       14
        
       

     

       15
       15
        
         meta = {

     

       16
       16
        
           description = "Simple daemon and library to make per window layout using XKB";

+2 -2

pkgs/applications/window-managers/xmonad-log-applet/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, dbus_glib

     

       1
       1
       +
       { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, dbus-glib

     

       2
       2
        
       , desktopSupport

     

       3
       3
        
       , gtk2, gnome2_panel, GConf2

     

       4
       4
        
       , libxfce4util, xfce4panel

     
···

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         buildInputs =  with stdenv.lib;

     

       22
       22
       -
                        [ glib dbus_glib ]

     

       22
       22
       +
                        [ glib dbus-glib ]

     

       23
       23
        
                     ++ optionals (desktopSupport == "gnome2") [ gtk2 gnome2_panel GConf2 ]

     

       24
       24
        
                     # TODO: no idea where to find libpanelapplet-4.0

     

       25
       25
        
                     ++ optionals (desktopSupport == "gnome3") [ ]

+4 -4

pkgs/build-support/rust/default-crate-overrides.nix

···

       1
       1
        
       { stdenv, pkgconfig, curl, darwin, libiconv, libgit2, libssh2,

     

       2
       2
       -
         openssl, sqlite, zlib, dbus_libs, dbus_glib, gdk_pixbuf, cairo, python3,

     

       2
       2
       +
         openssl, sqlite, zlib, dbus_libs, dbus-glib, gdk_pixbuf, cairo, python3,

     

       3
       3
        
         libsodium, postgresql, ... }:

     

       4
       4
        
       

     

       5
       5
        
       let

     
···

       45
       45
        
           buildInputs = [ pkgconfig dbus_libs ];

     

       46
       46
        
         };

     

       47
       47
        
         gobject-sys = attrs: {

     

       48
       48
       -
           buildInputs = [ dbus_glib ];

     

       48
       48
       +
           buildInputs = [ dbus-glib ];

     

       49
       49
        
         };

     

       50
       50
        
         gio-sys = attrs: {

     

       51
       51
       -
           buildInputs = [ dbus_glib ];

     

       51
       51
       +
           buildInputs = [ dbus-glib ];

     

       52
       52
        
         };

     

       53
       53
        
         gdk-pixbuf-sys = attrs: {

     

       54
       54
       -
           buildInputs = [ dbus_glib ];

     

       54
       54
       +
           buildInputs = [ dbus-glib ];

     

       55
       55
        
         };

     

       56
       56
        
         gdk-pixbuf = attrs: {

     

       57
       57
        
           buildInputs = [ gdk_pixbuf ];

+2 -2

pkgs/data/icons/elementary-xfce-icon-theme/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, gtk3, hicolor_icon_theme }:

     

       1
       1
       +
       { stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "elementary-xfce-icon-theme-${version}";

     
···

       11
       11
        
           sha256 = "15n28f2pw8b0y5pi8ydahg31v6hhh7zvpvymi8jaafdc9bn18z3y";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         nativeBuildInputs = [ gtk3 hicolor_icon_theme ];

     

       14
       14
       +
         nativeBuildInputs = [ gtk3 hicolor-icon-theme ];

     

       15
       15
        
       

     

       16
       16
        
         installPhase = ''

     

       17
       17
        
           mkdir -p $out/share/icons

+2 -2

pkgs/data/icons/numix-icon-theme/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, gtk3, hicolor_icon_theme }:

     

       1
       1
       +
       { stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "${pname}-${version}";

     
···

       12
       12
        
           sha256 = "0q3hpq2jc9iwnzzqpb12g1qzjsw4ckhdqkfqf6nirl87r5drkv6j";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       -
         nativeBuildInputs = [ gtk3 hicolor_icon_theme ];

     

       15
       15
       +
         nativeBuildInputs = [ gtk3 hicolor-icon-theme ];

     

       16
       16
        
       

     

       17
       17
        
         installPhase = ''

     

       18
       18
        
           mkdir -p $out/share/icons

+14 -8

pkgs/desktops/gnome-2/default.nix

···

       3
       3
        
       

     

       4
       4
        
       let overridden = set // overrides; set = with overridden; {

     

       5
       5
        
         # Backward compatibility.

     

       6
       6
       -
         gtkdoc = self.gtk_doc;

     

       6
       6
       +
         gtkdoc = self.gtk-doc;

     

       7
       7
        
         startup_notification = libstartup_notification;

     

       8
       8
        
         startupnotification = libstartup_notification;

     

       9
       9
       -
         gnomedocutils = self.gnome_doc_utils;

     

       9
       9
       +
         gnomedocutils = self.gnome-doc-utils;

     

       10
       10
        
         gnomeicontheme = self.gnome_icon_theme;

     

       11
       11
        
         gnomepanel = self.gnome_panel;

     

       12
       12
       +
         gnome_common = gnome-common;

     

       13
       13
       +
         gnome_keyring = gnome-keyring;

     

       14
       14
       +
         gnome_desktop = gnome-desktop;

     

       15
       15
       +
         gnome_session = gnome-session;

     

       16
       16
       +
         gnome_settings_daemon = gnome-settings-daemon;

     

       17
       17
       +
         gnome_control_center = gnome-control-center;

     

       12
       18
        
       

     

       13
       19
        
       #### PLATFORM

     

       14
       20
        
       

     
···

       41
       47
        
         libgnomecanvasmm = callPackage ./platform/libgnomecanvasmm { };

     

       42
       48
        
       

     

       43
       49
        
         # for git-head builds

     

       44
       44
       -
         gnome_common = callPackage platform/gnome-common { };

     

       50
       50
       +
         gnome-common = callPackage platform/gnome-common { };

     

       45
       51
        
       

     

       46
       52
        
         gnome_mime_data = callPackage ./platform/gnome-mime-data { };

     

       47
       53
        
       

     
···

       77
       83
        
       

     

       78
       84
        
       #### DESKTOP

     

       79
       85
        
       

     

       80
       80
       -
         gnome_keyring = callPackage ./desktop/gnome-keyring { };

     

       86
       86
       +
         gnome-keyring = callPackage ./desktop/gnome-keyring { };

     

       81
       87
        
       

     

       82
       88
        
         libgweather = callPackage ./desktop/libgweather { };

     

       83
       89
        
       

     
···

       97
       103
        
       

     

       98
       104
        
         gnome_menus = callPackage ./desktop/gnome-menus { };

     

       99
       105
        
       

     

       100
       100
       -
         gnome_desktop = callPackage ./desktop/gnome-desktop { };

     

       106
       106
       +
         gnome-desktop = callPackage ./desktop/gnome-desktop { };

     

       101
       107
        
       

     

       102
       108
        
         gnome_panel = callPackage ./desktop/gnome-panel { };

     

       103
       109
        
       

     

       104
       104
       -
         gnome_session = callPackage ./desktop/gnome-session { };

     

       110
       110
       +
         gnome-session = callPackage ./desktop/gnome-session { };

     

       105
       111
        
       

     

       106
       106
       -
         gnome_settings_daemon = callPackage ./desktop/gnome-settings-daemon { };

     

       112
       112
       +
         gnome-settings-daemon = callPackage ./desktop/gnome-settings-daemon { };

     

       107
       113
        
       

     

       108
       108
       -
         gnome_control_center = callPackage ./desktop/gnome-control-center { };

     

       114
       114
       +
         gnome-control-center = callPackage ./desktop/gnome-control-center { };

     

       109
       115
        
       

     

       110
       116
        
         gtksourceview = callPackage ./desktop/gtksourceview { };

     

       111
       117

+7 -7

pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, dbus_glib, libxml2Python, libxslt, libxklavier, cairo, popt, which, python

     

       2
       2
       -
       , shared_mime_info, desktop_file_utils, libunique, libtool, bzip2

     

       3
       3
       -
       , glib, gtk, pango, atk, gnome_doc_utils, intltool, GConf, libglade, libgnome, libgnomeui, libgnomekbd

     

       4
       4
       -
       , librsvg, gnome_menus, gnome_desktop, gnome_panel, metacity, gnome_settings_daemon

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, dbus-glib, libxml2Python, libxslt, libxklavier, cairo, popt, which, python

     

       2
       2
       +
       , shared-mime-info, desktop-file-utils, libunique, libtool, bzip2

     

       3
       3
       +
       , glib, gtk, pango, atk, gnome-doc-utils, intltool, GConf, libglade, libgnome, libgnomeui, libgnomekbd

     

       4
       4
       +
       , librsvg, gnome_menus, gnome-desktop, gnome_panel, metacity, gnome-settings-daemon

     

       5
       5
        
       , libbonobo, libbonoboui, libgnomecanvas, libart_lgpl, gnome_vfs, ORBit2

     

       6
       6
        
       , libSM }:

     

       7
       7
        
       

     
···

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [ pkgconfig ];

     

       17
       17
       -
         buildInputs = [ dbus_glib libxml2Python libxslt libxklavier popt which python shared_mime_info desktop_file_utils

     

       18
       18
       -
                         gtk gnome_doc_utils intltool GConf libglade libgnomekbd libunique libtool bzip2 

     

       19
       19
       -
                         libgnomeui librsvg gnome_menus gnome_desktop gnome_panel metacity gnome_settings_daemon

     

       17
       17
       +
         buildInputs = [ dbus-glib libxml2Python libxslt libxklavier popt which python shared-mime-info desktop-file-utils

     

       18
       18
       +
                         gtk gnome-doc-utils intltool GConf libglade libgnomekbd libunique libtool bzip2 

     

       19
       19
       +
                         libgnomeui librsvg gnome_menus gnome-desktop gnome_panel metacity gnome-settings-daemon

     

       20
       20
        
                         libSM

     

       21
       21
        
         ];

     

       22
       22
        
         configureFlags = "--disable-scrollkeeper";

+2 -2

pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11, gtk

     

       2
       2
       -
       , intltool, GConf, gnome_doc_utils}:

     

       2
       2
       +
       , intltool, GConf, gnome-doc-utils}:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation {

     

       5
       5
        
         name = "gnome-desktop-2.32.1";

     
···

       12
       12
        
         configureFlags = "--disable-scrollkeeper";

     

       13
       13
        
         nativeBuildInputs = [ pkgconfig ];

     

       14
       14
        
         buildInputs = [ python libxml2Python libxslt which libX11 gtk

     

       15
       15
       -
                         intltool GConf gnome_doc_utils ];

     

       15
       15
       +
                         intltool GConf gnome-doc-utils ];

     

       16
       16
        
       }

+2 -2

pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix

···

       1
       1
        
       {stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib,

     

       2
       2
       -
       gtk, intltool, GConf, libgnome_keyring }:

     

       2
       2
       +
       gtk, intltool, GConf, libgnome-keyring }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation {

     

       5
       5
        
         name = "gnome-keyring-2.30.3";

     
···

       9
       9
        
           sha256 = "02r9gv3a4a705jf3h7c0bizn33c73wz0iw2500m7z291nrnmqkmj";

     

       10
       10
        
         };

     

       11
       11
        
         

     

       12
       12
       -
         buildInputs = [ dbus libgcrypt pam python gtk GConf libgnome_keyring ];

     

       12
       12
       +
         buildInputs = [ dbus libgcrypt pam python gtk GConf libgnome-keyring ];

     

       13
       13
        
       

     

       14
       14
        
         propagatedBuildInputs = [ glib libtasn1 ];

     

       15
       15

+7 -7

pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, dbus_glib, dbus, cairo, popt, which, libxml2Python, libxslt, bzip2, python

     

       2
       2
       -
       , glib, gtk, pango, atk, libXau, libcanberra_gtk2

     

       3
       3
       -
       , intltool, ORBit2, libglade, libgnome, libgnomeui, libbonobo, libbonoboui, GConf, gnome_menus, gnome_desktop

     

       4
       4
       -
       , libwnck, librsvg, libgweather, gnome_doc_utils, libgnomecanvas, libart_lgpl, libtasn1, libtool, xorg }:

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, dbus-glib, dbus, cairo, popt, which, libxml2Python, libxslt, bzip2, python

     

       2
       2
       +
       , glib, gtk, pango, atk, libXau, libcanberra-gtk2

     

       3
       3
       +
       , intltool, ORBit2, libglade, libgnome, libgnomeui, libbonobo, libbonoboui, GConf, gnome_menus, gnome-desktop

     

       4
       4
       +
       , libwnck, librsvg, libgweather, gnome-doc-utils, libgnomecanvas, libart_lgpl, libtasn1, libtool, xorg }:

     

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation {

     

       7
       7
        
         name = "gnome-panel-2.32.1";

     
···

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         buildInputs =

     

       15
       15
       -
           [ gtk dbus_glib popt libxml2Python libxslt bzip2 python libXau intltool

     

       15
       15
       +
           [ gtk dbus-glib popt libxml2Python libxslt bzip2 python libXau intltool

     

       16
       16
        
             ORBit2 libglade libgnome libgnomeui libbonobo libbonoboui GConf

     

       17
       17
       -
             gnome_menus gnome_desktop libwnck librsvg libgweather gnome_doc_utils

     

       18
       18
       -
             libtasn1 libtool libcanberra_gtk2 xorg.libICE xorg.libSM

     

       17
       17
       +
             gnome_menus gnome-desktop libwnck librsvg libgweather gnome-doc-utils

     

       18
       18
       +
             libtasn1 libtool libcanberra-gtk2 xorg.libICE xorg.libSM

     

       19
       19
        
           ];

     

       20
       20
        
       

     

       21
       21
        
         nativeBuildInputs = [ pkgconfig intltool which ];

+2 -2

pkgs/desktops/gnome-2/desktop/gnome-session/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, dbus_glib, cairo, dbus, gtk, pango, atk, libXau, libXtst, inputproto

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, dbus-glib, cairo, dbus, gtk, pango, atk, libXau, libXtst, inputproto

     

       2
       2
        
       , intltool, libglade, startup_notification, GConf, upower, libSM }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation {

     
···

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         buildInputs =

     

       13
       13
       -
           [ dbus_glib gtk libXau libXtst inputproto libglade startup_notification

     

       13
       13
       +
           [ dbus-glib gtk libXau libXtst inputproto libglade startup_notification

     

       14
       14
        
             GConf upower libSM

     

       15
       15
        
           ];

     

       16
       16
        
         nativeBuildInputs = [ pkgconfig intltool ];

+3 -3

pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, dbus_glib, libxklavier, gtk

     

       2
       2
       -
       , intltool, GConf, gnome_desktop, libglade, libgnomekbd, polkit, libpulseaudio

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, dbus-glib, libxklavier, gtk

     

       2
       2
       +
       , intltool, GConf, gnome-desktop, libglade, libgnomekbd, polkit, libpulseaudio

     

       3
       3
        
       , libSM }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation {

     
···

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         buildInputs =

     

       14
       14
       -
           [ dbus_glib libxklavier gtk GConf gnome_desktop libglade libgnomekbd polkit

     

       14
       14
       +
           [ dbus-glib libxklavier gtk GConf gnome-desktop libglade libgnomekbd polkit

     

       15
       15
        
             libpulseaudio libSM

     

       16
       16
        
           ];

     

       17
       17

+2 -2

pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix

···

       1
       1
        
       {stdenv, fetchpatch, fetchurl, autoreconfHook, pkgconfig, atk, cairo, glib

     

       2
       2
       -
       , gnome_common, gtk, pango

     

       2
       2
       +
       , gnome-common, gtk, pango

     

       3
       3
        
       , libxml2Python, perl, intltool, gettext, gtk-mac-integration }:

     

       4
       4
        
       

     

       5
       5
        
       with stdenv.lib;

     
···

       32
       32
        
           pango libxml2Python perl intltool

     

       33
       33
        
           gettext

     

       34
       34
        
         ] ++ optionals stdenv.isDarwin [

     

       35
       35
       -
           autoreconfHook gnome_common gtk-mac-integration

     

       35
       35
       +
           autoreconfHook gnome-common gtk-mac-integration

     

       36
       36
        
         ];

     

       37
       37
        
       

     

       38
       38
        
         preConfigure = optionalString stdenv.isDarwin ''

+2 -2

pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix

···

       1
       1
       -
       {stdenv, fetchurl, pkgconfig, dbus_glib, libxklavier, glib, gtk, intltool, GConf, libglade}:

     

       1
       1
       +
       {stdenv, fetchurl, pkgconfig, dbus-glib, libxklavier, glib, gtk, intltool, GConf, libglade}:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation {

     

       4
       4
        
         name = "libgnomekbd-2.32.0";

     
···

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         nativeBuildInputs = [ pkgconfig ];

     

       12
       12
       -
         buildInputs = [ dbus_glib libxklavier glib gtk intltool GConf libglade ];

     

       12
       12
       +
         buildInputs = [ dbus-glib libxklavier glib gtk intltool GConf libglade ];

     

       13
       13
        
       }

+2 -2

pkgs/desktops/gnome-2/desktop/mail-notification/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, fetchFromGitHub, pkgconfig, glib, gnome2, dbus_glib, gmime, libnotify, libgnome_keyring, openssl, cyrus_sasl, gnonlin, sylpheed, gob2, gettext, intltool, libxml2, hicolor_icon_theme, tango-icon-theme }:

     

       1
       1
       +
       { stdenv, fetchurl, fetchFromGitHub, pkgconfig, glib, gnome2, dbus-glib, gmime, libnotify, libgnome-keyring, openssl, cyrus_sasl, gnonlin, sylpheed, gob2, gettext, intltool, libxml2, hicolor-icon-theme, tango-icon-theme }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         rev = "9ae8768";

     
···

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         nativeBuildInputs = [ pkgconfig ];

     

       16
       16
       -
          buildInputs = [ glib dbus_glib gmime libnotify libgnome_keyring openssl cyrus_sasl gnonlin sylpheed gob2 gettext intltool gnome2.GConf gnome2.libgnomeui dbus_glib gmime libnotify gnome2.gnome_keyring gnome2.scrollkeeper libxml2 gnome2.gnome_icon_theme hicolor_icon_theme tango-icon-theme ];

     

       16
       16
       +
          buildInputs = [ glib dbus-glib gmime libnotify libgnome-keyring openssl cyrus_sasl gnonlin sylpheed gob2 gettext intltool gnome2.GConf gnome2.libgnomeui dbus-glib gmime libnotify gnome2.gnome-keyring gnome2.scrollkeeper libxml2 gnome2.gnome_icon_theme hicolor-icon-theme tango-icon-theme ];

     

       17
       17
        
       

     

       18
       18
        
         prePatch = ''

     

       19
       19
        
           sed -i  -e '/jb_rule_set_install_message/d' -e '/jb_rule_add_install_command/d' jbsrc/jb.c

+5 -5

pkgs/desktops/gnome-2/desktop/metacity/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, glib, gtk, libXcomposite, libXcursor, libXdamage

     

       2
       2
       -
       , libcanberra_gtk2, intltool, GConf, startup_notification, zenity, gnome_doc_utils

     

       3
       3
       -
       , gsettings_desktop_schemas }:

     

       2
       2
       +
       , libcanberra-gtk2, intltool, GConf, startup_notification, zenity, gnome-doc-utils

     

       3
       3
       +
       , gsettings-desktop-schemas }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation {

     

       6
       6
        
         name = "metacity-2.30.3";

     
···

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         buildInputs =

     

       14
       14
       -
           [ pkgconfig glib gtk libXcomposite libXcursor libXdamage libcanberra_gtk2

     

       15
       15
       -
             intltool GConf startup_notification zenity gnome_doc_utils

     

       16
       16
       -
             gsettings_desktop_schemas

     

       14
       14
       +
           [ pkgconfig glib gtk libXcomposite libXcursor libXdamage libcanberra-gtk2

     

       15
       15
       +
             intltool GConf startup_notification zenity gnome-doc-utils

     

       16
       16
       +
             gsettings-desktop-schemas

     

       17
       17
        
           ];

     

       18
       18
        
       }

+2 -2

pkgs/desktops/gnome-2/desktop/zenity/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, glib, gtk, pango, atk

     

       2
       2
       -
       , gnome_doc_utils, intltool, libglade, libX11, which }:

     

       2
       2
       +
       , gnome-doc-utils, intltool, libglade, libX11, which }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation {

     

       5
       5
        
         name = "zenity-2.32.1";

     
···

       12
       12
        
         configureFlags = "--disable-scrollkeeper";

     

       13
       13
        
         buildInputs = [ gtk libglade libxml2 libxslt libX11 ];

     

       14
       14
        
       

     

       15
       15
       -
         nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which ];

     

       15
       15
       +
         nativeBuildInputs = [ pkgconfig intltool gnome-doc-utils which ];

     

       16
       16
        
       }

+2 -2

pkgs/desktops/gnome-2/platform/GConf/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, dbus_glib, glib, ORBit2, libxml2

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, dbus-glib, glib, ORBit2, libxml2

     

       2
       2
        
       , polkit, intltool, dbus_libs, gtk2 ? null, withGtk ? false }:

     

       3
       3
        
       

     

       4
       4
        
       assert withGtk -> (gtk2 != null);

     
···

       13
       13
        
       

     

       14
       14
        
         outputs = [ "out" "dev" "man" ];

     

       15
       15
        
       

     

       16
       16
       -
         buildInputs = [ ORBit2 dbus_libs dbus_glib libxml2 ]

     

       16
       16
       +
         buildInputs = [ ORBit2 dbus_libs dbus-glib libxml2 ]

     

       17
       17
        
           # polkit requires pam, which requires shadow.h, which is not available on

     

       18
       18
        
           # darwin

     

       19
       19
        
           ++ stdenv.lib.optional (!stdenv.isDarwin) polkit

+2 -2

pkgs/desktops/gnome-2/platform/at-spi/default.nix

···

       1
       1
        
       { stdenv, fetchurl, python, pkgconfig, popt, atk, gtk, libX11, libICE, libXtst, libXi

     

       2
       2
       -
       , intltool, libbonobo, ORBit2, GConf, dbus_glib }:

     

       2
       2
       +
       , intltool, libbonobo, ORBit2, GConf, dbus-glib }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation {

     

       5
       5
        
         name = "at-spi-1.32.0";

     
···

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ pkgconfig ];

     

       15
       15
        
         buildInputs = [ python popt atk gtk libX11 libICE libXtst libXi

     

       16
       16
       -
                         intltool libbonobo ORBit2 GConf dbus_glib ];

     

       16
       16
       +
                         intltool libbonobo ORBit2 GConf dbus-glib ];

     

       17
       17
        
       }

+1 -1

pkgs/desktops/gnome-2/platform/gnome-common/default.nix

···

       9
       9
        
           sha256 = "1pz13mpp09q5s3bikm8ml92s1g0scihsm4iipqv1ql3mp6d4z73s";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         propagatedBuildInputs = [ which ]; # autogen.sh which is using gnome_common tends to require which

     

       12
       12
       +
         propagatedBuildInputs = [ which ]; # autogen.sh which is using gnome-common tends to require which

     

       13
       13
        
       

     

       14
       14
        
         patches = [(fetchurl {

     

       15
       15
        
           name = "gnome-common-patch";

+2 -2

pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, libxml2, bzip2, openssl, dbus_glib

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, libxml2, bzip2, openssl, dbus-glib

     

       2
       2
        
       , glib, fam, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     
···

       14
       14
        
       

     

       15
       15
        
         nativeBuildInputs = [ intltool pkgconfig ];

     

       16
       16
        
         buildInputs =

     

       17
       17
       -
           [ libxml2 bzip2 openssl dbus_glib fam cdparanoia

     

       17
       17
       +
           [ libxml2 bzip2 openssl dbus-glib fam cdparanoia

     

       18
       18
        
             gnome_mime_data avahi acl

     

       19
       19
        
           ];

     

       20
       20

+2 -2

pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, gtk3, intltool,

     

       2
       2
       -
       GConf, enchant, isocodes, gnome_icon_theme, gsettings_desktop_schemas }:

     

       2
       2
       +
       GConf, enchant, isocodes, gnome_icon_theme, gsettings-desktop-schemas }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         version = "4.10.0";

     
···

       10
       10
        
           sha256 = "1hq6asgb5n9q3ryx2vngr4jyi8lg65lzpnlgrgcwayiczcj68fya";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
       -
         propagatedBuildInputs = [ gsettings_desktop_schemas gtk3 gnome_icon_theme GConf ];

     

       13
       13
       +
         propagatedBuildInputs = [ gsettings-desktop-schemas gtk3 gnome_icon_theme GConf ];

     

       14
       14
        
         nativeBuildInputs = [ pkgconfig ];

     

       15
       15
        
         buildInputs = [ intltool enchant isocodes ];

     

       16
       16
        
       }

+1 -1

pkgs/desktops/gnome-2/platform/libbonobo/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, flex, bison, pkgconfig, glib, dbus_glib, libxml2, popt

     

       1
       1
       +
       { stdenv, fetchurl, flex, bison, pkgconfig, glib, dbus-glib, libxml2, popt

     

       2
       2
        
       , intltool, ORBit2, procps }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

+2 -2

pkgs/desktops/gnome-2/platform/libgnome/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, glib, popt, zlib, libcanberra_gtk2

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, glib, popt, zlib, libcanberra-gtk2

     

       2
       2
        
       , intltool, libbonobo, GConf, gnome_vfs, ORBit2, libtool, libogg

     

       3
       3
        
       }:

     

       4
       4
        
       

     
···

       18
       18
        
         outputs = [ "out" "dev" ];

     

       19
       19
        
       

     

       20
       20
        
         nativeBuildInputs = [ pkgconfig ];

     

       21
       21
       -
         buildInputs = [ popt zlib intltool GConf gnome_vfs libcanberra_gtk2 libtool ];

     

       21
       21
       +
         buildInputs = [ popt zlib intltool GConf gnome_vfs libcanberra-gtk2 libtool ];

     

       22
       22
        
         propagatedBuildInputs = [ glib libbonobo libogg ];

     

       23
       23
        
       }

+2 -2

pkgs/desktops/gnome-2/platform/libgnomeui/default.nix

···

       1
       1
        
       { stdenv, fetchurl, fetchpatch, pkgconfig, libxml2, xorg, glib, pango

     

       2
       2
        
       , intltool, libgnome, libgnomecanvas, libbonoboui, GConf, libtool

     

       3
       3
       -
       , gnome_vfs, libgnome_keyring, libglade }:

     

       3
       3
       +
       , gnome_vfs, libgnome-keyring, libglade }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         name = "libgnomeui-${minVer}.5";

     
···

       23
       23
        
       

     

       24
       24
        
         nativeBuildInputs = [ pkgconfig intltool ];

     

       25
       25
        
         buildInputs =

     

       26
       26
       -
           [ xorg.xlibsWrapper libxml2 GConf pango glib libgnome_keyring libglade libtool ];

     

       26
       26
       +
           [ xorg.xlibsWrapper libxml2 GConf pango glib libgnome-keyring libglade libtool ];

     

       27
       27
        
       

     

       28
       28
        
         propagatedBuildInputs = [ libgnome libbonoboui libgnomecanvas gnome_vfs ];

     

       29
       29
        
       }

+2 -2

pkgs/desktops/gnome-3/apps/accerciser/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook

     

       2
       2
       -
       , itstool, libxml2, python3Packages, at_spi2_core

     

       2
       2
       +
       , itstool, libxml2, python3Packages, at-spi2-core

     

       3
       3
        
       , dbus, intltool, libwnck3 }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     
···

       9
       9
        
         buildInputs = [

     

       10
       10
        
           gtk3 wrapGAppsHook itstool libxml2 python3Packages.python python3Packages.pyatspi

     

       11
       11
        
           python3Packages.pygobject3 python3Packages.ipython

     

       12
       12
       -
           at_spi2_core dbus intltool libwnck3 gnome3.defaultIconTheme

     

       12
       12
       +
           at-spi2-core dbus intltool libwnck3 gnome3.defaultIconTheme

     

       13
       13
        
         ];

     

       14
       14
        
       

     

       15
       15
        
         wrapPrefixVariables = [ "PYTHONPATH" ];

+9 -9

pkgs/desktops/gnome-3/apps/bijiben/default.nix

···

       1
       1
        
       { stdenv, meson, ninja, gettext, fetchurl, pkgconfig, glib

     

       2
       2
       -
       , evolution_data_server, evolution, sqlite

     

       3
       3
       -
       , wrapGAppsHook, itstool, desktop_file_utils

     

       4
       4
       -
       , clutter_gtk, libuuid, webkitgtk, zeitgeist

     

       2
       2
       +
       , evolution-data-server, evolution, sqlite

     

       3
       3
       +
       , wrapGAppsHook, itstool, desktop-file-utils

     

       4
       4
       +
       , clutter-gtk, libuuid, webkitgtk, zeitgeist

     

       5
       5
        
       , gnome3, librsvg, gdk_pixbuf, libxml2 }:

     

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     
···

       18
       18
        
           patchShebangs meson_post_install.py

     

       19
       19
        
         '';

     

       20
       20
        
       

     

       21
       21
       -
         propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];

     

       21
       21
       +
         propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];

     

       22
       22
        
       

     

       23
       23
        
         nativeBuildInputs = [

     

       24
       24
       -
           meson ninja pkgconfig gettext itstool libxml2 desktop_file_utils wrapGAppsHook

     

       24
       24
       +
           meson ninja pkgconfig gettext itstool libxml2 desktop-file-utils wrapGAppsHook

     

       25
       25
        
         ];

     

       26
       26
       -
         buildInputs = [ glib clutter_gtk libuuid webkitgtk gnome3.tracker

     

       27
       27
       -
                         gnome3.gnome_online_accounts zeitgeist

     

       28
       28
       -
                         gnome3.gsettings_desktop_schemas

     

       26
       26
       +
         buildInputs = [ glib clutter-gtk libuuid webkitgtk gnome3.tracker

     

       27
       27
       +
                         gnome3.gnome-online-accounts zeitgeist

     

       28
       28
       +
                         gnome3.gsettings-desktop-schemas

     

       29
       29
        
                         gdk_pixbuf gnome3.defaultIconTheme librsvg

     

       30
       30
       -
                         evolution_data_server evolution sqlite ];

     

       30
       30
       +
                         evolution-data-server evolution sqlite ];

     

       31
       31
        
       

     

       32
       32
        
         enableParallelBuilding = true;

     

       33
       33

+9 -9

pkgs/desktops/gnome-3/apps/cheese/default.nix

···

       1
       1
       -
       { stdenv, intltool, fetchurl, wrapGAppsHook, gnome-video-effects, libcanberra_gtk3

     

       2
       2
       -
       , pkgconfig, gtk3, glib, clutter_gtk, clutter-gst, udev, gst_all_1, itstool

     

       1
       1
       +
       { stdenv, intltool, fetchurl, wrapGAppsHook, gnome-video-effects, libcanberra-gtk3

     

       2
       2
       +
       , pkgconfig, gtk3, glib, clutter-gtk, clutter-gst, udev, gst_all_1, itstool

     

       3
       3
        
       , libgudev, autoreconfHook, vala, docbook_xml_dtd_43, docbook_xsl, appstream-glib

     

       4
       4
       -
       , libxslt, yelp_tools, gnome_common, gtk_doc

     

       5
       5
       -
       , adwaita-icon-theme, librsvg, totem, gdk_pixbuf, gnome3, gnome_desktop, libxml2 }:

     

       4
       4
       +
       , libxslt, yelp-tools, gnome-common, gtk-doc

     

       5
       5
       +
       , adwaita-icon-theme, librsvg, totem, gdk_pixbuf, gnome3, gnome-desktop, libxml2 }:

     

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     

       8
       8
        
         inherit (import ./src.nix fetchurl) name src;

     
···

       10
       10
        
         nativeBuildInputs = [

     

       11
       11
        
           pkgconfig intltool itstool vala wrapGAppsHook libxml2 appstream-glib

     

       12
       12
        
           libxslt docbook_xml_dtd_43 docbook_xsl

     

       13
       13
       -
           autoreconfHook gtk_doc yelp_tools gnome_common

     

       13
       13
       +
           autoreconfHook gtk-doc yelp-tools gnome-common

     

       14
       14
        
         ];

     

       15
       15
        
         buildInputs = [ gtk3 glib gnome-video-effects

     

       16
       16
        
                         gdk_pixbuf adwaita-icon-theme librsvg udev gst_all_1.gstreamer

     

       17
       17
       -
                         gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome_desktop

     

       18
       18
       -
                         gst_all_1.gst-plugins-bad clutter_gtk clutter-gst

     

       19
       19
       -
                         libcanberra_gtk3 libgudev ];

     

       17
       17
       +
                         gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome-desktop

     

       18
       18
       +
                         gst_all_1.gst-plugins-bad clutter-gtk clutter-gst

     

       19
       19
       +
                         libcanberra-gtk3 libgudev ];

     

       20
       20
        
       

     

       21
       21
        
         outputs = [ "out" "man" "devdoc" ];

     

       22
       22
        
       

     

       23
       23
        
         patches = [

     

       24
       24
       -
           gtk_doc.respect_xml_catalog_files_var_patch

     

       24
       24
       +
           gtk-doc.respect_xml_catalog_files_var_patch

     

       25
       25
        
         ];

     

       26
       26
        
       

     

       27
       27
        
         preFixup = ''

+10 -10

pkgs/desktops/gnome-3/apps/evolution/default.nix

···

       1
       1
        
       { stdenv, cmake, intltool, fetchurl, libxml2, webkitgtk, highlight

     

       2
       2
        
       , pkgconfig, gtk3, glib, libnotify, gtkspell3

     

       3
       3
       -
       , wrapGAppsHook, itstool, shared_mime_info, libical, db, gcr, sqlite

     

       3
       3
       +
       , wrapGAppsHook, itstool, shared-mime-info, libical, db, gcr, sqlite

     

       4
       4
        
       , gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu

     

       5
       5
       -
       , libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit, openldap }:

     

       5
       5
       +
       , libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }:

     

       6
       6
        
       

     

       7
       7
        
       let

     

       8
       8
        
         majVer = gnome3.version;

     
···

       11
       11
        
       

     

       12
       12
        
         doCheck = true;

     

       13
       13
        
       

     

       14
       14
       -
         propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard

     

       15
       15
       -
                                   gnome3.evolution_data_server ];

     

       14
       14
       +
         propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard

     

       15
       15
       +
                                   gnome3.evolution-data-server ];

     

       16
       16
        
       

     

       17
       17
        
         buildInputs = [ gtk3 glib gdk_pixbuf gnome3.defaultIconTheme librsvg db icu

     

       18
       18
       -
                         gnome3.evolution_data_server libsecret libical gcr

     

       19
       19
       -
                         webkitgtk shared_mime_info gnome3.gnome_desktop gtkspell3

     

       20
       20
       -
                         libcanberra_gtk3 bogofilter gnome3.libgdata sqlite

     

       21
       21
       -
                         gst_all_1.gstreamer gst_all_1.gst-plugins-base p11_kit

     

       18
       18
       +
                         gnome3.evolution-data-server libsecret libical gcr

     

       19
       19
       +
                         webkitgtk shared-mime-info gnome3.gnome-desktop gtkspell3

     

       20
       20
       +
                         libcanberra-gtk3 bogofilter gnome3.libgdata sqlite

     

       21
       21
       +
                         gst_all_1.gstreamer gst_all_1.gst-plugins-base p11-kit

     

       22
       22
        
                         nss nspr libnotify procps highlight gnome3.libgweather

     

       23
       23
       -
                         gnome3.gsettings_desktop_schemas

     

       24
       24
       -
                         gnome3.libgnome_keyring gnome3.glib_networking openldap

     

       23
       23
       +
                         gnome3.gsettings-desktop-schemas

     

       24
       24
       +
                         gnome3.libgnome-keyring gnome3.glib-networking openldap

     

       25
       25
        
                       ];

     

       26
       26
        
       

     

       27
       27
        
         nativeBuildInputs = [ cmake intltool itstool libxml2 pkgconfig wrapGAppsHook ];

+2 -2

pkgs/desktops/gnome-3/apps/gedit/default.nix

···

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
        
         inherit (import ./src.nix fetchurl) name src;

     

       8
       8
        
       

     

       9
       9
       -
         propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];

     

       9
       9
       +
         propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];

     

       10
       10
        
       

     

       11
       11
        
         nativeBuildInputs = [ pkgconfig wrapGAppsHook ];

     

       12
       12
        
       

     

       13
       13
        
         buildInputs = [ gtk3 glib intltool itstool enchant isocodes

     

       14
       14
        
                         gdk_pixbuf gnome3.defaultIconTheme librsvg libsoup

     

       15
       15
        
                         gnome3.libpeas gnome3.gtksourceview libxml2

     

       16
       16
       -
                         gnome3.gsettings_desktop_schemas gnome3.dconf file gspell ];

     

       16
       16
       +
                         gnome3.gsettings-desktop-schemas gnome3.dconf file gspell ];

     

       17
       17
        
       

     

       18
       18
        
         enableParallelBuilding = true;

     

       19
       19

+1 -1

pkgs/desktops/gnome-3/apps/glade/default.nix

···

       11
       11
        
         ];

     

       12
       12
        
         buildInputs = [

     

       13
       13
        
           gtk3 glib libxml2 python3 python3.pkgs.pygobject3

     

       14
       14
       -
           gnome3.gsettings_desktop_schemas

     

       14
       14
       +
           gnome3.gsettings-desktop-schemas

     

       15
       15
        
           gdk_pixbuf gnome3.defaultIconTheme

     

       16
       16
        
         ];

     

       17
       17

+6 -6

pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix

···

       1
       1
        
       { stdenv, fetchurl, makeWrapper, pkgconfig, gettext, itstool, libvirt-glib

     

       2
       2
       -
       , glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice_gtk

     

       3
       3
       -
       , spice_protocol, libsoup, libosinfo, systemd, tracker, tracker-miners, vala

     

       4
       4
       -
       , libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg, desktop_file_utils

     

       2
       2
       +
       , glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice-gtk

     

       3
       3
       +
       , spice-protocol, libsoup, libosinfo, systemd, tracker, tracker-miners, vala

     

       4
       4
       +
       , libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg, desktop-file-utils

     

       5
       5
        
       , mtools, cdrkit, libcdio, libusb, libarchive, acl, libgudev, qemu, libsecret

     

       6
       6
        
       , libcap_ng, numactl, xen, libapparmor

     

       7
       7
        
       }:

     
···

       21
       21
        
       

     

       22
       22
        
         buildInputs = [

     

       23
       23
        
           itstool libvirt-glib glib gobjectIntrospection libxml2 gtk3 gtkvnc

     

       24
       24
       -
           libvirt spice_gtk spice_protocol libsoup libosinfo systemd

     

       24
       24
       +
           libvirt spice-gtk spice-protocol libsoup libosinfo systemd

     

       25
       25
        
           tracker tracker-miners vala libcap yajl gmp gdbm cyrus_sasl libusb libarchive

     

       26
       26
       -
           gnome3.defaultIconTheme librsvg desktop_file_utils acl libgudev libsecret

     

       26
       26
       +
           gnome3.defaultIconTheme librsvg desktop-file-utils acl libgudev libsecret

     

       27
       27
        
           libcap_ng numactl xen libapparmor

     

       28
       28
        
         ];

     

       29
       29
        
       

     
···

       31
       31
        
           for prog in "$out/bin/"*; do

     

       32
       32
        
               wrapProgram "$prog" \

     

       33
       33
        
                   --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \

     

       34
       34
       -
                   --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \

     

       34
       34
       +
                   --prefix XDG_DATA_DIRS : "${gnome3.gnome-themes-standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \

     

       35
       35
        
                   --prefix PATH : "${stdenv.lib.makeBinPath [ mtools cdrkit libcdio qemu ]}"

     

       36
       36
        
           done

     

       37
       37
        
         '';

+4 -4

pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix

···

       1
       1
        
       { stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook

     

       2
       2
       -
       , gettext, libxml2, gnome3, gtk, evolution_data_server, libsoup

     

       3
       3
       -
       , glib, gnome_online_accounts, gsettings_desktop_schemas }:

     

       2
       2
       +
       , gettext, libxml2, gnome3, gtk, evolution-data-server, libsoup

     

       3
       3
       +
       , glib, gnome-online-accounts, gsettings-desktop-schemas }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         inherit (import ./src.nix fetchurl) name src;

     
···

       9
       9
        
       

     

       10
       10
        
         nativeBuildInputs = [ meson ninja pkgconfig gettext libxml2 wrapGAppsHook ];

     

       11
       11
        
         buildInputs = [

     

       12
       12
       -
           gtk evolution_data_server libsoup glib gnome_online_accounts

     

       13
       13
       -
           gsettings_desktop_schemas gnome3.defaultIconTheme

     

       12
       12
       +
           gtk evolution-data-server libsoup glib gnome-online-accounts

     

       13
       13
       +
           gsettings-desktop-schemas gnome3.defaultIconTheme

     

       14
       14
        
         ];

     

       15
       15
        
       

     

       16
       16
        
         postPatch = ''

+1 -1

pkgs/desktops/gnome-3/apps/gnome-characters/default.nix

···

       7
       7
        
         nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ];

     

       8
       8
        
         buildInputs = [

     

       9
       9
        
           gtk3 gjs gdk_pixbuf gobjectIntrospection

     

       10
       10
       -
           librsvg gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme

     

       10
       10
       +
           librsvg gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme

     

       11
       11
        
         ];

     

       12
       12
        
       

     

       13
       13
        
         meta = with stdenv.lib; {

+4 -4

pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix

···

       1
       1
        
       { stdenv, fetchurl

     

       2
       2
       -
       , meson, ninja, gettext, pkgconfig, wrapGAppsHook, itstool, desktop_file_utils

     

       2
       2
       +
       , meson, ninja, gettext, pkgconfig, wrapGAppsHook, itstool, desktop-file-utils

     

       3
       3
        
       , vala,  gtk3, glib, gsound

     

       4
       4
        
       , gnome3, gdk_pixbuf, geoclue2, libgweather }:

     

       5
       5
        
       

     
···

       9
       9
        
         doCheck = true;

     

       10
       10
        
       

     

       11
       11
        
         nativeBuildInputs = [

     

       12
       12
       -
           vala meson ninja pkgconfig gettext itstool wrapGAppsHook desktop_file_utils

     

       12
       12
       +
           vala meson ninja pkgconfig gettext itstool wrapGAppsHook desktop-file-utils

     

       13
       13
        
         ];

     

       14
       14
        
         buildInputs = [

     

       15
       15
       -
           gtk3 glib gnome3.gsettings_desktop_schemas gdk_pixbuf gnome3.defaultIconTheme

     

       16
       16
       -
           gnome3.gnome_desktop gnome3.geocode_glib geoclue2 libgweather gsound

     

       15
       15
       +
           gtk3 glib gnome3.gsettings-desktop-schemas gdk_pixbuf gnome3.defaultIconTheme

     

       16
       16
       +
           gnome3.gnome-desktop gnome3.geocode-glib geoclue2 libgweather gsound

     

       17
       17
        
         ];

     

       18
       18
        
       

     

       19
       19
        
         prePatch = "patchShebangs build-aux/";

+6 -6

pkgs/desktops/gnome-3/apps/gnome-documents/default.nix

···

       2
       2
        
       , pkgconfig, gtk3, glib, tracker, tracker-miners

     

       3
       3
        
       , itstool, libxslt, webkitgtk

     

       4
       4
        
       , gnome3, librsvg, gdk_pixbuf, libsoup, docbook_xsl

     

       5
       5
       -
       , gobjectIntrospection, json_glib, inkscape, poppler_utils

     

       6
       6
       -
       , gmp, desktop_file_utils, wrapGAppsHook }:

     

       5
       5
       +
       , gobjectIntrospection, json-glib, inkscape, poppler_utils

     

       6
       6
       +
       , gmp, desktop-file-utils, wrapGAppsHook }:

     

       7
       7
        
       

     

       8
       8
        
       stdenv.mkDerivation rec {

     

       9
       9
        
         inherit (import ./src.nix fetchurl) name src;

     
···

       12
       12
        
       

     

       13
       13
        
         configureFlags = [ "--enable-getting-started" ];

     

       14
       14
        
       

     

       15
       15
       -
         nativeBuildInputs = [ pkgconfig gettext itstool libxslt desktop_file_utils docbook_xsl wrapGAppsHook ];

     

       15
       15
       +
         nativeBuildInputs = [ pkgconfig gettext itstool libxslt desktop-file-utils docbook_xsl wrapGAppsHook ];

     

       16
       16
        
         buildInputs = [ gtk3 glib inkscape poppler_utils

     

       17
       17
       -
                         gnome3.gsettings_desktop_schemas gmp

     

       17
       17
       +
                         gnome3.gsettings-desktop-schemas gmp

     

       18
       18
        
                         gdk_pixbuf gnome3.defaultIconTheme librsvg evince

     

       19
       19
        
                         libsoup webkitgtk gjs gobjectIntrospection gnome3.rest

     

       20
       20
       -
                         tracker tracker-miners gnome3.libgdata gnome3.gnome_online_accounts

     

       21
       21
       -
                         gnome3.gnome_desktop gnome3.libzapojit json_glib gnome3.libgepub ];

     

       20
       20
       +
                         tracker tracker-miners gnome3.libgdata gnome3.gnome-online-accounts

     

       21
       21
       +
                         gnome3.gnome-desktop gnome3.libzapojit json-glib gnome3.libgepub ];

     

       22
       22
        
       

     

       23
       23
        
         enableParallelBuilding = true;

     

       24
       24

+1 -1

pkgs/desktops/gnome-3/apps/gnome-logs/default.nix

···

       9
       9
        
         nativeBuildInputs = [ pkgconfig ];

     

       10
       10
        
         buildInputs = [

     

       11
       11
        
           gtk3 wrapGAppsHook intltool itstool libxml2

     

       12
       12
       -
           systemd gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme

     

       12
       12
       +
           systemd gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme

     

       13
       13
        
         ];

     

       14
       14
        
       

     

       15
       15
        
         meta = with stdenv.lib; {

+3 -3

pkgs/desktops/gnome-3/apps/gnome-maps/default.nix

···

       11
       11
        
         nativeBuildInputs = [ pkgconfig ];

     

       12
       12
        
         buildInputs = [ intltool gobjectIntrospection wrapGAppsHook

     

       13
       13
        
                         gtk3 geoclue2 gnome3.gjs gnome3.libgee folks gfbgraph

     

       14
       14
       -
                         gnome3.geocode_glib libchamplain file libsoup

     

       14
       14
       +
                         gnome3.geocode-glib libchamplain file libsoup

     

       15
       15
        
                         gdk_pixbuf librsvg libgweather autoreconfHook

     

       16
       16
       -
                         gnome3.gsettings_desktop_schemas gnome3.evolution_data_server

     

       17
       17
       -
                         gnome3.gnome_online_accounts gnome3.defaultIconTheme

     

       16
       16
       +
                         gnome3.gsettings-desktop-schemas gnome3.evolution-data-server

     

       17
       17
       +
                         gnome3.gnome-online-accounts gnome3.defaultIconTheme

     

       18
       18
        
                         webkitgtk ];

     

       19
       19
        
       

     

       20
       20
        
         # The .service file isn't wrapped with the correct environment

+2 -2

pkgs/desktops/gnome-3/apps/gnome-music/default.nix

···

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
        
         inherit (import ./src.nix fetchurl) name src;

     

       8
       8
        
       

     

       9
       9
       -
         propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];

     

       9
       9
       +
         propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];

     

       10
       10
        
       

     

       11
       11
        
         nativeBuildInputs = [ pkgconfig ];

     

       12
       12
        
         buildInputs = [ gtk3 glib intltool itstool gnome3.libmediaart

     
···

       15
       15
        
                         python3Packages.pycairo python3Packages.dbus-python python3Packages.requests

     

       16
       16
        
                         python3Packages.pygobject3 gst_all_1.gstreamer gst_all_1.gst-plugins-base

     

       17
       17
        
                         gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad wrapGAppsHook

     

       18
       18
       -
                         gnome3.gsettings_desktop_schemas makeWrapper tracker tracker-miners ];

     

       18
       18
       +
                         gnome3.gsettings-desktop-schemas makeWrapper tracker tracker-miners ];

     

       19
       19
        
       

     

       20
       20
        
         wrapPrefixVariables = [ "PYTHONPATH" ];

     

       21
       21

+6 -6

pkgs/desktops/gnome-3/apps/gnome-photos/default.nix

···

       1
       1
        
       { stdenv, intltool, fetchurl, exempi, libxml2

     

       2
       2
        
       , pkgconfig, gtk3, glib, tracker, tracker-miners

     

       3
       3
        
       , makeWrapper, itstool, gegl, babl, lcms2

     

       4
       4
       -
       , desktop_file_utils, gmp, libmediaart, wrapGAppsHook

     

       5
       5
       -
       , gnome3, librsvg, gdk_pixbuf, libexif, gexiv2, geocode_glib

     

       4
       4
       +
       , desktop-file-utils, gmp, libmediaart, wrapGAppsHook

     

       5
       5
       +
       , gnome3, librsvg, gdk_pixbuf, libexif, gexiv2, geocode-glib

     

       6
       6
        
       , dleyna-renderer }:

     

       7
       7
        
       

     

       8
       8
        
       stdenv.mkDerivation rec {

     
···

       14
       14
        
       

     

       15
       15
        
         nativeBuildInputs = [ pkgconfig ];

     

       16
       16
        
         buildInputs = [ gtk3 glib intltool itstool gegl babl gnome3.libgdata

     

       17
       17
       -
                         gnome3.gsettings_desktop_schemas makeWrapper gmp libmediaart

     

       17
       17
       +
                         gnome3.gsettings-desktop-schemas makeWrapper gmp libmediaart

     

       18
       18
        
                         gdk_pixbuf gnome3.defaultIconTheme librsvg exempi

     

       19
       19
        
                         gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo

     

       20
       20
       -
                         gnome3.gnome_online_accounts gnome3.gnome_desktop

     

       21
       21
       -
                         lcms2 libexif tracker tracker-miners libxml2 desktop_file_utils

     

       22
       22
       -
                         wrapGAppsHook gexiv2 geocode_glib dleyna-renderer ];

     

       20
       20
       +
                         gnome3.gnome-online-accounts gnome3.gnome-desktop

     

       21
       21
       +
                         lcms2 libexif tracker tracker-miners libxml2 desktop-file-utils

     

       22
       22
       +
                         wrapGAppsHook gexiv2 geocode-glib dleyna-renderer ];

     

       23
       23
        
       

     

       24
       24
        
         enableParallelBuilding = true;

     

       25
       25

+3 -3

pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix

···

       7
       7
        
       , meson

     

       8
       8
        
       , ninja

     

       9
       9
        
       , upower

     

       10
       10
       -
       , desktop_file_utils

     

       10
       10
       +
       , desktop-file-utils

     

       11
       11
        
       , wrapGAppsHook

     

       12
       12
        
       , gnome3 }:

     

       13
       13
        
       

     

       14
       14
        
       stdenv.mkDerivation rec {

     

       15
       15
        
         inherit (import ./src.nix fetchurl) name src;

     

       16
       16
        
       

     

       17
       17
       -
         propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];

     

       17
       17
       +
         propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];

     

       18
       18
        
       

     

       19
       19
        
         nativeBuildInputs = [

     

       20
       20
        
           meson

     
···

       25
       25
        
       

     

       26
       26
        
           # needed by meson_post_install.sh

     

       27
       27
        
           glib.dev

     

       28
       28
       -
           desktop_file_utils

     

       28
       28
       +
           desktop-file-utils

     

       29
       29
        
         ];

     

       30
       30
        
       

     

       31
       31
        
         buildInputs = [

+1 -1

pkgs/desktops/gnome-3/apps/gnome-weather/default.nix

···

       7
       7
        
         nativeBuildInputs = [ pkgconfig ];

     

       8
       8
        
         buildInputs = [

     

       9
       9
        
           gtk3 wrapGAppsHook gjs intltool itstool

     

       10
       10
       -
           libgweather gnome3.defaultIconTheme geoclue2 gnome3.gsettings_desktop_schemas

     

       10
       10
       +
           libgweather gnome3.defaultIconTheme geoclue2 gnome3.gsettings-desktop-schemas

     

       11
       11
        
         ];

     

       12
       12
        
       

     

       13
       13
        
         # The .service file isn't wrapped with the correct environment

+6 -6

pkgs/desktops/gnome-3/apps/polari/default.nix

···

       1
       1
        
       { stdenv, itstool, fetchurl, fetchpatch, gdk_pixbuf, adwaita-icon-theme

     

       2
       2
       -
       , telepathy_glib, gjs, meson, ninja, gettext, telepathy_idle, libxml2, desktop_file_utils

     

       2
       2
       +
       , telepathy-glib, gjs, meson, ninja, gettext, telepathy-idle, libxml2, desktop-file-utils

     

       3
       3
        
       , pkgconfig, gtk3, glib, libsecret, libsoup, gobjectIntrospection, appstream-glib

     

       4
       4
       -
       , gnome3, wrapGAppsHook, telepathy_logger, gspell }:

     

       4
       4
       +
       , gnome3, wrapGAppsHook, telepathy-logger, gspell }:

     

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
        
         inherit (import ./src.nix fetchurl) name src;

     

       8
       8
        
       

     

       9
       9
       -
         propagatedUserEnvPkgs = [ telepathy_idle telepathy_logger ];

     

       9
       9
       +
         propagatedUserEnvPkgs = [ telepathy-idle telepathy-logger ];

     

       10
       10
        
       

     

       11
       11
        
         nativeBuildInputs = [ meson ninja pkgconfig itstool gettext wrapGAppsHook libxml2

     

       12
       12
       -
                               desktop_file_utils gobjectIntrospection appstream-glib ];

     

       13
       13
       -
         buildInputs = [ gtk3 glib adwaita-icon-theme gnome3.gsettings_desktop_schemas

     

       14
       14
       -
                         telepathy_glib telepathy_logger gjs gspell gdk_pixbuf libsecret libsoup ];

     

       12
       12
       +
                               desktop-file-utils gobjectIntrospection appstream-glib ];

     

       13
       13
       +
         buildInputs = [ gtk3 glib adwaita-icon-theme gnome3.gsettings-desktop-schemas

     

       14
       14
       +
                         telepathy-glib telepathy-logger gjs gspell gdk_pixbuf libsecret libsoup ];

     

       15
       15
        
       

     

       16
       16
        
         patches = [

     

       17
       17
        
           (fetchpatch {

+5 -5

pkgs/desktops/gnome-3/apps/seahorse/default.nix

···

       2
       2
        
       , pkgconfig, gtk3, glib

     

       3
       3
        
       , wrapGAppsHook, itstool, gnupg, libsoup

     

       4
       4
        
       , gnome3, librsvg, gdk_pixbuf, gpgme

     

       5
       5
       -
       , libsecret, avahi, p11_kit, openssh }:

     

       5
       5
       +
       , libsecret, avahi, p11-kit, openssh }:

     

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     

       8
       8
        
         inherit (import ./src.nix fetchurl) name src;

     

       9
       9
        
       

     

       10
       10
        
         doCheck = true;

     

       11
       11
        
       

     

       12
       12
       -
         propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];

     

       12
       12
       +
         propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];

     

       13
       13
        
       

     

       14
       14
        
         NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";

     

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [ pkgconfig ];

     

       17
       17
        
         buildInputs = [ gtk3 glib intltool itstool gnome3.gcr

     

       18
       18
       -
                         gnome3.gsettings_desktop_schemas wrapGAppsHook gnupg

     

       18
       18
       +
                         gnome3.gsettings-desktop-schemas wrapGAppsHook gnupg

     

       19
       19
        
                         gdk_pixbuf gnome3.defaultIconTheme librsvg gpgme

     

       20
       20
       -
                         libsecret avahi libsoup p11_kit vala

     

       20
       20
       +
                         libsecret avahi libsoup p11-kit vala

     

       21
       21
        
                         openssh ];

     

       22
       22
        
       

     

       23
       23
        
         preFixup = ''

     

       24
       24
        
           gappsWrapperArgs+=(

     

       25
       25
       -
             --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share"

     

       25
       25
       +
             --prefix XDG_DATA_DIRS : "${gnome3.gnome-themes-standard}/share"

     

       26
       26
        
           )

     

       27
       27
        
         '';

     

       28
       28

+2 -2

pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, intltool, gnome3

     

       2
       2
       -
       , iconnamingutils, gtk, gdk_pixbuf, librsvg, hicolor_icon_theme }:

     

       2
       2
       +
       , iconnamingutils, gtk, gdk_pixbuf, librsvg, hicolor-icon-theme }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         inherit (import ./src.nix fetchurl) name src;

     

       6
       6
        
       

     

       7
       7
        
         # For convenience, we can specify adwaita-icon-theme only in packages

     

       8
       8
       -
         propagatedBuildInputs = [ hicolor_icon_theme ];

     

       8
       8
       +
         propagatedBuildInputs = [ hicolor-icon-theme ];

     

       9
       9
        
       

     

       10
       10
        
         buildInputs = [ gdk_pixbuf librsvg ];

     

       11
       11

+2 -2

pkgs/desktops/gnome-3/core/caribou/default.nix

···

       1
       1
        
       { fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, python3Packages, libxml2

     

       2
       2
       -
       , libxklavier, libXtst, gtk2, intltool, libxslt, at_spi2_core, autoreconfHook

     

       2
       2
       +
       , libxklavier, libXtst, gtk2, intltool, libxslt, at-spi2-core, autoreconfHook

     

       3
       3
        
       , wrapGAppsHook }:

     

       4
       4
        
       

     

       5
       5
        
       let

     
···

       17
       17
        
         nativeBuildInputs = [ pkgconfig intltool libxslt libxml2 autoreconfHook wrapGAppsHook ];

     

       18
       18
        
       

     

       19
       19
        
         buildInputs = with gnome3;

     

       20
       20
       -
           [ glib gtk clutter at_spi2_core dbus pythonEnv python3Packages.pygobject3

     

       20
       20
       +
           [ glib gtk clutter at-spi2-core dbus pythonEnv python3Packages.pygobject3

     

       21
       21
        
             libXtst gtk2 ];

     

       22
       22
        
       

     

       23
       23
        
         propagatedBuildInputs = [ gnome3.libgee libxklavier ];

+2 -2

pkgs/desktops/gnome-3/core/dconf-editor/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3

     

       1
       1
       +
       { stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus-glib, gnome3

     

       2
       2
        
       , libxml2, intltool, docbook_xsl_ns, docbook_xsl, wrapGAppsHook }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     
···

       6
       6
        
       

     

       7
       7
        
         nativeBuildInputs = [ pkgconfig wrapGAppsHook ];

     

       8
       8
        
       

     

       9
       9
       -
         buildInputs = [ vala libxslt glib dbus_glib gnome3.gtk libxml2 gnome3.defaultIconTheme

     

       9
       9
       +
         buildInputs = [ vala libxslt glib dbus-glib gnome3.gtk libxml2 gnome3.defaultIconTheme

     

       10
       10
        
                         intltool docbook_xsl docbook_xsl_ns gnome3.dconf ];

     

       11
       11
        
       

     

       12
       12
        
         meta = with stdenv.lib; {

+2 -2

pkgs/desktops/gnome-3/core/dconf/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3

     

       1
       1
       +
       { stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus-glib, gnome3

     

       2
       2
        
       , libxml2, intltool, docbook_xsl_ns, docbook_xsl, makeWrapper }:

     

       3
       3
        
       

     

       4
       4
        
       let

     
···

       16
       16
        
         outputs = [ "out" "lib" "dev" ];

     

       17
       17
        
       

     

       18
       18
        
         nativeBuildInputs = [ vala pkgconfig intltool libxslt libxml2 docbook_xsl docbook_xsl_ns makeWrapper ];

     

       19
       19
       -
         buildInputs = [ glib dbus_glib ];

     

       19
       19
       +
         buildInputs = [ glib dbus-glib ];

     

       20
       20
        
       

     

       21
       21
        
         postConfigure = stdenv.lib.optionalString stdenv.isDarwin ''

     

       22
       22
        
           substituteInPlace client/Makefile \

+16 -16

pkgs/desktops/gnome-3/core/empathy/default.nix

···

       1
       1
        
       { stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib

     

       2
       2
        
       , file, librsvg, gnome3, gdk_pixbuf

     

       3
       3
       -
       , dbus_glib, dbus_libs, telepathy_glib, telepathy_farstream

     

       4
       4
       -
       , clutter_gtk, clutter-gst, gst_all_1, cogl, gnome_online_accounts

     

       5
       5
       -
       , gcr, libsecret, folks, libpulseaudio, telepathy_mission_control

     

       6
       6
       -
       , telepathy_logger, libnotify, clutter, libsoup, gnutls

     

       7
       7
       -
       , evolution_data_server, yelp_xsl

     

       8
       8
       -
       , libcanberra_gtk3, p11_kit, farstream, libtool, shared_mime_info

     

       3
       3
       +
       , dbus-glib, dbus_libs, telepathy-glib, telepathy-farstream

     

       4
       4
       +
       , clutter-gtk, clutter-gst, gst_all_1, cogl, gnome-online-accounts

     

       5
       5
       +
       , gcr, libsecret, folks, libpulseaudio, telepathy-mission-control

     

       6
       6
       +
       , telepathy-logger, libnotify, clutter, libsoup, gnutls

     

       7
       7
       +
       , evolution-data-server, yelp-xsl

     

       8
       8
       +
       , libcanberra-gtk3, p11-kit, farstream, libtool, shared-mime-info

     

       9
       9
        
       , bash, wrapGAppsHook, itstool, libxml2, libxslt, icu, libgee

     

       10
       10
       -
       , isocodes, enchant, libchamplain, geoclue2, geocode_glib, cheese, libgudev }:

     

       10
       10
       +
       , isocodes, enchant, libchamplain, geoclue2, geocode-glib, cheese, libgudev }:

     

       11
       11
        
       

     

       12
       12
        
       stdenv.mkDerivation rec {

     

       13
       13
        
         inherit (import ./src.nix fetchurl) name src;

     

       14
       14
        
       

     

       15
       15
        
         propagatedUserEnvPkgs = [

     

       16
       16
       -
           gnome_online_accounts shared_mime_info

     

       16
       16
       +
           gnome-online-accounts shared-mime-info

     

       17
       17
        
         ];

     

       18
       18
        
         propagatedBuildInputs = [

     

       19
       19
       -
           folks telepathy_logger evolution_data_server telepathy_mission_control

     

       19
       19
       +
           folks telepathy-logger evolution-data-server telepathy-mission-control

     

       20
       20
        
         ];

     

       21
       21
        
         nativeBuildInputs = [

     

       22
       22
        
           pkgconfig libtool intltool itstool file wrapGAppsHook

     

       23
       23
       -
           libxml2 libxslt yelp_xsl

     

       23
       23
       +
           libxml2 libxslt yelp-xsl

     

       24
       24
        
         ];

     

       25
       25
        
         buildInputs = [

     

       26
       26
       -
           gtk3 glib webkitgtk icu gnome_online_accounts

     

       27
       27
       -
           telepathy_glib clutter_gtk clutter-gst cogl

     

       26
       26
       +
           gtk3 glib webkitgtk icu gnome-online-accounts

     

       27
       27
       +
           telepathy-glib clutter-gtk clutter-gst cogl

     

       28
       28
        
           gst_all_1.gstreamer gst_all_1.gst-plugins-base

     

       29
       29
        
           gcr libsecret libpulseaudio gdk_pixbuf

     

       30
       30
       -
           libnotify clutter libsoup gnutls libgee p11_kit

     

       31
       31
       -
           libcanberra_gtk3 telepathy_farstream farstream

     

       32
       32
       -
           gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas

     

       30
       30
       +
           libnotify clutter libsoup gnutls libgee p11-kit

     

       31
       31
       +
           libcanberra-gtk3 telepathy-farstream farstream

     

       32
       32
       +
           gnome3.defaultIconTheme gnome3.gsettings-desktop-schemas

     

       33
       33
        
           librsvg

     

       34
       34
        
           # Spell-checking

     

       35
       35
        
           enchant isocodes

     

       36
       36
        
           # Display maps, location awareness, geocode support

     

       37
       37
       -
           libchamplain geoclue2 geocode_glib

     

       37
       37
       +
           libchamplain geoclue2 geocode-glib

     

       38
       38
        
           # Cheese webcam support, camera monitoring

     

       39
       39
        
           cheese libgudev

     

       40
       40
        
         ];

+3 -3

pkgs/desktops/gnome-3/core/eog/default.nix

···

       1
       1
        
       { fetchurl, stdenv, gettext, pkgconfig, itstool, libxml2, libjpeg, gnome3

     

       2
       2
       -
       , shared_mime_info, wrapGAppsHook, librsvg, libexif, gobjectIntrospection }:

     

       2
       2
       +
       , shared-mime-info, wrapGAppsHook, librsvg, libexif, gobjectIntrospection }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         inherit (import ./src.nix fetchurl) name src;

     
···

       8
       8
        
       

     

       9
       9
        
         buildInputs = with gnome3;

     

       10
       10
        
           [ libxml2 libjpeg gtk glib libpeas librsvg

     

       11
       11
       -
             gsettings_desktop_schemas shared_mime_info adwaita-icon-theme

     

       12
       12
       -
             gnome_desktop libexif dconf ];

     

       11
       11
       +
             gsettings-desktop-schemas shared-mime-info adwaita-icon-theme

     

       12
       12
       +
             gnome-desktop libexif dconf ];

     

       13
       13
        
       

     

       14
       14
        
         meta = with stdenv.lib; {

     

       15
       15
        
           homepage = https://wiki.gnome.org/Apps/EyeOfGnome;

+10 -10

pkgs/desktops/gnome-3/core/epiphany/default.nix

···

       1
       1
        
       { stdenv, meson, ninja, gettext, fetchurl, pkgconfig, gtk, glib, icu

     

       2
       2
        
       , wrapGAppsHook, gnome3, libxml2, libxslt, itstool

     

       3
       3
       -
       , webkitgtk, libsoup, glib_networking, libsecret, gnome_desktop, libnotify, p11_kit

     

       4
       4
       -
       , sqlite, gcr, isocodes, desktop_file_utils, file

     

       5
       5
       -
       , gdk_pixbuf, gnome_common, gst_all_1, json_glib }:

     

       3
       3
       +
       , webkitgtk, libsoup, glib-networking, libsecret, gnome-desktop, libnotify, p11-kit

     

       4
       4
       +
       , sqlite, gcr, isocodes, desktop-file-utils, file

     

       5
       5
       +
       , gdk_pixbuf, gnome-common, gst_all_1, json-glib }:

     

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     

       8
       8
        
         inherit (import ./src.nix fetchurl) name src;

     
···

       10
       10
        
         # Tests need an X display

     

       11
       11
        
         mesonFlags = [ "-Dunit_tests=false" ];

     

       12
       12
        
       

     

       13
       13
       -
         propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];

     

       13
       13
       +
         propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];

     

       14
       14
        
       

     

       15
       15
       -
         nativeBuildInputs = [ meson ninja libxslt pkgconfig itstool gettext file wrapGAppsHook desktop_file_utils ];

     

       15
       15
       +
         nativeBuildInputs = [ meson ninja libxslt pkgconfig itstool gettext file wrapGAppsHook desktop-file-utils ];

     

       16
       16
        
       

     

       17
       17
       -
         buildInputs = [ gtk glib webkitgtk libsoup libxml2 libsecret gnome_desktop libnotify

     

       18
       18
       -
                         sqlite isocodes p11_kit icu gnome3.yelp_tools

     

       19
       19
       -
                         gdk_pixbuf gnome3.defaultIconTheme gnome_common gcr

     

       20
       20
       -
                         glib_networking gst_all_1.gstreamer gst_all_1.gst-plugins-base

     

       17
       17
       +
         buildInputs = [ gtk glib webkitgtk libsoup libxml2 libsecret gnome-desktop libnotify

     

       18
       18
       +
                         sqlite isocodes p11-kit icu gnome3.yelp-tools

     

       19
       19
       +
                         gdk_pixbuf gnome3.defaultIconTheme gnome-common gcr

     

       20
       20
       +
                         glib-networking gst_all_1.gstreamer gst_all_1.gst-plugins-base

     

       21
       21
        
                         gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly

     

       22
       22
       -
                         gst_all_1.gst-libav json_glib ];

     

       22
       22
       +
                         gst_all_1.gst-libav json-glib ];

     

       23
       23
        
       

     

       24
       24
        
         enableParallelBuilding = true;

     

       25
       25

+5 -5

pkgs/desktops/gnome-3/core/evince/default.nix

···

       1
       1
        
       { fetchurl, stdenv, pkgconfig, intltool, libxml2

     

       2
       2
       -
       , glib, gtk3, pango, atk, gdk_pixbuf, shared_mime_info, itstool, gnome3

     

       2
       2
       +
       , glib, gtk3, pango, atk, gdk_pixbuf, shared-mime-info, itstool, gnome3

     

       3
       3
        
       , poppler, ghostscriptX, djvulibre, libspectre, libsecret, wrapGAppsHook

     

       4
       4
       -
       , librsvg, gobjectIntrospection, yelp_tools

     

       4
       4
       +
       , librsvg, gobjectIntrospection, yelp-tools

     

       5
       5
        
       , recentListSize ? null # 5 is not enough, allow passing a different number

     

       6
       6
        
       , supportXPS ? false    # Open XML Paper Specification via libgxps

     

       7
       7
        
       , autoreconfHook

     
···

       11
       11
        
         inherit (import ./src.nix fetchurl) name src;

     

       12
       12
        
       

     

       13
       13
        
         nativeBuildInputs = [

     

       14
       14
       -
           pkgconfig gobjectIntrospection intltool itstool wrapGAppsHook yelp_tools autoreconfHook

     

       14
       14
       +
           pkgconfig gobjectIntrospection intltool itstool wrapGAppsHook yelp-tools autoreconfHook

     

       15
       15
        
         ];

     

       16
       16
        
       

     

       17
       17
        
         buildInputs = [

     

       18
       18
        
           glib gtk3 pango atk gdk_pixbuf libxml2

     

       19
       19
       -
           gnome3.libgnome_keyring gnome3.gsettings_desktop_schemas

     

       19
       19
       +
           gnome3.libgnome-keyring gnome3.gsettings-desktop-schemas

     

       20
       20
        
           poppler ghostscriptX djvulibre libspectre

     

       21
       21
        
           libsecret librsvg gnome3.adwaita-icon-theme

     

       22
       22
        
         ] ++ stdenv.lib.optional supportXPS gnome3.libgxps;

     
···

       35
       35
        
         '';

     

       36
       36
        
       

     

       37
       37
        
         preFixup = ''

     

       38
       38
       -
           gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared_mime_info}/share")

     

       38
       38
       +
           gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share")

     

       39
       39
        
         '';

     

       40
       40
        
       

     

       41
       41
        
         enableParallelBuilding = true;

+4 -4

pkgs/desktops/gnome-3/core/evolution-data-server/default.nix

···

       1
       1
        
       { fetchurl, stdenv, pkgconfig, gnome3, python3, dconf

     

       2
       2
        
       , intltool, libsoup, libxml2, libsecret, icu, sqlite

     

       3
       3
       -
       , p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true

     

       4
       4
       -
       , vala, cmake, kerberos, openldap, webkitgtk, libaccounts-glib, json_glib }:

     

       3
       3
       +
       , p11-kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true

     

       4
       4
       +
       , vala, cmake, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib }:

     

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
        
         inherit (import ./src.nix fetchurl) name src;

     
···

       10
       10
        
           cmake pkgconfig intltool python3 gperf makeWrapper

     

       11
       11
        
         ] ++ stdenv.lib.optional valaSupport vala;

     

       12
       12
        
         buildInputs = with gnome3; [

     

       13
       13
       -
           glib libsoup libxml2 gtk gnome_online_accounts

     

       14
       14
       -
           gcr p11_kit libgweather libgdata libaccounts-glib json_glib

     

       13
       13
       +
           glib libsoup libxml2 gtk gnome-online-accounts

     

       14
       14
       +
           gcr p11-kit libgweather libgdata libaccounts-glib json-glib

     

       15
       15
        
           icu sqlite kerberos openldap webkitgtk

     

       16
       16
        
         ];

     

       17
       17

+4 -4

pkgs/desktops/gnome-3/core/folks/default.nix

···

       1
       1
        
       { fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool

     

       2
       2
       -
       , vala, sqlite, libxml2, dbus_glib, libsoup, nss, dbus_libs

     

       3
       3
       -
       , telepathy_glib, evolution_data_server, libsecret, db }:

     

       2
       2
       +
       , vala, sqlite, libxml2, dbus-glib, libsoup, nss, dbus_libs

     

       3
       3
       +
       , telepathy-glib, evolution-data-server, libsecret, db }:

     

       4
       4
        
       

     

       5
       5
        
       # TODO: enable more folks backends

     

       6
       6
        
       

     
···

       17
       17
        
       

     

       18
       18
        
         propagatedBuildInputs = [ glib gnome3.libgee sqlite ];

     

       19
       19
        
         # dbus_daemon needed for tests

     

       20
       20
       -
         buildInputs = [ dbus_glib telepathy_glib evolution_data_server dbus_libs

     

       20
       20
       +
         buildInputs = [ dbus-glib telepathy-glib evolution-data-server dbus_libs

     

       21
       21
        
                         vala libsecret libxml2 libsoup nspr nss intltool db ];

     

       22
       22
        
         nativeBuildInputs = [ pkgconfig ];

     

       23
       23
        
       

     

       24
       24
        
         configureFlags = "--disable-fatal-warnings";

     

       25
       25
        
       

     

       26
       26
        
         NIX_CFLAGS_COMPILE = ["-I${nss.dev}/include/nss"

     

       27
       27
       -
                               "-I${dbus_glib.dev}/include/dbus-1.0" "-I${dbus_libs.dev}/include/dbus-1.0"];

     

       27
       27
       +
                               "-I${dbus-glib.dev}/include/dbus-1.0" "-I${dbus_libs.dev}/include/dbus-1.0"];

     

       28
       28
        
       

     

       29
       29
        
         enableParallelBuilding = true;

     

       30
       30

+2 -2

pkgs/desktops/gnome-3/core/gconf/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, dbus_glib, gnome3 ? null, glib, libxml2

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, dbus-glib, gnome3 ? null, glib, libxml2

     

       2
       2
        
       , intltool, polkit, orbit, python, withGtk ? false }:

     

       3
       3
        
       

     

       4
       4
        
       assert withGtk -> (gnome3 != null);

     
···

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         buildInputs = [ libxml2 polkit orbit python ] ++ stdenv.lib.optional withGtk gnome3.gtk;

     

       22
       22
       -
         propagatedBuildInputs = [ glib dbus_glib  ];

     

       22
       22
       +
         propagatedBuildInputs = [ glib dbus-glib  ];

     

       23
       23
        
         nativeBuildInputs = [ pkgconfig intltool ];

     

       24
       24
        
       

     

       25
       25
        
         # ToDo: ldap reported as not found but afterwards reported as supported

+4 -4

pkgs/desktops/gnome-3/core/gcr/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, intltool, gnupg, p11_kit, glib

     

       2
       2
       -
       , libgcrypt, libtasn1, dbus_glib, gtk, pango, gdk_pixbuf, atk

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, intltool, gnupg, p11-kit, glib

     

       2
       2
       +
       , libgcrypt, libtasn1, dbus-glib, gtk, pango, gdk_pixbuf, atk

     

       3
       3
        
       , gobjectIntrospection, makeWrapper, libxslt, vala, gnome3 }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     
···

       12
       12
        
         buildInputs = let

     

       13
       13
        
           gpg = gnupg.override { guiSupport = false; }; # prevent build cycle with pinentry_gnome

     

       14
       14
        
         in [

     

       15
       15
       -
           gpg libgcrypt libtasn1 dbus_glib pango gdk_pixbuf atk

     

       15
       15
       +
           gpg libgcrypt libtasn1 dbus-glib pango gdk_pixbuf atk

     

       16
       16
        
         ];

     

       17
       17
        
       

     

       18
       18
       -
         propagatedBuildInputs = [ glib gtk p11_kit ];

     

       18
       18
       +
         propagatedBuildInputs = [ glib gtk p11-kit ];

     

       19
       19
        
       

     

       20
       20
        
         #doCheck = true;

     

       21
       21

+2 -2

pkgs/desktops/gnome-3/core/gdm/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus

     

       2
       2
        
       , intltool, accountsservice, libX11, gnome3, systemd, autoreconfHook

     

       3
       3
       -
       , gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection, plymouth

     

       3
       3
       +
       , gtk, libcanberra-gtk3, pam, libtool, gobjectIntrospection, plymouth

     

       4
       4
        
       , librsvg, coreutils }:

     

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     
···

       25
       25
        
         nativeBuildInputs = [ pkgconfig libxml2 itstool intltool autoreconfHook libtool gnome3.dconf ];

     

       26
       26
        
         buildInputs = [ glib accountsservice systemd

     

       27
       27
        
                         gobjectIntrospection libX11 gtk

     

       28
       28
       -
                         libcanberra_gtk3 pam plymouth librsvg ];

     

       28
       28
       +
                         libcanberra-gtk3 pam plymouth librsvg ];

     

       29
       29
        
       

     

       30
       30
        
         enableParallelBuilding = true;

     

       31
       31

+2 -2

pkgs/desktops/gnome-3/core/geocode-glib/default.nix

···

       1
       1
       -
       { fetchurl, stdenv, pkgconfig, gnome3, intltool, libsoup, json_glib }:

     

       1
       1
       +
       { fetchurl, stdenv, pkgconfig, gnome3, intltool, libsoup, json-glib }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         inherit (import ./src.nix fetchurl) name src;

     

       5
       5
        
       

     

       6
       6
        
         buildInputs = with gnome3;

     

       7
       7
       -
           [ intltool pkgconfig glib libsoup json_glib ];

     

       7
       7
       +
           [ intltool pkgconfig glib libsoup json-glib ];

     

       8
       8
        
       

     

       9
       9
        
         meta = with stdenv.lib; {

     

       10
       10
        
           platforms = platforms.linux;

+3 -3

pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix

···

       1
       1
        
       { stdenv, fetchurl, gnome3, meson, ninja, pkgconfig, gtk3, intltool, glib

     

       2
       2
       -
       , udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra_gtk3, gobjectIntrospection }:

     

       2
       2
       +
       , udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra-gtk3, gobjectIntrospection }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         inherit (import ./src.nix fetchurl) name src;

     

       6
       6
        
       

     

       7
       7
        
         nativeBuildInputs = [ meson ninja intltool itstool pkgconfig libxml2 wrapGAppsHook gobjectIntrospection ];

     

       8
       8
       -
         buildInputs = [ glib gtk3 udev libnotify libcanberra_gtk3

     

       9
       9
       -
                         gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas ];

     

       8
       8
       +
         buildInputs = [ glib gtk3 udev libnotify libcanberra-gtk3

     

       9
       9
       +
                         gnome3.defaultIconTheme gnome3.gsettings-desktop-schemas ];

     

       10
       10
        
       

     

       11
       11
        
         postPatch = ''

     

       12
       12
        
           chmod +x meson_post_install.py # patchShebangs requires executable file

+2 -2

pkgs/desktops/gnome-3/core/gnome-calculator/default.nix

···

       7
       7
        
       

     

       8
       8
        
         NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";

     

       9
       9
        
       

     

       10
       10
       -
         propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];

     

       10
       10
       +
         propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ pkgconfig wrapGAppsHook ];

     

       13
       13
        
       

     

       14
       14
        
         buildInputs = [ bash gtk3 glib intltool itstool

     

       15
       15
        
                         libxml2 gnome3.gtksourceview mpfr gmp

     

       16
       16
        
                         gdk_pixbuf gnome3.defaultIconTheme librsvg

     

       17
       17
       -
                         gnome3.gsettings_desktop_schemas gnome3.dconf libsoup libmpc ];

     

       17
       17
       +
                         gnome3.gsettings-desktop-schemas gnome3.dconf libsoup libmpc ];

     

       18
       18
        
       

     

       19
       19
        
         meta = with stdenv.lib; {

     

       20
       20
        
           homepage = https://wiki.gnome.org/action/show/Apps/Calculator;

+1 -1

pkgs/desktops/gnome-3/core/gnome-common/default.nix

···

       9
       9
        
           sha256 = "17abp7czfzirjm7qsn2czd03hdv9kbyhk3lkjxg2xsf5fky7z7jl";

     

       10
       10
        
         })];

     

       11
       11
        
       

     

       12
       12
       -
         propagatedBuildInputs = [ which autoconf automake ]; # autogen.sh which is using gnome_common tends to require which

     

       12
       12
       +
         propagatedBuildInputs = [ which autoconf automake ]; # autogen.sh which is using gnome-common tends to require which

     

       13
       13
        
       

     

       14
       14
        
         meta = with stdenv.lib; {

     

       15
       15
        
           maintainers = gnome3.maintainers;

+10 -10

pkgs/desktops/gnome-3/core/gnome-contacts/default.nix

···

       1
       1
       -
       { stdenv, intltool, fetchurl, evolution_data_server, db

     

       1
       1
       +
       { stdenv, intltool, fetchurl, evolution-data-server, db

     

       2
       2
        
       , pkgconfig, gtk3, glib, libsecret

     

       3
       3
       -
       , libchamplain, clutter_gtk, geocode_glib

     

       3
       3
       +
       , libchamplain, clutter-gtk, geocode-glib

     

       4
       4
        
       , bash, wrapGAppsHook, itstool, folks, libnotify, libxml2

     

       5
       5
       -
       , gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss

     

       6
       6
       -
       , libsoup, vala, dbus_glib, automake, autoconf }:

     

       5
       5
       +
       , gnome3, librsvg, gdk_pixbuf, file, telepathy-glib, nspr, nss

     

       6
       6
       +
       , libsoup, vala, dbus-glib, automake, autoconf }:

     

       7
       7
        
       

     

       8
       8
        
       stdenv.mkDerivation rec {

     

       9
       9
        
         inherit (import ./src.nix fetchurl) name src;

     

       10
       10
        
       

     

       11
       11
        
         doCheck = true;

     

       12
       12
        
       

     

       13
       13
       -
         propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard evolution_data_server ];

     

       13
       13
       +
         propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard evolution-data-server ];

     

       14
       14
        
       

     

       15
       15
        
         # force build from vala

     

       16
       16
        
         preBuild = ''

     
···

       18
       18
        
         '';

     

       19
       19
        
       

     

       20
       20
        
         nativeBuildInputs = [ vala automake autoconf pkgconfig intltool itstool wrapGAppsHook file ];

     

       21
       21
       -
         buildInputs = [ gtk3 glib evolution_data_server gnome3.gsettings_desktop_schemas libnotify

     

       22
       22
       -
                         folks gnome3.gnome_desktop telepathy_glib libsecret dbus_glib

     

       23
       23
       -
                         libxml2 libsoup gnome3.gnome_online_accounts nspr nss

     

       24
       24
       -
                         gdk_pixbuf gnome3.defaultIconTheme libchamplain clutter_gtk geocode_glib db ];

     

       21
       21
       +
         buildInputs = [ gtk3 glib evolution-data-server gnome3.gsettings-desktop-schemas libnotify

     

       22
       22
       +
                         folks gnome3.gnome-desktop telepathy-glib libsecret dbus-glib

     

       23
       23
       +
                         libxml2 libsoup gnome3.gnome-online-accounts nspr nss

     

       24
       24
       +
                         gdk_pixbuf gnome3.defaultIconTheme libchamplain clutter-gtk geocode-glib db ];

     

       25
       25
        
       

     

       26
       26
        
         preFixup = ''

     

       27
       27
        
           gappsWrapperArgs+=(

     

       28
       28
       -
             --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share"

     

       28
       28
       +
             --prefix XDG_DATA_DIRS : "${gnome3.gnome-themes-standard}/share"

     

       29
       29
        
           )

     

       30
       30
        
         '';

     

       31
       31

+11 -11

pkgs/desktops/gnome-3/core/gnome-control-center/default.nix

···

       1
       1
        
       { fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, wrapGAppsHook

     

       2
       2
       -
       , libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio

     

       2
       2
       +
       , libcanberra-gtk3, accountsservice, libpwquality, libpulseaudio

     

       3
       3
        
       , gdk_pixbuf, librsvg, libnotify, libgudev

     

       4
       4
        
       , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk

     

       5
       5
        
       , cracklib, libkrb5, networkmanagerapplet, networkmanager

     

       6
       6
       -
       , libwacom, samba, shared_mime_info, tzdata, libtool

     

       7
       7
       -
       , docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter_gtk

     

       6
       6
       +
       , libwacom, samba, shared-mime-info, tzdata, libtool

     

       7
       7
       +
       , docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter-gtk

     

       8
       8
        
       , fontconfig, sound-theme-freedesktop, grilo }:

     

       9
       9
        
       

     

       10
       10
        
       stdenv.mkDerivation rec {

     

       11
       11
        
         inherit (import ./src.nix fetchurl) name src;

     

       12
       12
        
       

     

       13
       13
       -
         propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];

     

       13
       13
       +
         propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];

     

       14
       14
        
       

     

       15
       15
        
         nativeBuildInputs = [

     

       16
       16
        
           pkgconfig intltool wrapGAppsHook libtool libxslt docbook_xsl docbook_xsl_ns

     

       17
       17
       -
           shared_mime_info

     

       17
       17
       +
           shared-mime-info

     

       18
       18
        
         ];

     

       19
       19
        
       

     

       20
       20
        
         buildInputs = with gnome3; [

     

       21
       21
       -
           ibus gtk glib glib_networking upower gsettings_desktop_schemas

     

       22
       22
       -
           libxml2 gnome_desktop gnome_settings_daemon polkit libgtop

     

       23
       23
       -
           gnome_online_accounts libsoup colord libpulseaudio fontconfig colord-gtk

     

       21
       21
       +
           ibus gtk glib glib-networking upower gsettings-desktop-schemas

     

       22
       22
       +
           libxml2 gnome-desktop gnome-settings-daemon polkit libgtop

     

       23
       23
       +
           gnome-online-accounts libsoup colord libpulseaudio fontconfig colord-gtk

     

       24
       24
        
           accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify

     

       25
       25
       -
           grilo libpwquality cracklib vino libcanberra_gtk3 libgudev

     

       26
       26
       -
           gdk_pixbuf defaultIconTheme librsvg clutter clutter_gtk

     

       25
       25
       +
           grilo libpwquality cracklib vino libcanberra-gtk3 libgudev

     

       26
       26
       +
           gdk_pixbuf defaultIconTheme librsvg clutter clutter-gtk

     

       27
       27
        
           networkmanager modemmanager gnome-bluetooth tracker

     

       28
       28
        
         ];

     

       29
       29
        
       

     
···

       39
       39
        
       

     

       40
       40
        
         preFixup = ''

     

       41
       41
        
           gappsWrapperArgs+=(

     

       42
       42
       -
             --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:${sound-theme-freedesktop}/share"

     

       42
       42
       +
             --prefix XDG_DATA_DIRS : "${gnome3.gnome-themes-standard}/share:${sound-theme-freedesktop}/share"

     

       43
       43
        
             # Thumbnailers (for setting user profile pictures)

     

       44
       44
        
             --prefix XDG_DATA_DIRS : "${gdk_pixbuf}/share"

     

       45
       45
        
             --prefix XDG_DATA_DIRS : "${librsvg}/share"

+3 -3

pkgs/desktops/gnome-3/core/gnome-desktop/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, libxslt, which, libX11, gnome3, gtk3, glib

     

       2
       2
       -
       , intltool, gnome_doc_utils, xkeyboard_config, isocodes, itstool, wayland

     

       2
       2
       +
       , intltool, gnome-doc-utils, xkeyboard_config, isocodes, itstool, wayland

     

       3
       3
        
       , libseccomp, bubblewrap, gobjectIntrospection }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     
···

       11
       11
        
         enableParallelBuilding = true;

     

       12
       12
        
       

     

       13
       13
        
         nativeBuildInputs = [

     

       14
       14
       -
           pkgconfig which itstool intltool libxslt gnome_doc_utils gobjectIntrospection

     

       14
       14
       +
           pkgconfig which itstool intltool libxslt gnome-doc-utils gobjectIntrospection

     

       15
       15
        
         ];

     

       16
       16
        
         buildInputs = [

     

       17
       17
        
           libX11 bubblewrap xkeyboard_config isocodes wayland

     

       18
       18
        
           gtk3 glib libseccomp

     

       19
       19
        
         ];

     

       20
       20
        
       

     

       21
       21
       -
         propagatedBuildInputs = [ gnome3.gsettings_desktop_schemas ];

     

       21
       21
       +
         propagatedBuildInputs = [ gnome3.gsettings-desktop-schemas ];

     

       22
       22
        
       

     

       23
       23
        
         patches = [

     

       24
       24
        
           ./bubblewrap-paths.patch

+4 -4

pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, meson, ninja, pkgconfig, desktop_file_utils, appstream-glib, libxslt

     

       1
       1
       +
       { stdenv, fetchurl, meson, ninja, pkgconfig, desktop-file-utils, appstream-glib, libxslt

     

       2
       2
        
       , libxml2, gettext, itstool, wrapGAppsHook, docbook_xsl, docbook_xml_dtd_43

     

       3
       3
        
       , gnome3, gtk, glib }:

     

       4
       4
        
       

     
···

       7
       7
        
       

     

       8
       8
        
         doCheck = true;

     

       9
       9
        
       

     

       10
       10
       -
         propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];

     

       10
       10
       +
         propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];

     

       11
       11
        
         propagatedBuildInputs = [ gnome3.defaultIconTheme ];

     

       12
       12
        
       

     

       13
       13
        
         nativeBuildInputs = [ meson ninja pkgconfig wrapGAppsHook libxml2 gettext itstool

     

       14
       14
       -
                               desktop_file_utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43];

     

       15
       15
       -
         buildInputs = [ gtk glib gnome3.gsettings_desktop_schemas ];

     

       14
       14
       +
                               desktop-file-utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43];

     

       15
       15
       +
         buildInputs = [ gtk glib gnome3.gsettings-desktop-schemas ];

     

       16
       16
        
       

     

       17
       17
        
         meta = with stdenv.lib; {

     

       18
       18
        
           homepage = https://wiki.gnome.org/Apps/Dictionary;

+4 -4

pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix

···

       1
       1
        
       { stdenv, gettext, fetchurl, pkgconfig, udisks2, libsecret, libdvdread

     

       2
       2
        
       , meson, ninja, gtk, glib, wrapGAppsHook, libnotify

     

       3
       3
        
       , itstool, gnome3, gdk_pixbuf, libxml2

     

       4
       4
       -
       , libcanberra_gtk3, libxslt, docbook_xsl, libpwquality }:

     

       4
       4
       +
       , libcanberra-gtk3, libxslt, docbook_xsl, libpwquality }:

     

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
        
         inherit (import ./src.nix fetchurl) name src;

     

       8
       8
        
       

     

       9
       9
       -
         propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];

     

       9
       9
       +
         propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];

     

       10
       10
        
       

     

       11
       11
        
         nativeBuildInputs = [ meson ninja pkgconfig gettext itstool libxslt docbook_xsl

     

       12
       12
        
                               wrapGAppsHook libxml2 ];

     

       13
       13
       -
         buildInputs = [ gtk glib libsecret libpwquality libnotify libdvdread libcanberra_gtk3

     

       13
       13
       +
         buildInputs = [ gtk glib libsecret libpwquality libnotify libdvdread libcanberra-gtk3

     

       14
       14
        
                         gdk_pixbuf udisks2 gnome3.defaultIconTheme

     

       15
       15
       -
                         gnome3.gnome_settings_daemon gnome3.gsettings_desktop_schemas ];

     

       15
       15
       +
                         gnome3.gnome-settings-daemon gnome3.gsettings-desktop-schemas ];

     

       16
       16
        
       

     

       17
       17
        
         postPatch = ''

     

       18
       18
        
           chmod +x meson_post_install.py # patchShebangs requires executable file

+1 -1

pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix

···

       8
       8
        
         doCheck = true;

     

       9
       9
        
       

     

       10
       10
        
         nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook libxml2 ];

     

       11
       11
       -
         buildInputs = [ gtk3 glib gnome3.gnome_desktop gnome3.defaultIconTheme ];

     

       11
       11
       +
         buildInputs = [ gtk3 glib gnome3.gnome-desktop gnome3.defaultIconTheme ];

     

       12
       12
        
       

     

       13
       13
        
         # Do not run meson-postinstall.sh

     

       14
       14
        
         preConfigure = "sed -i '2,$ d'  meson-postinstall.sh";

+3 -3

pkgs/desktops/gnome-3/core/gnome-keyring/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python2, glib, libxslt

     

       2
       2
       -
       , intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, wrapGAppsHook

     

       2
       2
       +
       , intltool, pango, gcr, gdk_pixbuf, atk, p11-kit, wrapGAppsHook

     

       3
       3
        
       , docbook_xsl, docbook_xml_dtd_42, gnome3 }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     
···

       8
       8
        
         outputs = [ "out" "dev" ];

     

       9
       9
        
       

     

       10
       10
        
         buildInputs = with gnome3; [

     

       11
       11
       -
           dbus libgcrypt pam gtk3 libgnome_keyring

     

       12
       12
       -
           pango gcr gdk_pixbuf atk p11_kit

     

       11
       11
       +
           dbus libgcrypt pam gtk3 libgnome-keyring

     

       12
       12
       +
           pango gcr gdk_pixbuf atk p11-kit

     

       13
       13
        
         ];

     

       14
       14
        
       

     

       15
       15
        
         # In 3.20.1, tests do not support Python 3

+6 -6

pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk, wrapGAppsHook

     

       2
       2
       -
       , webkitgtk, json_glib, rest, libsecret, dbus_glib, gnome_common, gtk_doc

     

       3
       3
       -
       , telepathy_glib, intltool, dbus_libs, icu, glib_networking

     

       2
       2
       +
       , webkitgtk, json-glib, rest, libsecret, dbus-glib, gnome-common, gtk-doc

     

       3
       3
       +
       , telepathy-glib, intltool, dbus_libs, icu, glib-networking

     

       4
       4
        
       , libsoup, docbook_xsl_ns, docbook_xsl, gnome3, gcr, kerberos

     

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     

       8
       8
        
         inherit (import ./src.nix fetchurl) name src;

     

       9
       9
        
       

     

       10
       10
       -
         NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0";

     

       10
       10
       +
         NIX_CFLAGS_COMPILE = "-I${dbus-glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0";

     

       11
       11
        
       

     

       12
       12
        
         outputs = [ "out" "man" "dev" "devdoc" ];

     

       13
       13
        
       

     
···

       22
       22
        
         enableParallelBuilding = true;

     

       23
       23
        
       

     

       24
       24
        
         nativeBuildInputs = [

     

       25
       25
       -
           pkgconfig vala gnome_common intltool wrapGAppsHook

     

       26
       26
       -
           libxslt docbook_xsl_ns docbook_xsl gtk_doc

     

       25
       25
       +
           pkgconfig vala gnome-common intltool wrapGAppsHook

     

       26
       26
       +
           libxslt docbook_xsl_ns docbook_xsl gtk-doc

     

       27
       27
        
         ];

     

       28
       28
        
         buildInputs = [

     

       29
       29
       -
           glib gtk webkitgtk json_glib rest libsecret dbus_glib telepathy_glib glib_networking icu libsoup

     

       29
       29
       +
           glib gtk webkitgtk json-glib rest libsecret dbus-glib telepathy-glib glib-networking icu libsoup

     

       30
       30
        
           gcr kerberos

     

       31
       31
        
         ];

     

       32
       32

+3 -3

pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, glib, gnome3, libxml2

     

       2
       2
       -
       , libsoup, json_glib, gmp, openssl, dleyna-server, wrapGAppsHook }:

     

       2
       2
       +
       , libsoup, json-glib, gmp, openssl, dleyna-server, wrapGAppsHook }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         inherit (import ./src.nix fetchurl) name src;

     
···

       7
       7
        
         nativeBuildInputs = [ pkgconfig wrapGAppsHook ];

     

       8
       8
        
         buildInputs = [ glib gnome3.libgdata libxml2 libsoup gmp openssl

     

       9
       9
        
                         gnome3.grilo gnome3.libzapojit gnome3.grilo-plugins

     

       10
       10
       -
                         gnome3.gnome_online_accounts gnome3.libmediaart

     

       11
       11
       -
                         gnome3.tracker gnome3.gfbgraph json_glib gnome3.rest

     

       10
       10
       +
                         gnome3.gnome-online-accounts gnome3.libmediaart

     

       11
       11
       +
                         gnome3.tracker gnome3.gfbgraph json-glib gnome3.rest

     

       12
       12
        
                         dleyna-server ];

     

       13
       13
        
       

     

       14
       14
        
         enableParallelBuilding = true;

+4 -4

pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix

···

       1
       1
       -
       { stdenv, gettext, libxml2, fetchurl, pkgconfig, libcanberra_gtk3

     

       1
       1
       +
       { stdenv, gettext, libxml2, fetchurl, pkgconfig, libcanberra-gtk3

     

       2
       2
        
       , bash, gtk3, glib, meson, ninja, wrapGAppsHook, appstream-glib

     

       3
       3
        
       , gnome3, librsvg, gdk_pixbuf }:

     

       4
       4
        
       

     
···

       12
       12
        
           patchShebangs build-aux/postinstall.py

     

       13
       13
        
         '';

     

       14
       14
        
       

     

       15
       15
       -
         propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];

     

       15
       15
       +
         propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];

     

       16
       16
        
         propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];

     

       17
       17
        
       

     

       18
       18
        
         nativeBuildInputs = [ meson ninja pkgconfig gettext appstream-glib libxml2 wrapGAppsHook ];

     

       19
       19
       -
         buildInputs = [ bash gtk3 glib libcanberra_gtk3

     

       20
       20
       -
                         gnome3.gsettings_desktop_schemas ];

     

       19
       19
       +
         buildInputs = [ bash gtk3 glib libcanberra-gtk3

     

       20
       20
       +
                         gnome3.gsettings-desktop-schemas ];

     

       21
       21
        
       

     

       22
       22
        
         patches = [

     

       23
       23
        
           ./prevent-cache-updates.patch

+6 -6

pkgs/desktops/gnome-3/core/gnome-session/default.nix

···

       1
       1
       -
       { fetchurl, stdenv, pkgconfig, gnome3, glib, dbus_glib, json_glib, upower

     

       1
       1
       +
       { fetchurl, stdenv, pkgconfig, gnome3, glib, dbus-glib, json-glib, upower

     

       2
       2
        
       , libxslt, intltool, makeWrapper, systemd, xorg, epoxy }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     
···

       7
       7
        
         configureFlags = "--enable-systemd";

     

       8
       8
        
       

     

       9
       9
        
         buildInputs = with gnome3;

     

       10
       10
       -
           [ pkgconfig glib gnome_desktop gtk dbus_glib json_glib libxslt

     

       11
       11
       -
             gnome3.gnome_settings_daemon xorg.xtrans gnome3.defaultIconTheme

     

       12
       12
       -
             gsettings_desktop_schemas upower intltool gconf makeWrapper systemd

     

       10
       10
       +
           [ pkgconfig glib gnome-desktop gtk dbus-glib json-glib libxslt

     

       11
       11
       +
             gnome3.gnome-settings-daemon xorg.xtrans gnome3.defaultIconTheme

     

       12
       12
       +
             gsettings-desktop-schemas upower intltool gconf makeWrapper systemd

     

       13
       13
        
             epoxy

     

       14
       14
        
           ];

     

       15
       15
        
       

     
···

       24
       24
        
             --prefix PATH : "${glib.dev}/bin" \

     

       25
       25
        
             --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \

     

       26
       26
        
             --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \

     

       27
       27
       -
             --suffix XDG_DATA_DIRS : "${gnome3.gnome_shell}/share" \

     

       28
       28
       -
             --suffix XDG_CONFIG_DIRS : "${gnome3.gnome_settings_daemon}/etc/xdg"

     

       27
       27
       +
             --suffix XDG_DATA_DIRS : "${gnome3.gnome-shell}/share" \

     

       28
       28
       +
             --suffix XDG_CONFIG_DIRS : "${gnome3.gnome-settings-daemon}/etc/xdg"

     

       29
       29
        
         '';

     

       30
       30
        
       

     

       31
       31
        
         meta = with stdenv.lib; {

+6 -6

pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix

···

       1
       1
        
       { fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst

     

       2
       2
       -
       , libxkbfile, libpulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit

     

       2
       2
       +
       , libxkbfile, libpulseaudio, libcanberra-gtk3, upower, colord, libgweather, polkit

     

       3
       3
        
       , geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libtool, networkmanager

     

       4
       4
        
       , docbook_xsl, docbook_xsl_ns, wrapGAppsHook, ibus, xkeyboard_config, tzdata }:

     

       5
       5
        
       

     
···

       10
       10
        
         NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";

     

       11
       11
        
       

     

       12
       12
        
         buildInputs = with gnome3;

     

       13
       13
       -
           [ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas networkmanager

     

       14
       14
       -
             libnotify gnome_desktop lcms2 libXtst libxkbfile libpulseaudio

     

       15
       15
       -
             libcanberra_gtk3 upower colord libgweather xkeyboard_config

     

       16
       16
       -
             polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom libxslt

     

       17
       17
       -
             libtool docbook_xsl docbook_xsl_ns wrapGAppsHook gnome_themes_standard ];

     

       13
       13
       +
           [ intltool pkgconfig ibus gtk glib gsettings-desktop-schemas networkmanager

     

       14
       14
       +
             libnotify gnome-desktop lcms2 libXtst libxkbfile libpulseaudio

     

       15
       15
       +
             libcanberra-gtk3 upower colord libgweather xkeyboard_config

     

       16
       16
       +
             polkit geocode-glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom libxslt

     

       17
       17
       +
             libtool docbook_xsl docbook_xsl_ns wrapGAppsHook gnome-themes-standard ];

     

       18
       18
        
       

     

       19
       19
        
         postPatch = ''

     

       20
       20
        
           substituteInPlace plugins/datetime/tz.h --replace /usr/share/zoneinfo/zone.tab ${tzdata}/share/zoneinfo/zone.tab

+9 -9

pkgs/desktops/gnome-3/core/gnome-shell/default.nix

···

       1
       1
       -
       { fetchurl, fetchpatch, stdenv, meson, ninja, pkgconfig, gnome3, json_glib, libcroco, gettext, libsecret

     

       2
       2
       -
       , python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at_spi2_core

     

       3
       3
       -
       , libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip, glibcLocales

     

       4
       4
       -
       , sqlite, libgweather, libcanberra_gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42

     

       1
       1
       +
       { fetchurl, fetchpatch, stdenv, meson, ninja, pkgconfig, gnome3, json-glib, libcroco, gettext, libsecret

     

       2
       2
       +
       , python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at-spi2-core

     

       3
       3
       +
       , libstartup_notification, telepathy-glib, telepathy-logger, libXtst, p11-kit, unzip, glibcLocales

     

       4
       4
       +
       , sqlite, libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42

     

       5
       5
        
       , libpulseaudio, libical, nss, gobjectIntrospection, gstreamer, wrapGAppsHook

     

       6
       6
        
       , accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet

     

       7
       7
        
       , gst_all_1 }:

     
···

       21
       21
        
       

     

       22
       22
        
         nativeBuildInputs = [ meson ninja gettext docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 perl wrapGAppsHook glibcLocales ];

     

       23
       23
        
         buildInputs = with gnome3;

     

       24
       24
       -
           [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice

     

       24
       24
       +
           [ gsettings-desktop-schemas gnome-keyring gnome-menus glib gcr json-glib accountsservice

     

       25
       25
        
             libcroco libsecret pkgconfig libsoup polkit gdk_pixbuf

     

       26
       26
        
             (librsvg.override { enableIntrospection = true; })

     

       27
       27
       -
             clutter networkmanager libstartup_notification telepathy_glib

     

       28
       28
       -
             libXtst p11_kit networkmanagerapplet gjs mutter libpulseaudio caribou evolution_data_server

     

       27
       27
       +
             clutter networkmanager libstartup_notification telepathy-glib

     

       28
       28
       +
             libXtst p11-kit networkmanagerapplet gjs mutter libpulseaudio caribou evolution-data-server

     

       29
       29
        
             libical nss gtk gstreamer gdm

     

       30
       30
       -
             libcanberra_gtk3 gnome_control_center geoclue2

     

       30
       30
       +
             libcanberra-gtk3 gnome-control-center geoclue2

     

       31
       31
        
             defaultIconTheme sqlite gnome3.gnome-bluetooth

     

       32
       32
        
             libgweather # not declared at build time, but typelib is needed at runtime

     

       33
       33
        
             gnome3.gnome-clocks # schemas needed

     

       34
       34
       -
             at_spi2_core upower ibus gnome_desktop telepathy_logger gnome3.gnome_settings_daemon

     

       34
       34
       +
             at-spi2-core upower ibus gnome-desktop telepathy-logger gnome3.gnome-settings-daemon

     

       35
       35
        
             gst_all_1.gst-plugins-good # recording

     

       36
       36
        
             gobjectIntrospection (stdenv.lib.getLib dconf) ];

     

       37
       37
        
         propagatedUserEnvPkgs = [

+4 -4

pkgs/desktops/gnome-3/core/gnome-software/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree

     

       2
       2
        
       , glib, appstream-glib, libsoup, polkit, attr, acl, libyaml, isocodes, gtkspell3, libxslt

     

       3
       3
       -
       , json_glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, gtk_doc, desktop_file_utils }:

     

       3
       3
       +
       , json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, gtk-doc, desktop-file-utils }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         inherit (import ./src.nix fetchurl) name src;

     

       7
       7
        
       

     

       8
       8
        
         nativeBuildInputs = [ pkgconfig meson ninja gettext wrapGAppsHook libxslt docbook_xml_dtd_42

     

       9
       9
       -
                               valgrind-light docbook_xsl gtk_doc desktop_file_utils ];

     

       9
       9
       +
                               valgrind-light docbook_xsl gtk-doc desktop-file-utils ];

     

       10
       10
        
         buildInputs = [ gnome3.gtk glib packagekit appstream-glib libsoup

     

       11
       11
       -
                         gnome3.gsettings_desktop_schemas gnome3.gnome_desktop

     

       12
       12
       -
                         gtkspell3 json_glib libsecret ostree

     

       11
       11
       +
                         gnome3.gsettings-desktop-schemas gnome3.gnome-desktop

     

       12
       12
       +
                         gtkspell3 json-glib libsecret ostree

     

       13
       13
        
                         polkit attr acl libyaml ];

     

       14
       14
        
         propagatedBuildInputs = [ isocodes ];

     

       15
       15

+3 -3

pkgs/desktops/gnome-3/core/gnome-system-log/default.nix

···

       14
       14
        
       

     

       15
       15
        
         NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";

     

       16
       16
        
       

     

       17
       17
       -
         propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];

     

       17
       17
       +
         propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];

     

       18
       18
        
         propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];

     

       19
       19
        
       

     

       20
       20
        
         nativeBuildInputs = [ pkgconfig ];

     

       21
       21
        
         buildInputs = [ bash gtk3 glib intltool itstool

     

       22
       22
       -
                         gnome3.gsettings_desktop_schemas wrapGAppsHook libxml2 ];

     

       22
       22
       +
                         gnome3.gsettings-desktop-schemas wrapGAppsHook libxml2 ];

     

       23
       23
        
       

     

       24
       24
        
         preFixup = ''

     

       25
       25
        
           gappsWrapperArgs+=(

     

       26
       26
       -
             --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share"

     

       26
       26
       +
             --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome-themes-standard}/share"

     

       27
       27
        
           )

     

       28
       28
        
         '';

     

       29
       29

+3 -3

pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix

···

       7
       7
        
       

     

       8
       8
        
         doCheck = true;

     

       9
       9
        
       

     

       10
       10
       -
         propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];

     

       10
       10
       +
         propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ pkgconfig ];

     

       13
       13
        
         buildInputs = [ bash gtk3 glib intltool itstool libxml2

     

       14
       14
        
                         gtkmm3 libgtop wrapGAppsHook

     

       15
       15
        
                         gdk_pixbuf gnome3.defaultIconTheme librsvg

     

       16
       16
       -
                         gnome3.gsettings_desktop_schemas systemd ];

     

       16
       16
       +
                         gnome3.gsettings-desktop-schemas systemd ];

     

       17
       17
        
       

     

       18
       18
        
         preFixup = ''

     

       19
       19
        
           gappsWrapperArgs+=(

     

       20
       20
       -
             --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share"

     

       20
       20
       +
             --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome-themes-standard}/share"

     

       21
       21
        
           )

     

       22
       22
        
         '';

     

       23
       23

+7 -7

pkgs/desktops/gnome-3/core/gnome-terminal/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, libxml2, gnome3

     

       2
       2
       -
       , gnome_doc_utils, intltool, which, libuuid, vala

     

       3
       3
       -
       , desktop_file_utils, itstool, wrapGAppsHook, appdata-tools }:

     

       2
       2
       +
       , gnome-doc-utils, intltool, which, libuuid, vala

     

       3
       3
       +
       , desktop-file-utils, itstool, wrapGAppsHook, appdata-tools }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         inherit (import ./src.nix fetchurl) name src;

     

       7
       7
        
       

     

       8
       8
       -
         buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte appdata-tools

     

       8
       8
       +
         buildInputs = [ gnome3.gtk gnome3.gsettings-desktop-schemas gnome3.vte appdata-tools

     

       9
       9
        
                         gnome3.dconf itstool gnome3.nautilus ];

     

       10
       10
        
       

     

       11
       11
       -
         nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2

     

       12
       12
       -
                               vala desktop_file_utils wrapGAppsHook ];

     

       11
       11
       +
         nativeBuildInputs = [ pkgconfig intltool gnome-doc-utils which libuuid libxml2

     

       12
       12
       +
                               vala desktop-file-utils wrapGAppsHook ];

     

       13
       13
        
       

     

       14
       14
        
         # Silly ./configure, it looks for dbus file from gnome-shell in the

     

       15
       15
        
         # installation tree of the package it is configuring.

     

       16
       16
        
         postPatch = ''

     

       17
       17
       -
           substituteInPlace configure --replace '$(eval echo $(eval echo $(eval echo ''${dbusinterfacedir})))/org.gnome.ShellSearchProvider2.xml' "${gnome3.gnome_shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml"

     

       18
       18
       -
           substituteInPlace src/Makefile.in --replace '$(dbusinterfacedir)/org.gnome.ShellSearchProvider2.xml' "${gnome3.gnome_shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml"

     

       17
       17
       +
           substituteInPlace configure --replace '$(eval echo $(eval echo $(eval echo ''${dbusinterfacedir})))/org.gnome.ShellSearchProvider2.xml' "${gnome3.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml"

     

       18
       18
       +
           substituteInPlace src/Makefile.in --replace '$(dbusinterfacedir)/org.gnome.ShellSearchProvider2.xml' "${gnome3.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml"

     

       19
       19
        
         '';

     

       20
       20
        
       

     

       21
       21
        
         # FIXME: enable for gnome3

+2 -2

pkgs/desktops/gnome-3/core/gnome-user-share/default.nix

···

       1
       1
        
       { stdenv, intltool, fetchurl, apacheHttpd, nautilus

     

       2
       2
        
       , pkgconfig, gtk3, glib, libxml2, gnused, systemd

     

       3
       3
        
       , bash, wrapGAppsHook, itstool, libnotify, libtool, mod_dnssd

     

       4
       4
       -
       , gnome3, librsvg, gdk_pixbuf, file, libcanberra_gtk3 }:

     

       4
       4
       +
       , gnome3, librsvg, gdk_pixbuf, file, libcanberra-gtk3 }:

     

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
        
         inherit (import ./src.nix fetchurl) name src;

     
···

       24
       24
        
         nativeBuildInputs = [ pkgconfig ];

     

       25
       25
        
         buildInputs = [ gtk3 glib intltool itstool libxml2 libtool

     

       26
       26
        
                         wrapGAppsHook file gdk_pixbuf gnome3.defaultIconTheme librsvg

     

       27
       27
       -
                         nautilus libnotify libcanberra_gtk3 systemd ];

     

       27
       27
       +
                         nautilus libnotify libcanberra-gtk3 systemd ];

     

       28
       28
        
       

     

       29
       29
        
         postInstall = ''

     

       30
       30
        
           mkdir -p $out/share/gsettings-schemas/$name

+4 -4

pkgs/desktops/gnome-3/core/grilo-plugins/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, file, intltool, glib, sqlite

     

       2
       2
       -
       , gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp_av

     

       3
       3
       -
       , gmime, json_glib, avahi, tracker, dleyna-server, itstool }:

     

       2
       2
       +
       , gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp-av

     

       3
       3
       +
       , gmime, json-glib, avahi, tracker, dleyna-server, itstool }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         major = "0.3";

     
···

       16
       16
        
       

     

       17
       17
        
         nativeBuildInputs = [ pkgconfig ];

     

       18
       18
        
         buildInputs = [ gnome3.grilo libxml2 gupnp gssdp gnome3.libgdata

     

       19
       19
       -
                         lua5 liboauth gupnp_av sqlite gnome3.gnome_online_accounts

     

       20
       20
       -
                         gnome3.totem-pl-parser gnome3.rest gmime json_glib

     

       19
       19
       +
                         lua5 liboauth gupnp-av sqlite gnome3.gnome-online-accounts

     

       20
       20
       +
                         gnome3.totem-pl-parser gnome3.rest gmime json-glib

     

       21
       21
        
                         avahi gnome3.libmediaart tracker dleyna-server intltool itstool ];

     

       22
       22
        
       

     

       23
       23
        
         meta = with stdenv.lib; {

+1 -1

pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, intltool, glib, gobjectIntrospection

     

       2
       2
        
         # just for passthru

     

       3
       3
       -
       , gnome3, gtk3, gsettings_desktop_schemas }:

     

       3
       3
       +
       , gnome3, gtk3, gsettings-desktop-schemas }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         inherit (import ./src.nix fetchurl) name src;

+2 -2

pkgs/desktops/gnome-3/core/gtksourceview/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango

     

       2
       2
       -
       , libxml2, perl, intltool, gettext, gnome3, gobjectIntrospection, dbus, xvfb_run, shared_mime_info }:

     

       2
       2
       +
       , libxml2, perl, intltool, gettext, gnome3, gobjectIntrospection, dbus, xvfb_run, shared-mime-info }:

     

       3
       3
        
       

     

       4
       4
        
       let

     

       5
       5
        
         checkInputs = [ xvfb_run dbus ];

     
···

       10
       10
        
           # Required by gtksourceview-3.0.pc

     

       11
       11
        
           gtk3

     

       12
       12
        
           # Used by gtk_source_language_manager_guess_language

     

       13
       13
       -
           shared_mime_info

     

       13
       13
       +
           shared-mime-info

     

       14
       14
        
         ];

     

       15
       15
        
       

     

       16
       16
        
         outputs = [ "out" "dev" ];

+4 -4

pkgs/desktops/gnome-3/core/gucharmap/default.nix

···

       1
       1
        
       { stdenv, intltool, fetchurl, pkgconfig, gtk3

     

       2
       2
       -
       , glib, desktop_file_utils, bash, appdata-tools

     

       2
       2
       +
       , glib, desktop-file-utils, bash, appdata-tools

     

       3
       3
        
       , wrapGAppsHook, gnome3, itstool, libxml2

     

       4
       4
        
       , callPackage, unzip, gobjectIntrospection }:

     

       5
       5
        
       

     
···

       11
       11
        
       

     

       12
       12
        
         doCheck = true;

     

       13
       13
        
       

     

       14
       14
       -
         propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];

     

       14
       14
       +
         propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];

     

       15
       15
        
       

     

       16
       16
        
         preConfigure = "patchShebangs gucharmap/gen-guch-unicode-tables.pl";

     

       17
       17
        
       

     

       18
       18
        
         nativeBuildInputs = [

     

       19
       19
        
           pkgconfig wrapGAppsHook unzip intltool itstool appdata-tools

     

       20
       20
       -
           gnome3.yelp_tools libxml2 desktop_file_utils gobjectIntrospection

     

       20
       20
       +
           gnome3.yelp-tools libxml2 desktop-file-utils gobjectIntrospection

     

       21
       21
        
         ];

     

       22
       22
        
       

     

       23
       23
       -
         buildInputs = [ gtk3 glib gnome3.gsettings_desktop_schemas ];

     

       23
       23
       +
         buildInputs = [ gtk3 glib gnome3.gsettings-desktop-schemas ];

     

       24
       24
        
       

     

       25
       25
        
         unicode-data = callPackage ./unicode-data.nix {};

     

       26
       26

+4 -4

pkgs/desktops/gnome-3/core/libgdata/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, intltool, libxml2, glib, json_glib

     

       2
       2
       -
       , gobjectIntrospection, liboauth, gnome3, p11_kit, openssl, uhttpmock }:

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, intltool, libxml2, glib, json-glib

     

       2
       2
       +
       , gobjectIntrospection, liboauth, gnome3, p11-kit, openssl, uhttpmock }:

     

       3
       3
        
       

     

       4
       4
        
       let

     

       5
       5
        
         majorVersion = "0.17";

     
···

       16
       16
        
       

     

       17
       17
        
         buildInputs = with gnome3;

     

       18
       18
        
           [ pkgconfig libsoup intltool libxml2 glib gobjectIntrospection

     

       19
       19
       -
             liboauth gcr gnome_online_accounts p11_kit openssl uhttpmock ];

     

       19
       19
       +
             liboauth gcr gnome-online-accounts p11-kit openssl uhttpmock ];

     

       20
       20
        
       

     

       21
       21
       -
         propagatedBuildInputs = [ json_glib ];

     

       21
       21
       +
         propagatedBuildInputs = [ json-glib ];

     

       22
       22
        
       

     

       23
       23
        
         meta = with stdenv.lib; {

     

       24
       24
        
           description = "GData API library";

+1 -1

pkgs/desktops/gnome-3/core/libgweather/default.nix

···

       5
       5
        
         inherit (import ./src.nix fetchurl) name src;

     

       6
       6
        
       

     

       7
       7
        
         configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" "--enable-vala" ];

     

       8
       8
       -
         propagatedBuildInputs = [ libxml2 gtk libsoup gconf pango gdk_pixbuf atk gnome3.geocode_glib ];

     

       8
       8
       +
         propagatedBuildInputs = [ libxml2 gtk libsoup gconf pango gdk_pixbuf atk gnome3.geocode-glib ];

     

       9
       9
        
         nativeBuildInputs = [ pkgconfig intltool gnome3.vala ];

     

       10
       10
        
       

     

       11
       11
        
         # Prevent building vapi into ${vala} derivation directory

+2 -2

pkgs/desktops/gnome-3/core/libzapojit/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, glib, intltool, json_glib, rest, libsoup, gtk, gnome_online_accounts }:

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, glib, intltool, json-glib, rest, libsoup, gtk, gnome-online-accounts }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "libzapojit-0.0.3";

     
···

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         nativeBuildInputs = [ pkgconfig ];

     

       12
       12
       -
         buildInputs = [ glib intltool json_glib rest libsoup gtk gnome_online_accounts ];

     

       12
       12
       +
         buildInputs = [ glib intltool json-glib rest libsoup gtk gnome-online-accounts ];

     

       13
       13
        
       

     

       14
       14
        
         meta = with stdenv.lib; {

     

       15
       15
        
           description = "GObject wrapper for the SkyDrive and Hotmail REST APIs";

+5 -5

pkgs/desktops/gnome-3/core/mutter/default.nix

···

       1
       1
        
       { fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo

     

       2
       2
       -
       , pango, cogl, clutter, libstartup_notification, zenity, libcanberra_gtk3

     

       2
       2
       +
       , pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3

     

       3
       3
        
       , libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput

     

       4
       4
        
       , pipewire, libgudev, libwacom, xwayland, autoreconfHook }:

     

       5
       5
        
       

     
···

       36
       36
        
         nativeBuildInputs = [ autoreconfHook pkgconfig intltool libtool makeWrapper ];

     

       37
       37
        
       

     

       38
       38
        
         buildInputs = with gnome3; [

     

       39
       39
       -
           glib gobjectIntrospection gtk gsettings_desktop_schemas upower

     

       40
       40
       -
           gnome_desktop cairo pango cogl clutter zenity libstartup_notification

     

       41
       41
       -
           gnome3.geocode_glib libinput libgudev libwacom

     

       42
       42
       -
           libcanberra_gtk3 zenity xkeyboard_config libxkbfile

     

       39
       39
       +
           glib gobjectIntrospection gtk gsettings-desktop-schemas upower

     

       40
       40
       +
           gnome-desktop cairo pango cogl clutter zenity libstartup_notification

     

       41
       41
       +
           gnome3.geocode-glib libinput libgudev libwacom

     

       42
       42
       +
           libcanberra-gtk3 zenity xkeyboard_config libxkbfile

     

       43
       43
        
           libxkbcommon pipewire

     

       44
       44
        
         ];

     

       45
       45

+7 -7

pkgs/desktops/gnome-3/core/nautilus/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2, desktop_file_utils, wrapGAppsHook

     

       2
       2
       -
       , gtk, gnome3, gnome-autoar, glib, dbus_glib, shared_mime_info, libnotify, libexif

     

       1
       1
       +
       { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2, desktop-file-utils, wrapGAppsHook

     

       2
       2
       +
       , gtk, gnome3, gnome-autoar, glib, dbus-glib, shared-mime-info, libnotify, libexif

     

       3
       3
        
       , exempi, librsvg, tracker, tracker-miners, libselinux, gdk_pixbuf }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         inherit (import ./src.nix fetchurl) name src;

     

       7
       7
        
       

     

       8
       8
       -
         nativeBuildInputs = [ meson ninja pkgconfig libxml2 gettext wrapGAppsHook desktop_file_utils ];

     

       8
       8
       +
         nativeBuildInputs = [ meson ninja pkgconfig libxml2 gettext wrapGAppsHook desktop-file-utils ];

     

       9
       9
        
       

     

       10
       10
       -
         buildInputs = [ dbus_glib shared_mime_info libexif gtk exempi libnotify libselinux

     

       11
       11
       -
                         tracker tracker-miners gnome3.gnome_desktop gnome3.adwaita-icon-theme

     

       12
       12
       -
                         gnome3.gsettings_desktop_schemas ];

     

       10
       10
       +
         buildInputs = [ dbus-glib shared-mime-info libexif gtk exempi libnotify libselinux

     

       11
       11
       +
                         tracker tracker-miners gnome3.gnome-desktop gnome3.adwaita-icon-theme

     

       12
       12
       +
                         gnome3.gsettings-desktop-schemas ];

     

       13
       13
        
       

     

       14
       14
        
         propagatedBuildInputs = [ gnome-autoar ];

     

       15
       15
        
       

     
···

       21
       21
        
             # Thumbnailers

     

       22
       22
        
             --prefix XDG_DATA_DIRS : "${gdk_pixbuf}/share"

     

       23
       23
        
             --prefix XDG_DATA_DIRS : "${librsvg}/share"

     

       24
       24
       -
             --prefix XDG_DATA_DIRS : "${shared_mime_info}/share"

     

       24
       24
       +
             --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"

     

       25
       25
        
           )

     

       26
       26
        
         '';

     

       27
       27

+2 -2

pkgs/desktops/gnome-3/core/sushi/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, file, intltool, gobjectIntrospection, glib

     

       2
       2
       -
       , clutter_gtk, clutter-gst, gnome3, gtksourceview, libmusicbrainz

     

       2
       2
       +
       , clutter-gtk, clutter-gst, gnome3, gtksourceview, libmusicbrainz

     

       3
       3
        
       , webkitgtk, libmusicbrainz5, icu, makeWrapper, gst_all_1

     

       4
       4
        
       , gdk_pixbuf, librsvg, gtk3, harfbuzz }:

     

       5
       5
        
       

     
···

       10
       10
        
       

     

       11
       11
        
         nativeBuildInputs = [ pkgconfig ];

     

       12
       12
        
         buildInputs = [ file intltool gobjectIntrospection glib gtk3

     

       13
       13
       -
                         clutter_gtk clutter-gst gnome3.gjs gtksourceview gdk_pixbuf

     

       13
       13
       +
                         clutter-gtk clutter-gst gnome3.gjs gtksourceview gdk_pixbuf

     

       14
       14
        
                         librsvg gnome3.defaultIconTheme libmusicbrainz5 webkitgtk

     

       15
       15
        
                         gnome3.evince icu makeWrapper harfbuzz ];

     

       16
       16

+7 -7

pkgs/desktops/gnome-3/core/totem/default.nix

···

       1
       1
        
       { stdenv, fetchurl, meson, ninja, intltool, gst_all_1, clutter

     

       2
       2
       -
       , clutter_gtk, clutter-gst, python3Packages, shared_mime_info

     

       2
       2
       +
       , clutter-gtk, clutter-gst, python3Packages, shared-mime-info

     

       3
       3
        
       , pkgconfig, gtk3, glib, gobjectIntrospection

     

       4
       4
       -
       , bash, wrapGAppsHook, itstool, libxml2, dbus_glib, vala, gnome3, librsvg

     

       4
       4
       +
       , bash, wrapGAppsHook, itstool, libxml2, dbus-glib, vala, gnome3, librsvg

     

       5
       5
        
       , gdk_pixbuf, file, tracker, nautilus }:

     

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     
···

       16
       16
        
       

     

       17
       17
        
         NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";

     

       18
       18
        
       

     

       19
       19
       -
         propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];

     

       19
       19
       +
         propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];

     

       20
       20
        
       

     

       21
       21
        
         nativeBuildInputs = [ meson ninja vala pkgconfig intltool python3Packages.python itstool file wrapGAppsHook ];

     

       22
       22
       -
         buildInputs = [ gtk3 glib gnome3.grilo clutter_gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins

     

       22
       22
       +
         buildInputs = [ gtk3 glib gnome3.grilo clutter-gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins

     

       23
       23
        
                         gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad

     

       24
       24
       -
                         gst_all_1.gst-plugins-ugly gst_all_1.gst-libav gnome3.libpeas shared_mime_info dbus_glib

     

       25
       25
       -
                         gdk_pixbuf libxml2 gnome3.defaultIconTheme gnome3.gnome_desktop

     

       26
       26
       -
                         gnome3.gsettings_desktop_schemas tracker nautilus ];

     

       24
       24
       +
                         gst_all_1.gst-plugins-ugly gst_all_1.gst-libav gnome3.libpeas shared-mime-info dbus-glib

     

       25
       25
       +
                         gdk_pixbuf libxml2 gnome3.defaultIconTheme gnome3.gnome-desktop

     

       26
       26
       +
                         gnome3.gsettings-desktop-schemas tracker nautilus ];

     

       27
       27
        
       

     

       28
       28
        
         propagatedBuildInputs = [ gobjectIntrospection python3Packages.pylint python3Packages.pygobject2 ];

     

       29
       29

+4 -4

pkgs/desktops/gnome-3/core/tracker-miners/default.nix

···

       2
       2
        
       , pkgconfig, gtk3, glib

     

       3
       3
        
       , bash, wrapGAppsHook, itstool, vala, sqlite, libxslt

     

       4
       4
        
       , gnome3, librsvg, gdk_pixbuf, libnotify

     

       5
       5
       -
       , evolution_data_server, gst_all_1, poppler

     

       5
       5
       +
       , evolution-data-server, gst_all_1, poppler

     

       6
       6
        
       , icu, taglib, libjpeg, libtiff, giflib, libcue

     

       7
       7
        
       , libvorbis, flac, exempi, networkmanager

     

       8
       8
        
       , libpng, libexif, libgsf, libuuid, bzip2

     

       9
       9
       -
       , libsoup, json_glib, libseccomp

     

       9
       9
       +
       , libsoup, json-glib, libseccomp

     

       10
       10
        
       , libiptcdata }:

     

       11
       11
        
       

     

       12
       12
        
       stdenv.mkDerivation rec {

     
···

       19
       19
        
         nativeBuildInputs = [ vala pkgconfig intltool itstool libxslt wrapGAppsHook ];

     

       20
       20
        
         # TODO: add libgrss, libenca

     

       21
       21
        
         buildInputs = [

     

       22
       22
       -
           bzip2 evolution_data_server exempi flac giflib glib gnome3.totem-pl-parser

     

       22
       22
       +
           bzip2 evolution-data-server exempi flac giflib glib gnome3.totem-pl-parser

     

       23
       23
        
           gnome3.tracker gst_all_1.gst-plugins-base gst_all_1.gstreamer icu

     

       24
       24
       -
           json_glib libcue libexif libgsf libiptcdata libjpeg libpng libseccomp libsoup

     

       24
       24
       +
           json-glib libcue libexif libgsf libiptcdata libjpeg libpng libseccomp libsoup

     

       25
       25
        
           libtiff libuuid libvorbis libxml2 poppler taglib upower

     

       26
       26
        
         ];

     

       27
       27

+3 -3

pkgs/desktops/gnome-3/core/tracker/default.nix

···

       1
       1
        
       { stdenv, fetchurl, intltool, pkgconfig

     

       2
       2
        
       , libxml2, upower, glib, wrapGAppsHook, vala, sqlite, libxslt

     

       3
       3
       -
       , gnome3, icu, libuuid, networkmanager, libsoup, json_glib }:

     

       3
       3
       +
       , gnome3, icu, libuuid, networkmanager, libsoup, json-glib }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         inherit (import ./src.nix fetchurl) name src;

     
···

       10
       10
        
         nativeBuildInputs = [ vala pkgconfig intltool libxslt wrapGAppsHook ];

     

       11
       11
        
         # TODO: add libstemmer

     

       12
       12
        
         buildInputs = [

     

       13
       13
       -
           glib libxml2 sqlite upower icu networkmanager libsoup libuuid json_glib

     

       13
       13
       +
           glib libxml2 sqlite upower icu networkmanager libsoup libuuid json-glib

     

       14
       14
        
         ];

     

       15
       15
        
       

     

       16
       16
       -
         # TODO: figure out wrapping unit tests, some of them fail on missing gsettings_desktop_schemas

     

       16
       16
       +
         # TODO: figure out wrapping unit tests, some of them fail on missing gsettings-desktop-schemas

     

       17
       17
        
         configureFlags = [ "--disable-unit-tests" ];

     

       18
       18
        
       

     

       19
       19
        
         postPatch = ''

+4 -4

pkgs/desktops/gnome-3/core/vino/default.nix

···

       1
       1
        
       { stdenv, fetchurl, lib, wrapGAppsHook

     

       2
       2
        
       , pkgconfig, gnome3, gtk3, glib, intltool, libXtst, libnotify, libsoup

     

       3
       3
       -
       , telepathySupport ? false, dbus_glib ? null, telepathy_glib ? null

     

       3
       3
       +
       , telepathySupport ? false, dbus-glib ? null, telepathy-glib ? null

     

       4
       4
        
       , libsecret ? null, gnutls ? null, libgcrypt ? null, avahi ? null

     

       5
       5
        
       , zlib ? null, libjpeg ? null

     

       6
       6
        
       , libXdamage ? null, libXfixes ? null, libXext ? null

     

       7
       7
       -
       , gnomeKeyringSupport ? false, libgnome_keyring3 ? null

     

       7
       7
       +
       , gnomeKeyringSupport ? false, libgnome-keyring3 ? null

     

       8
       8
        
       , networkmanager ? null }:

     

       9
       9
        
       

     

       10
       10
        
       with lib;

     
···

       17
       17
        
         buildInputs = [

     

       18
       18
        
           wrapGAppsHook

     

       19
       19
        
           pkgconfig gnome3.defaultIconTheme gtk3 glib intltool libXtst libnotify libsoup

     

       20
       20
       -
         ] ++ optionals telepathySupport [ dbus_glib telepathy_glib ]

     

       21
       21
       -
           ++ optional gnomeKeyringSupport libgnome_keyring3

     

       20
       20
       +
         ] ++ optionals telepathySupport [ dbus-glib telepathy-glib ]

     

       21
       21
       +
           ++ optional gnomeKeyringSupport libgnome-keyring3

     

       22
       22
        
           ++ filter (p: p != null) [

     

       23
       23
        
             libsecret gnutls libgcrypt avahi zlib libjpeg

     

       24
       24
        
             libXdamage libXfixes libXext networkmanager

+1 -1

pkgs/desktops/gnome-3/core/vte/default.nix

···

       1
       1
        
       { stdenv, fetchurl, intltool, pkgconfig

     

       2
       2
        
       , gnome3, ncurses, gobjectIntrospection, vala, libxml2, gnutls

     

       3
       3
       -
       , fetchFromGitHub, autoconf, automake, libtool, gtk_doc, gperf, pcre2

     

       3
       3
       +
       , fetchFromGitHub, autoconf, automake, libtool, gtk-doc, gperf, pcre2

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

+2 -2

pkgs/desktops/gnome-3/core/vte/ng.nix

···

       1
       1
       -
       { gnome3, fetchFromGitHub, autoconf, automake, gtk_doc, gettext, libtool, gperf }:

     

       1
       1
       +
       { gnome3, fetchFromGitHub, autoconf, automake, gtk-doc, gettext, libtool, gperf }:

     

       2
       2
        
       

     

       3
       3
        
       gnome3.vte.overrideAttrs (oldAttrs: rec {

     

       4
       4
        
         name = "vte-ng-${version}";

     
···

       14
       14
        
         preConfigure = oldAttrs.preConfigure + "; NOCONFIGURE=1 ./autogen.sh";

     

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = oldAttrs.nativeBuildInputs or []

     

       17
       17
       -
           ++ [ gtk_doc autoconf automake gettext libtool gperf ];

     

       17
       17
       +
           ++ [ gtk-doc autoconf automake gettext libtool gperf ];

     

       18
       18
        
       })

+1 -1

pkgs/desktops/gnome-3/core/yelp-tools/default.nix

···

       4
       4
        
         inherit (import ./src.nix fetchurl) name src;

     

       5
       5
        
       

     

       6
       6
        
         nativeBuildInputs = [ pkgconfig ];

     

       7
       7
       -
         buildInputs = [ libxml2 libxslt itstool gnome3.yelp_xsl ];

     

       7
       7
       +
         buildInputs = [ libxml2 libxslt itstool gnome3.yelp-xsl ];

     

       8
       8
        
       

     

       9
       9
        
         doCheck = true;

     

       10
       10

+3 -3

pkgs/desktops/gnome-3/core/yelp/default.nix

···

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
        
         inherit (import ./src.nix fetchurl) name src;

     

       8
       8
        
       

     

       9
       9
       -
         propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];

     

       9
       9
       +
         propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];

     

       10
       10
        
       

     

       11
       11
        
         preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";

     

       12
       12
        
       

     

       13
       13
        
         nativeBuildInputs = [ pkgconfig ];

     

       14
       14
        
         buildInputs = [ gtk3 glib webkitgtk intltool itstool sqlite

     

       15
       15
       -
                         libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl

     

       15
       15
       +
                         libxml2 libxslt icu file makeWrapper gnome3.yelp-xsl

     

       16
       16
        
                         librsvg gdk_pixbuf gnome3.defaultIconTheme groff

     

       17
       17
       -
                         gnome3.gsettings_desktop_schemas wrapGAppsHook

     

       17
       17
       +
                         gnome3.gsettings-desktop-schemas wrapGAppsHook

     

       18
       18
        
                         gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ];

     

       19
       19
        
       

     

       20
       20
        
         meta = with stdenv.lib; {

+2 -2

pkgs/desktops/gnome-3/core/zenity/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango

     

       2
       2
       -
       , gnome_doc_utils, intltool, libX11, which, itstool, wrapGAppsHook }:

     

       2
       2
       +
       , gnome-doc-utils, intltool, libX11, which, itstool, wrapGAppsHook }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         inherit (import ./src.nix fetchurl) name src;

     
···

       10
       10
        
       

     

       11
       11
        
         buildInputs = [ gnome3.gtk libxml2 libxslt libX11 itstool ];

     

       12
       12
        
       

     

       13
       13
       -
         nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which wrapGAppsHook ];

     

       13
       13
       +
         nativeBuildInputs = [ pkgconfig intltool gnome-doc-utils which wrapGAppsHook ];

     

       14
       14
        
       

     

       15
       15
        
         meta = with stdenv.lib; {

     

       16
       16
        
           platforms = platforms.linux;

+63 -35

pkgs/desktops/gnome-3/default.nix

···

       17
       17
        
         maintainers = with pkgs.lib.maintainers; [ lethalman jtojnar ];

     

       18
       18
        
       

     

       19
       19
        
         corePackages = with gnome3; [

     

       20
       20
       -
           pkgs.desktop_file_utils pkgs.ibus

     

       21
       21
       -
           pkgs.shared_mime_info # for update-mime-database

     

       20
       20
       +
           pkgs.desktop-file-utils pkgs.ibus

     

       21
       21
       +
           pkgs.shared-mime-info # for update-mime-database

     

       22
       22
        
           glib # for gsettings

     

       23
       23
        
           gtk3.out # for gtk-update-icon-cache

     

       24
       24
       -
           glib_networking gvfs dconf gnome-backgrounds gnome_control_center

     

       25
       25
       -
           gnome-menus gnome_settings_daemon gnome_shell

     

       26
       26
       -
           gnome_themes_standard defaultIconTheme gnome-shell-extensions

     

       27
       27
       -
           pkgs.hicolor_icon_theme

     

       24
       24
       +
           glib-networking gvfs dconf gnome-backgrounds gnome-control-center

     

       25
       25
       +
           gnome-menus gnome-settings-daemon gnome-shell

     

       26
       26
       +
           gnome-themes-standard defaultIconTheme gnome-shell-extensions

     

       27
       27
       +
           pkgs.hicolor-icon-theme

     

       28
       28
        
         ];

     

       29
       29
        
       

     

       30
       30
        
         optionalPackages = with gnome3; [ baobab eog epiphany evince

     

       31
       31
        
           gucharmap nautilus totem vino yelp gnome-bluetooth

     

       32
       32
        
           gnome-calculator gnome-contacts gnome-font-viewer gnome-screenshot

     

       33
       33
        
           gnome-system-log gnome-system-monitor simple-scan

     

       34
       34
       -
           gnome_terminal gnome-user-docs evolution file-roller gedit

     

       34
       34
       +
           gnome-terminal gnome-user-docs evolution file-roller gedit

     

       35
       35
        
           gnome-clocks gnome-music gnome-tweak-tool gnome-photos

     

       36
       36
        
           nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs

     

       37
       37
        
           gnome-maps gnome-characters gnome-calendar accerciser gnome-nettool

     
···

       46
       46
        
           hitori gnome-taquin

     

       47
       47
        
         ];

     

       48
       48
        
       

     

       49
       49
       -
         inherit (pkgs) glib gtk2 webkitgtk gtk3 gtkmm3 libcanberra_gtk2

     

       50
       50
       -
           clutter clutter-gst clutter_gtk cogl gtkvnc;

     

       49
       49
       +
         inherit (pkgs) glib gtk2 webkitgtk gtk3 gtkmm3 libcanberra-gtk2

     

       50
       50
       +
           clutter clutter-gst clutter-gtk cogl gtkvnc;

     

       51
       51
        
         inherit (pkgs.gnome2) ORBit2;

     

       52
       52
        
         libsoup = pkgs.libsoup.override { gnomeSupport = true; };

     

       53
       53
        
         libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };

     
···

       81
       81
        
       

     

       82
       82
        
         evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests

     

       83
       83
        
       

     

       84
       84
       -
         evolution_data_server = callPackage ./core/evolution-data-server { };

     

       84
       84
       +
         evolution-data-server = callPackage ./core/evolution-data-server { };

     

       85
       85
        
       

     

       86
       86
        
         gconf = callPackage ./core/gconf { };

     

       87
       87
        
       

     

       88
       88
       -
         geocode_glib = callPackage ./core/geocode-glib { };

     

       88
       88
       +
         geocode-glib = callPackage ./core/geocode-glib { };

     

       89
       89
        
       

     

       90
       90
        
         gcr = callPackage ./core/gcr { }; # ToDo: tests fail

     

       91
       91
        
       

     
···

       93
       93
        
       

     

       94
       94
        
         gjs = callPackage ./core/gjs { };

     

       95
       95
        
       

     

       96
       96
       -
         glib_networking = pkgs.glib_networking.override {

     

       97
       97
       -
           inherit gsettings_desktop_schemas;

     

       96
       96
       +
         glib-networking = pkgs.glib-networking.override {

     

       97
       97
       +
           inherit gsettings-desktop-schemas;

     

       98
       98
        
         };

     

       99
       99
        
       

     

       100
       100
        
         gnome-backgrounds = callPackage ./core/gnome-backgrounds { };

     
···

       103
       103
        
       

     

       104
       104
        
         gnome-contacts = callPackage ./core/gnome-contacts { };

     

       105
       105
        
       

     

       106
       106
       -
         gnome_control_center = callPackage ./core/gnome-control-center { };

     

       106
       106
       +
         gnome-control-center = callPackage ./core/gnome-control-center { };

     

       107
       107
        
       

     

       108
       108
        
         gnome-calculator = callPackage ./core/gnome-calculator { };

     

       109
       109
        
       

     

       110
       110
       -
         gnome_common = callPackage ./core/gnome-common { };

     

       110
       110
       +
         gnome-common = callPackage ./core/gnome-common { };

     

       111
       111
        
       

     

       112
       112
       -
         gnome_desktop = callPackage ./core/gnome-desktop { };

     

       112
       112
       +
         gnome-desktop = callPackage ./core/gnome-desktop { };

     

       113
       113
        
       

     

       114
       114
        
         gnome-dictionary = callPackage ./core/gnome-dictionary { };

     

       115
       115
        
       

     
···

       119
       119
        
       

     

       120
       120
        
         gnome-menus = callPackage ./core/gnome-menus { };

     

       121
       121
        
       

     

       122
       122
       -
         gnome_keyring = callPackage ./core/gnome-keyring { };

     

       122
       122
       +
         gnome-keyring = callPackage ./core/gnome-keyring { };

     

       123
       123
        
       

     

       124
       124
       -
         libgnome_keyring = callPackage ./core/libgnome-keyring { };

     

       124
       124
       +
         libgnome-keyring = callPackage ./core/libgnome-keyring { };

     

       125
       125
        
       

     

       126
       126
        
         libgnomekbd = callPackage ./core/libgnomekbd { };

     

       127
       127
        
       

     

       128
       128
        
         folks = callPackage ./core/folks { };

     

       129
       129
        
       

     

       130
       130
       -
         gnome_online_accounts = callPackage ./core/gnome-online-accounts { };

     

       130
       130
       +
         gnome-online-accounts = callPackage ./core/gnome-online-accounts { };

     

       131
       131
        
       

     

       132
       132
        
         gnome-online-miners = callPackage ./core/gnome-online-miners { };

     

       133
       133
        
       

     

       134
       134
       -
         gnome_session = callPackage ./core/gnome-session { };

     

       134
       134
       +
         gnome-session = callPackage ./core/gnome-session { };

     

       135
       135
        
       

     

       136
       136
       -
         gnome_shell = callPackage ./core/gnome-shell { };

     

       136
       136
       +
         gnome-shell = callPackage ./core/gnome-shell { };

     

       137
       137
        
       

     

       138
       138
        
         gnome-shell-extensions = callPackage ./core/gnome-shell-extensions { };

     

       139
       139
        
       

     

       140
       140
        
         gnome-screenshot = callPackage ./core/gnome-screenshot { };

     

       141
       141
        
       

     

       142
       142
       -
         gnome_settings_daemon = callPackage ./core/gnome-settings-daemon { };

     

       142
       142
       +
         gnome-settings-daemon = callPackage ./core/gnome-settings-daemon { };

     

       143
       143
        
       

     

       144
       144
        
         gnome-software = callPackage ./core/gnome-software { };

     

       145
       145
        
       

     
···

       147
       147
        
       

     

       148
       148
        
         gnome-system-monitor = callPackage ./core/gnome-system-monitor { };

     

       149
       149
        
       

     

       150
       150
       -
         gnome_terminal = callPackage ./core/gnome-terminal { };

     

       150
       150
       +
         gnome-terminal = callPackage ./core/gnome-terminal { };

     

       151
       151
        
       

     

       152
       152
       -
         gnome_themes_standard = callPackage ./core/gnome-themes-standard { };

     

       152
       152
       +
         gnome-themes-standard = callPackage ./core/gnome-themes-standard { };

     

       153
       153
        
       

     

       154
       154
        
         gnome-user-docs = callPackage ./core/gnome-user-docs { };

     

       155
       155
        
       

     
···

       159
       159
        
       

     

       160
       160
        
         grilo-plugins = callPackage ./core/grilo-plugins { };

     

       161
       161
        
       

     

       162
       162
       -
         gsettings_desktop_schemas = callPackage ./core/gsettings-desktop-schemas { };

     

       162
       162
       +
         gsettings-desktop-schemas = callPackage ./core/gsettings-desktop-schemas { };

     

       163
       163
        
       

     

       164
       164
        
         gsound = callPackage ./core/gsound { };

     

       165
       165
        
       

     
···

       193
       193
        
       

     

       194
       194
        
         nautilus = callPackage ./core/nautilus { };

     

       195
       195
        
       

     

       196
       196
       -
         networkmanager_openvpn = pkgs.networkmanager_openvpn.override {

     

       196
       196
       +
         networkmanager-openvpn = pkgs.networkmanager-openvpn.override {

     

       197
       197
        
           inherit gnome3;

     

       198
       198
        
         };

     

       199
       199
        
       

     

       200
       200
       -
         networkmanager_pptp = pkgs.networkmanager_pptp.override {

     

       200
       200
       +
         networkmanager-pptp = pkgs.networkmanager-pptp.override {

     

       201
       201
        
           inherit gnome3;

     

       202
       202
        
         };

     

       203
       203
        
       

     

       204
       204
       -
         networkmanager_vpnc = pkgs.networkmanager_vpnc.override {

     

       204
       204
       +
         networkmanager-vpnc = pkgs.networkmanager-vpnc.override {

     

       205
       205
        
           inherit gnome3;

     

       206
       206
        
         };

     

       207
       207
        
       

     

       208
       208
       -
         networkmanager_openconnect = pkgs.networkmanager_openconnect.override {

     

       208
       208
       +
         networkmanager-openconnect = pkgs.networkmanager-openconnect.override {

     

       209
       209
        
           inherit gnome3;

     

       210
       210
        
         };

     

       211
       211
        
       

     

       212
       212
       -
         networkmanager_fortisslvpn = pkgs.networkmanager_fortisslvpn.override {

     

       212
       212
       +
         networkmanager-fortisslvpn = pkgs.networkmanager-fortisslvpn.override {

     

       213
       213
        
           inherit gnome3;

     

       214
       214
        
         };

     

       215
       215
        
       

     

       216
       216
       -
         networkmanager_l2tp = pkgs.networkmanager_l2tp.override {

     

       216
       216
       +
         networkmanager-l2tp = pkgs.networkmanager-l2tp.override {

     

       217
       217
        
           inherit gnome3;

     

       218
       218
        
         };

     

       219
       219
        
       

     

       220
       220
       -
         networkmanager_iodine = pkgs.networkmanager_iodine.override {

     

       220
       220
       +
         networkmanager-iodine = pkgs.networkmanager-iodine.override {

     

       221
       221
        
           inherit gnome3;

     

       222
       222
        
         };

     

       223
       223
        
       

     

       224
       224
        
         networkmanagerapplet = pkgs.networkmanagerapplet.override {

     

       225
       225
       -
           inherit gnome3 gsettings_desktop_schemas glib_networking;

     

       225
       225
       +
           inherit gnome3 gsettings-desktop-schemas glib-networking;

     

       226
       226
        
         };

     

       227
       227
        
       

     

       228
       228
        
         rest = callPackage ./core/rest { };

     
···

       249
       249
        
       

     

       250
       250
        
         yelp = callPackage ./core/yelp { };

     

       251
       251
        
       

     

       252
       252
       -
         yelp_xsl = callPackage ./core/yelp-xsl { };

     

       252
       252
       +
         yelp-xsl = callPackage ./core/yelp-xsl { };

     

       253
       253
        
       

     

       254
       254
       -
         yelp_tools = callPackage ./core/yelp-tools { };

     

       254
       254
       +
         yelp-tools = callPackage ./core/yelp-tools { };

     

       255
       255
        
       

     

       256
       256
        
         zenity = callPackage ./core/zenity { };

     

       257
       257
        
       

     
···

       400
       400
        
         gnome-video-effects = callPackage ./misc/gnome-video-effects { };

     

       401
       401
        
       

     

       402
       402
        
         gnome-packagekit = callPackage ./misc/gnome-packagekit { };

     

       403
       403
       +
       

     

       404
       404
       +
       #### Legacy aliases

     

       405
       405
       +
       

     

       406
       406
       +
         evolution_data_server = evolution-data-server; # added 2018-02-25

     

       407
       407
       +
         geocode_glib = geocode-glib; # added 2018-02-25

     

       408
       408
       +
         glib_networking = glib-networking; # added 2018-02-25

     

       409
       409
       +
         gnome_common = gnome-common; # added 2018-02-25

     

       410
       410
       +
         gnome_control_center = gnome-control-center; # added 2018-02-25

     

       411
       411
       +
         gnome_desktop = gnome-desktop; # added 2018-02-25

     

       412
       412
       +
         gnome_keyring = gnome-keyring; # added 2018-02-25

     

       413
       413
       +
         gnome_online_accounts = gnome-online-accounts; # added 2018-02-25

     

       414
       414
       +
         gnome_session = gnome-session; # added 2018-02-25

     

       415
       415
       +
         gnome_settings_daemon = gnome-settings-daemon; # added 2018-02-25

     

       416
       416
       +
         gnome_shell = gnome-shell; # added 2018-02-25

     

       417
       417
       +
         gnome_terminal = gnome-terminal; # added 2018-02-25

     

       418
       418
       +
         gnome_themes_standard = gnome-themes-standard; # added 2018-02-25

     

       419
       419
       +
         gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25

     

       420
       420
       +
         libcanberra_gtk2 = libcanberra-gtk2; # added 2018-02-25

     

       421
       421
       +
         libgnome_keyring = libgnome-keyring; # added 2018-02-25

     

       422
       422
       +
         networkmanager_fortisslvpn = networkmanager-fortisslvpn; # added 2018-02-25

     

       423
       423
       +
         networkmanager_iodine = networkmanager-iodine; # added 2018-02-25

     

       424
       424
       +
         networkmanager_l2tp = networkmanager-l2tp; # added 2018-02-25

     

       425
       425
       +
         networkmanager_openconnect = networkmanager-openconnect; # added 2018-02-25

     

       426
       426
       +
         networkmanager_openvpn = networkmanager-openvpn; # added 2018-02-25

     

       427
       427
       +
         networkmanager_pptp = networkmanager-pptp; # added 2018-02-25

     

       428
       428
       +
         networkmanager_vpnc = networkmanager-vpnc; # added 2018-02-25

     

       429
       429
       +
         yelp_xsl = yelp-xsl; # added 2018-02-25

     

       430
       430
       +
         yelp_tools = yelp-tools; # added 2018-02-25

     

       403
       431
        
       

     

       404
       432
        
           };

     

       405
       433
        
         in self; # pkgsFun

+1 -1

pkgs/desktops/gnome-3/devtools/anjuta/default.nix

···

       14
       14
        
         buildInputs = [

     

       15
       15
        
           flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl

     

       16
       16
        
           gnome3.libgda gnome3.gtksourceview

     

       17
       17
       -
           gnome3.gsettings_desktop_schemas

     

       17
       17
       +
           gnome3.gsettings-desktop-schemas

     

       18
       18
        
         ];

     

       19
       19
        
       

     

       20
       20
        
         preFixup = ''

+2 -2

pkgs/desktops/gnome-3/devtools/devhelp/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook

     

       2
       2
       -
       , webkitgtk, intltool, gsettings_desktop_schemas }:

     

       2
       2
       +
       , webkitgtk, intltool, gsettings-desktop-schemas }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         inherit (import ./src.nix fetchurl) name src;

     
···

       7
       7
        
         nativeBuildInputs = [ pkgconfig ];

     

       8
       8
        
         buildInputs = [

     

       9
       9
        
           gtk3 wrapGAppsHook webkitgtk intltool gnome3.defaultIconTheme

     

       10
       10
       -
           gsettings_desktop_schemas

     

       10
       10
       +
           gsettings-desktop-schemas

     

       11
       11
        
         ];

     

       12
       12
        
       

     

       13
       13
        
         meta = with stdenv.lib; {

+1 -1

pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix

···

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         nativeBuildInputs = [ cmake ninja jq wrapGAppsHook ];

     

       16
       16
       -
         buildInputs = [ gnome3.gnome_shell python pygobject3 requests ];

     

       16
       16
       +
         buildInputs = [ gnome3.gnome-shell python pygobject3 requests ];

     

       17
       17
        
       

     

       18
       18
        
         preConfigure = ''

     

       19
       19
        
           substituteInPlace CMakeLists.txt --replace "/etc" "$out/etc"

+3 -3

pkgs/desktops/gnome-3/games/aisleriot/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, gtk3

     

       2
       2
       -
       , wrapGAppsHook, gconf, librsvg, libxml2, desktop_file_utils

     

       3
       3
       -
       , guile_2_0, libcanberra_gtk3 }:

     

       2
       2
       +
       , wrapGAppsHook, gconf, librsvg, libxml2, desktop-file-utils

     

       3
       3
       +
       , guile_2_0, libcanberra-gtk3 }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         inherit (import ./src.nix fetchurl) name src;

     
···

       9
       9
        
       

     

       10
       10
        
         nativeBuildInputs = [ pkgconfig ];

     

       11
       11
        
         buildInputs = [ intltool itstool gtk3 wrapGAppsHook gconf

     

       12
       12
       -
                         librsvg libxml2 desktop_file_utils guile_2_0 libcanberra_gtk3 ];

     

       12
       12
       +
                         librsvg libxml2 desktop-file-utils guile_2_0 libcanberra-gtk3 ];

     

       13
       13
        
       

     

       14
       14
        
         meta = with stdenv.lib; {

     

       15
       15
        
           homepage = https://wiki.gnome.org/Apps/Aisleriot;

+2 -2

pkgs/desktops/gnome-3/games/four-in-a-row/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook

     

       2
       2
       -
       , intltool, itstool, libcanberra_gtk3, librsvg, libxml2 }:

     

       2
       2
       +
       , intltool, itstool, libcanberra-gtk3, librsvg, libxml2 }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         inherit (import ./src.nix fetchurl) name src;

     

       6
       6
        
       

     

       7
       7
        
         nativeBuildInputs = [ pkgconfig ];

     

       8
       8
        
         buildInputs = [

     

       9
       9
       -
           gtk3 wrapGAppsHook intltool itstool libcanberra_gtk3 librsvg

     

       9
       9
       +
           gtk3 wrapGAppsHook intltool itstool libcanberra-gtk3 librsvg

     

       10
       10
        
           libxml2 gnome3.defaultIconTheme

     

       11
       11
        
         ];

     

       12
       12

+2 -2

pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook

     

       2
       2
       -
       , librsvg, libcanberra_gtk3, clutter_gtk, intltool, itstool

     

       2
       2
       +
       , librsvg, libcanberra-gtk3, clutter-gtk, intltool, itstool

     

       3
       3
        
       , libxml2, libgee, libgames-support }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     
···

       8
       8
        
         nativeBuildInputs = [ pkgconfig ];

     

       9
       9
        
         buildInputs = [

     

       10
       10
        
           gtk3 wrapGAppsHook intltool itstool libxml2

     

       11
       11
       -
           librsvg libcanberra_gtk3 clutter_gtk gnome3.defaultIconTheme

     

       11
       11
       +
           librsvg libcanberra-gtk3 clutter-gtk gnome3.defaultIconTheme

     

       12
       12
        
           libgee libgames-support

     

       13
       13
        
         ];

     

       14
       14

+2 -2

pkgs/desktops/gnome-3/games/gnome-robots/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook

     

       2
       2
       -
       , librsvg, libcanberra_gtk3, intltool, itstool, libxml2, libgames-support

     

       2
       2
       +
       , librsvg, libcanberra-gtk3, intltool, itstool, libxml2, libgames-support

     

       3
       3
        
       , libgee}:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     
···

       7
       7
        
       

     

       8
       8
        
         nativeBuildInputs = [ pkgconfig ];

     

       9
       9
        
         buildInputs = [

     

       10
       10
       -
           gtk3 wrapGAppsHook intltool itstool librsvg libcanberra_gtk3

     

       10
       10
       +
           gtk3 wrapGAppsHook intltool itstool librsvg libcanberra-gtk3

     

       11
       11
        
           libxml2 gnome3.defaultIconTheme libgames-support libgee

     

       12
       12
        
         ];

     

       13
       13

+2 -2

pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, intltool, gtk3, gnome3, wrapGAppsHook

     

       2
       2
       -
       , json_glib, qqwing, itstool, libxml2 }:

     

       2
       2
       +
       , json-glib, qqwing, itstool, libxml2 }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         inherit (import ./src.nix fetchurl) name src;

     

       6
       6
        
       

     

       7
       7
        
         nativeBuildInputs = [ pkgconfig ];

     

       8
       8
        
         buildInputs = [ intltool wrapGAppsHook gtk3 gnome3.libgee

     

       9
       9
       -
                         json_glib qqwing itstool libxml2 ];

     

       9
       9
       +
                         json-glib qqwing itstool libxml2 ];

     

       10
       10
        
       

     

       11
       11
        
         meta = with stdenv.lib; {

     

       12
       12
        
           homepage = https://wiki.gnome.org/Apps/Sudoku;

+2 -2

pkgs/desktops/gnome-3/games/gnome-taquin/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook

     

       2
       2
       -
       , librsvg, libcanberra_gtk3, intltool, itstool, libxml2 }:

     

       2
       2
       +
       , librsvg, libcanberra-gtk3, intltool, itstool, libxml2 }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         inherit (import ./src.nix fetchurl) name src;

     

       6
       6
        
       

     

       7
       7
        
         nativeBuildInputs = [ pkgconfig ];

     

       8
       8
        
         buildInputs = [

     

       9
       9
       -
           gtk3 wrapGAppsHook librsvg libcanberra_gtk3

     

       9
       9
       +
           gtk3 wrapGAppsHook librsvg libcanberra-gtk3

     

       10
       10
        
           intltool itstool libxml2 gnome3.defaultIconTheme

     

       11
       11
        
         ];

     

       12
       12

+2 -2

pkgs/desktops/gnome-3/games/iagno/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook

     

       2
       2
       -
       , intltool, itstool, libcanberra_gtk3, libxml2, dconf }:

     

       2
       2
       +
       , intltool, itstool, libcanberra-gtk3, libxml2, dconf }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         inherit (import ./src.nix fetchurl) name src;

     

       6
       6
        
       

     

       7
       7
        
         nativeBuildInputs = [ pkgconfig ];

     

       8
       8
        
         buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg

     

       9
       9
       -
                         dconf libxml2 libcanberra_gtk3 wrapGAppsHook itstool intltool ];

     

       9
       9
       +
                         dconf libxml2 libcanberra-gtk3 wrapGAppsHook itstool intltool ];

     

       10
       10
        
       

     

       11
       11
        
         enableParallelBuilding = true;

     

       12
       12

+2 -2

pkgs/desktops/gnome-3/games/lightsoff/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook

     

       2
       2
       -
       , intltool, itstool, clutter, clutter_gtk, libxml2, dconf }:

     

       2
       2
       +
       , intltool, itstool, clutter, clutter-gtk, libxml2, dconf }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         inherit (import ./src.nix fetchurl) name src;

     

       6
       6
        
       

     

       7
       7
        
         nativeBuildInputs = [ pkgconfig ];

     

       8
       8
        
         buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg dconf

     

       9
       9
       -
                         libxml2 clutter clutter_gtk wrapGAppsHook itstool intltool ];

     

       9
       9
       +
                         libxml2 clutter clutter-gtk wrapGAppsHook itstool intltool ];

     

       10
       10
        
       

     

       11
       11
        
         enableParallelBuilding = true;

     

       12
       12

+4 -4

pkgs/desktops/gnome-3/games/quadrapassel/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf

     

       2
       2
       -
       , librsvg, libcanberra_gtk3

     

       3
       3
       -
       , intltool, itstool, libxml2, clutter, clutter_gtk, wrapGAppsHook }:

     

       2
       2
       +
       , librsvg, libcanberra-gtk3

     

       3
       3
       +
       , intltool, itstool, libxml2, clutter, clutter-gtk, wrapGAppsHook }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         inherit (import ./src.nix fetchurl) name src;

     

       7
       7
        
       

     

       8
       8
        
         nativeBuildInputs = [ pkgconfig ];

     

       9
       9
        
         buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg

     

       10
       10
       -
                         libcanberra_gtk3 itstool intltool clutter

     

       11
       11
       -
                         libxml2 clutter_gtk wrapGAppsHook ];

     

       10
       10
       +
                         libcanberra-gtk3 itstool intltool clutter

     

       11
       11
       +
                         libxml2 clutter-gtk wrapGAppsHook ];

     

       12
       12
        
       

     

       13
       13
        
         enableParallelBuilding = true;

     

       14
       14

+2 -2

pkgs/desktops/gnome-3/games/swell-foop/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, dconf

     

       2
       2
       -
       , clutter, clutter_gtk, intltool, itstool, libxml2, wrapGAppsHook }:

     

       2
       2
       +
       , clutter, clutter-gtk, intltool, itstool, libxml2, wrapGAppsHook }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         inherit (import ./src.nix fetchurl) name src;

     

       6
       6
        
       

     

       7
       7
        
         nativeBuildInputs = [ pkgconfig ];

     

       8
       8
        
         buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg

     

       9
       9
       -
                         dconf wrapGAppsHook itstool intltool clutter clutter_gtk libxml2 ];

     

       9
       9
       +
                         dconf wrapGAppsHook itstool intltool clutter clutter-gtk libxml2 ];

     

       10
       10
        
       

     

       11
       11
        
         enableParallelBuilding = true;

     

       12
       12

+4 -4

pkgs/desktops/gnome-3/misc/california/default.nix

···

       12
       12
        
           sha256 = "1dky2kllv469k8966ilnf4xrr7z35pq8mdvs7kwziy59cdikapxj";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       -
         propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];

     

       15
       15
       +
         propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];

     

       16
       16
        
       

     

       17
       17
        
         nativeBuildInputs = [ pkgconfig ];

     

       18
       18
        
         buildInputs = [ makeWrapper intltool vala_0_32 glib gtk3 gnome3.libgee

     

       19
       19
       -
           libsoup libgdata gnome3.gnome_online_accounts gnome3.evolution_data_server

     

       20
       20
       -
           sqlite itstool xdg_utils gnome3.gsettings_desktop_schemas ];

     

       19
       19
       +
           libsoup libgdata gnome3.gnome-online-accounts gnome3.evolution-data-server

     

       20
       20
       +
           sqlite itstool xdg_utils gnome3.gsettings-desktop-schemas ];

     

       21
       21
        
       

     

       22
       22
        
         preFixup = ''

     

       23
       23
        
           wrapProgram "$out/bin/california" \

     

       24
       24
        
             --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \

     

       25
       25
       -
             --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.defaultIconTheme}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH:${gnome3.gsettings_desktop_schemas}/share"

     

       25
       25
       +
             --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.defaultIconTheme}/share:${gnome3.gnome-themes-standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH:${gnome3.gsettings-desktop-schemas}/share"

     

       26
       26
        
         '';

     

       27
       27
        
       

     

       28
       28
        
         enableParallelBuilding = true;

+7 -7

pkgs/desktops/gnome-3/misc/geary/default.nix

···

       1
       1
        
       { stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_38, enchant

     

       2
       2
       -
       , wrapGAppsHook, gdk_pixbuf, cmake, desktop_file_utils

     

       3
       3
       -
       , libnotify, libcanberra_gtk3, libsecret, gmime

     

       2
       2
       +
       , wrapGAppsHook, gdk_pixbuf, cmake, desktop-file-utils

     

       3
       3
       +
       , libnotify, libcanberra-gtk3, libsecret, gmime

     

       4
       4
        
       , libpthreadstubs, sqlite

     

       5
       5
       -
       , gnome3, librsvg, gnome_doc_utils, webkitgtk }:

     

       5
       5
       +
       , gnome3, librsvg, gnome-doc-utils, webkitgtk }:

     

       6
       6
        
       

     

       7
       7
        
       let

     

       8
       8
        
         majorVersion = "0.12";

     
···

       15
       15
        
           sha256 = "12hbpd5j3rb122nrsqmgsg31x82xl0ksm0nmsl614v1dd7crqnh6";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
       -
         propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];

     

       18
       18
       +
         propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];

     

       19
       19
        
       

     

       20
       20
       -
         nativeBuildInputs = [ vala_0_38 intltool pkgconfig wrapGAppsHook cmake desktop_file_utils gnome_doc_utils ];

     

       21
       21
       -
         buildInputs = [ gtk3 enchant webkitgtk libnotify libcanberra_gtk3 gnome3.libgee libsecret gmime sqlite

     

       22
       22
       -
                         libpthreadstubs gnome3.gsettings_desktop_schemas gnome3.gcr

     

       20
       20
       +
         nativeBuildInputs = [ vala_0_38 intltool pkgconfig wrapGAppsHook cmake desktop-file-utils gnome-doc-utils ];

     

       21
       21
       +
         buildInputs = [ gtk3 enchant webkitgtk libnotify libcanberra-gtk3 gnome3.libgee libsecret gmime sqlite

     

       22
       22
       +
                         libpthreadstubs gnome3.gsettings-desktop-schemas gnome3.gcr

     

       23
       23
        
                         gdk_pixbuf librsvg gnome3.defaultIconTheme ];

     

       24
       24
        
       

     

       25
       25
        
         preConfigure = ''

+3 -3

pkgs/desktops/gnome-3/misc/gfbgraph/default.nix

···

       1
       1
        
       { stdenv, intltool, fetchurl, pkgconfig, glib

     

       2
       2
       -
       , gnome3, libsoup, json_glib }:

     

       2
       2
       +
       , gnome3, libsoup, json-glib }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         name = "gfbgraph-0.2.3";

     
···

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ pkgconfig ];

     

       13
       13
       -
         buildInputs = [ glib gnome3.gnome_online_accounts ];

     

       14
       14
       -
         propagatedBuildInputs = [ libsoup json_glib gnome3.rest ];

     

       13
       13
       +
         buildInputs = [ glib gnome3.gnome-online-accounts ];

     

       14
       14
       +
         propagatedBuildInputs = [ libsoup json-glib gnome3.rest ];

     

       15
       15
        
       

     

       16
       16
        
         enableParallelBuilding = true;

     

       17
       17

+6 -6

pkgs/desktops/gnome-3/misc/gitg/default.nix

···

       1
       1
        
       { stdenv, fetchurl, vala, intltool, pkgconfig, gtk3, glib

     

       2
       2
       -
       , json_glib, wrapGAppsHook, libpeas, bash, gobjectIntrospection

     

       3
       3
       -
       , gnome3, gtkspell3, shared_mime_info, libgee, libgit2-glib, librsvg, libsecret

     

       2
       2
       +
       , json-glib, wrapGAppsHook, libpeas, bash, gobjectIntrospection

     

       3
       3
       +
       , gnome3, gtkspell3, shared-mime-info, libgee, libgit2-glib, librsvg, libsecret

     

       4
       4
        
       , libsoup }:

     

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     
···

       13
       13
        
       

     

       14
       14
        
         makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";

     

       15
       15
        
       

     

       16
       16
       -
         propagatedUserEnvPkgs = [ shared_mime_info

     

       17
       17
       -
                                   gnome3.gnome_themes_standard ];

     

       16
       16
       +
         propagatedUserEnvPkgs = [ shared-mime-info

     

       17
       17
       +
                                   gnome3.gnome-themes-standard ];

     

       18
       18
        
       

     

       19
       19
       -
         buildInputs = [ gtk3 glib json_glib libgee libpeas gnome3.libsoup

     

       20
       20
       -
                         libgit2-glib gtkspell3 gnome3.gtksourceview gnome3.gsettings_desktop_schemas

     

       19
       19
       +
         buildInputs = [ gtk3 glib json-glib libgee libpeas gnome3.libsoup

     

       20
       20
       +
                         libgit2-glib gtkspell3 gnome3.gtksourceview gnome3.gsettings-desktop-schemas

     

       21
       21
        
                         librsvg libsecret gobjectIntrospection gnome3.adwaita-icon-theme ];

     

       22
       22
        
       

     

       23
       23
        
         nativeBuildInputs = [ vala wrapGAppsHook intltool pkgconfig ];

+4 -4

pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, meson, ninja, gettext, gnome3, libxslt, packagekit, polkit

     

       2
       2
       -
       , fontconfig, libcanberra_gtk3, systemd, libnotify, wrapGAppsHook, dbus_glib, dbus_libs, desktop_file_utils }:

     

       2
       2
       +
       , fontconfig, libcanberra-gtk3, systemd, libnotify, wrapGAppsHook, dbus-glib, dbus_libs, desktop-file-utils }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         inherit (import ./src.nix fetchurl) name src;

     

       6
       6
        
       

     

       7
       7
       -
         NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0";

     

       7
       7
       +
         NIX_CFLAGS_COMPILE = "-I${dbus-glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0";

     

       8
       8
        
       

     

       9
       9
       -
         nativeBuildInputs = [ pkgconfig meson ninja gettext wrapGAppsHook desktop_file_utils ];

     

       9
       9
       +
         nativeBuildInputs = [ pkgconfig meson ninja gettext wrapGAppsHook desktop-file-utils ];

     

       10
       10
        
         buildInputs = [ libxslt gnome3.gtk packagekit fontconfig systemd polkit

     

       11
       11
       -
                         libcanberra_gtk3 libnotify dbus_glib dbus_libs ];

     

       11
       11
       +
                         libcanberra-gtk3 libnotify dbus-glib dbus_libs ];

     

       12
       12
        
       

     

       13
       13
        
         prePatch = "patchShebangs meson_post_install.sh";

     

       14
       14

+5 -5

pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix

···

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
        
         inherit (import ./src.nix fetchurl) name src;

     

       8
       8
        
       

     

       9
       9
       -
         propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];

     

       9
       9
       +
         propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];

     

       10
       10
        
       

     

       11
       11
        
         nativeBuildInputs = [

     

       12
       12
        
           meson ninja pkgconfig gettext itstool libxml2 file wrapGAppsHook

     

       13
       13
        
         ];

     

       14
       14
        
         buildInputs = [

     

       15
       15
       -
           gtk3 glib gnome3.gsettings_desktop_schemas

     

       15
       15
       +
           gtk3 glib gnome3.gsettings-desktop-schemas

     

       16
       16
        
           gdk_pixbuf gnome3.defaultIconTheme librsvg

     

       17
       17
       -
           libnotify gnome3.gnome_shell python3Packages.pygobject3

     

       18
       18
       -
           libsoup gnome3.gnome_settings_daemon gnome3.nautilus

     

       19
       19
       -
           gnome3.mutter gnome3.gnome_desktop gobjectIntrospection

     

       17
       17
       +
           libnotify gnome3.gnome-shell python3Packages.pygobject3

     

       18
       18
       +
           libsoup gnome3.gnome-settings-daemon gnome3.nautilus

     

       19
       19
       +
           gnome3.mutter gnome3.gnome-desktop gobjectIntrospection

     

       20
       20
        
         ];

     

       21
       21
        
       

     

       22
       22
        
         postPatch = ''

+1 -1

pkgs/desktops/gnome-3/misc/gpaste/default.nix

···

       12
       12
        
       

     

       13
       13
        
         nativeBuildInputs = [ autoreconfHook pkgconfig vala wrapGAppsHook ];

     

       14
       14
        
         buildInputs = [ glib gjs mutter gnome3.adwaita-icon-theme

     

       15
       15
       -
                         gtk3 gnome3.gnome_control_center dbus

     

       15
       15
       +
                         gtk3 gnome3.gnome-control-center dbus

     

       16
       16
        
                         clutter pango appstream-glib systemd gobjectIntrospection ];

     

       17
       17
        
       

     

       18
       18
        
         configureFlags = [ "--with-controlcenterdir=$(out)/share/gnome-control-center/keybindings"

+1 -1

pkgs/desktops/gnome-3/misc/gtkhtml/default.nix

···

       6
       6
        
       

     

       7
       7
        
         nativeBuildInputs = [ pkgconfig ];

     

       8
       8
        
         buildInputs = [ gtk3 intltool gnome3.adwaita-icon-theme

     

       9
       9
       -
                         gnome3.gsettings_desktop_schemas ];

     

       9
       9
       +
                         gnome3.gsettings-desktop-schemas ];

     

       10
       10
        
       

     

       11
       11
        
         propagatedBuildInputs = [ enchant isocodes ];

     

       12
       12

+2 -2

pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix

···

       1
       1
        
       { stdenv, fetchurl, gnome3, libtool, pkgconfig, vala, libssh2

     

       2
       2
       -
       , gtk_doc, gobjectIntrospection, libgit2, glib }:

     

       2
       2
       +
       , gtk-doc, gobjectIntrospection, libgit2, glib }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         inherit (import ./src.nix fetchurl) name src;

     

       6
       6
        
       

     

       7
       7
        
         nativeBuildInputs = [

     

       8
       8
       -
           gnome3.gnome_common libtool pkgconfig vala gtk_doc gobjectIntrospection

     

       8
       8
       +
           gnome3.gnome-common libtool pkgconfig vala gtk-doc gobjectIntrospection

     

       9
       9
        
         ];

     

       10
       10
        
       

     

       11
       11
        
         propagatedBuildInputs = [

+4 -4

pkgs/desktops/gnome-3/misc/pomodoro/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, autoconf-archive, appstream-glib, intltool, pkgconfig, libtool, wrapGAppsHook,

     

       2
       2
       -
         dbus_glib, libcanberra, gst_all_1, vala, gnome3, gtk3, libxml2, autoreconfHook,

     

       2
       2
       +
         dbus-glib, libcanberra, gst_all_1, vala, gnome3, gtk3, libxml2, autoreconfHook,

     

       3
       3
        
         glib, gobjectIntrospection, libpeas

     

       4
       4
        
       }:

     

       5
       5
        
       

     
···

       21
       21
        
       

     

       22
       22
        
         buildInputs = [

     

       23
       23
        
           glib gobjectIntrospection libpeas

     

       24
       24
       -
           dbus_glib libcanberra gst_all_1.gstreamer

     

       24
       24
       +
           dbus-glib libcanberra gst_all_1.gstreamer

     

       25
       25
        
           gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good

     

       26
       26
       -
           gnome3.gsettings_desktop_schemas

     

       27
       27
       -
           gnome3.gnome_shell gtk3 gnome3.defaultIconTheme

     

       26
       26
       +
           gnome3.gsettings-desktop-schemas

     

       27
       27
       +
           gnome3.gnome-shell gtk3 gnome3.defaultIconTheme

     

       28
       28
        
         ];

     

       29
       29
        
       

     

       30
       30
        
         meta = with stdenv.lib; {

+2 -2

pkgs/desktops/lumina/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, fluxbox, xscreensaver, desktop_file_utils,

     

       1
       1
       +
       { stdenv, fetchFromGitHub, fluxbox, xscreensaver, desktop-file-utils,

     

       2
       2
        
         numlockx, xorg, qtbase, qtsvg, qtmultimedia, qtx11extras, qmake,

     

       3
       3
        
         qttools, poppler_qt5, wrapGAppsHook

     

       4
       4
        
       }:

     
···

       31
       31
        
           poppler_qt5

     

       32
       32
        
           fluxbox

     

       33
       33
        
           xscreensaver

     

       34
       34
       -
           desktop_file_utils

     

       34
       34
       +
           desktop-file-utils

     

       35
       35
        
           numlockx

     

       36
       36
        
         ];

     

       37
       37

+2 -2

pkgs/desktops/lxqt/optional/obconf-qt/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qt5, xorg, lxqt, openbox, hicolor_icon_theme }:

     

       1
       1
       +
       { stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qt5, xorg, lxqt, openbox, hicolor-icon-theme }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "${pname}-${version}";

     
···

       27
       27
        
           xorg.libXdmcp

     

       28
       28
        
           xorg.libSM

     

       29
       29
        
           openbox

     

       30
       30
       -
           hicolor_icon_theme

     

       30
       30
       +
           hicolor-icon-theme

     

       31
       31
        
         ];

     

       32
       32
        
       

     

       33
       33
        
         cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];

+2 -2

pkgs/desktops/mate/atril/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, intltool, gtk3, libxml2, libsecret, poppler, itstool, hicolor_icon_theme, mate, wrapGAppsHook }:

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, intltool, gtk3, libxml2, libsecret, poppler, itstool, hicolor-icon-theme, mate, wrapGAppsHook }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "atril-${version}";

     
···

       23
       23
        
           poppler

     

       24
       24
        
           mate.caja

     

       25
       25
        
           mate.mate-desktop

     

       26
       26
       -
           hicolor_icon_theme

     

       26
       26
       +
           hicolor-icon-theme

     

       27
       27
        
         ];

     

       28
       28
        
         

     

       29
       29
        
         makeFlags = [ "cajaextensiondir=$$out/lib/caja/extensions-2.0" ];

+2 -2

pkgs/desktops/mate/caja-extensions/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus_glib, gupnp, mate, imagemagick, wrapGAppsHook }:

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus-glib, gupnp, mate, imagemagick, wrapGAppsHook }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "caja-extensions-${version}";

     
···

       17
       17
        
       

     

       18
       18
        
         buildInputs = [

     

       19
       19
        
           gtk3

     

       20
       20
       -
           dbus_glib

     

       20
       20
       +
           dbus-glib

     

       21
       21
        
           gupnp

     

       22
       22
        
           mate.caja

     

       23
       23
        
           mate.mate-desktop

+2 -2

pkgs/desktops/mate/caja/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, intltool, gtk3, libnotify, libxml2, libexif, exempi, mate, hicolor_icon_theme, wrapGAppsHook }:

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, intltool, gtk3, libnotify, libxml2, libexif, exempi, mate, hicolor-icon-theme, wrapGAppsHook }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "caja-${version}";

     
···

       22
       22
        
           libexif

     

       23
       23
        
           exempi

     

       24
       24
        
           mate.mate-desktop

     

       25
       25
       -
           hicolor_icon_theme

     

       25
       25
       +
           hicolor-icon-theme

     

       26
       26
        
         ];

     

       27
       27
        
       

     

       28
       28
        
         patches = [

+2 -2

pkgs/desktops/mate/engrampa/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gnome3, mate, hicolor_icon_theme, wrapGAppsHook }:

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gnome3, mate, hicolor-icon-theme, wrapGAppsHook }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "engrampa-${version}";

     
···

       20
       20
        
           libxml2

     

       21
       21
        
           gnome3.gtk

     

       22
       22
        
           mate.caja

     

       23
       23
       -
           hicolor_icon_theme

     

       23
       23
       +
           hicolor-icon-theme

     

       24
       24
        
           mate.mate-desktop

     

       25
       25
        
         ];

     

       26
       26

+4 -4

pkgs/desktops/mate/eom/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, intltool, itstool, dbus_glib, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, shared_mime_info, gnome3, mate, hicolor_icon_theme, wrapGAppsHook }:

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, intltool, itstool, dbus-glib, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, shared-mime-info, gnome3, mate, hicolor-icon-theme, wrapGAppsHook }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "eom-${version}";

     
···

       17
       17
        
         ];

     

       18
       18
        
       

     

       19
       19
        
         buildInputs = [

     

       20
       20
       -
           dbus_glib

     

       20
       20
       +
           dbus-glib

     

       21
       21
        
           exempi

     

       22
       22
        
           lcms2

     

       23
       23
        
           libexif

     

       24
       24
        
           libjpeg

     

       25
       25
        
           librsvg

     

       26
       26
        
           libxml2

     

       27
       27
       -
           shared_mime_info

     

       27
       27
       +
           shared-mime-info

     

       28
       28
        
           gnome3.gtk

     

       29
       29
        
           gnome3.libpeas

     

       30
       30
        
           mate.mate-desktop

     

       31
       31
       -
           hicolor_icon_theme

     

       31
       31
       +
           hicolor-icon-theme

     

       32
       32
        
         ];

     

       33
       33
        
       

     

       34
       34
        
         meta = {

+2 -2

pkgs/desktops/mate/marco/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, libcanberra_gtk3, libgtop, gnome2, gnome3, mate, wrapGAppsHook }:

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, libcanberra-gtk3, libgtop, gnome2, gnome3, mate, wrapGAppsHook }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "marco-${version}";

     
···

       18
       18
        
       

     

       19
       19
        
         buildInputs = [

     

       20
       20
        
           libxml2

     

       21
       21
       -
           libcanberra_gtk3

     

       21
       21
       +
           libcanberra-gtk3

     

       22
       22
        
           libgtop

     

       23
       23
        
           gnome2.startup_notification

     

       24
       24
        
           gnome3.gtk

+2 -2

pkgs/desktops/mate/mate-applets/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, libwnck3, libgtop, libxml2, libnotify, dbus_glib, polkit, upower, wirelesstools, mate, hicolor_icon_theme, wrapGAppsHook }:

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, libwnck3, libgtop, libxml2, libnotify, dbus-glib, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "mate-applets-${version}";

     
···

       29
       29
        
           wirelesstools

     

       30
       30
        
           mate.libmateweather

     

       31
       31
        
           mate.mate-panel

     

       32
       32
       -
           hicolor_icon_theme

     

       32
       32
       +
           hicolor-icon-theme

     

       33
       33
        
         ];

     

       34
       34
        
       

     

       35
       35
        
         configureFlags = [ "--enable-suid=no" ];

+7 -7

pkgs/desktops/mate/mate-control-center/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, dbus_glib,

     

       2
       2
       -
         libxklavier, libcanberra_gtk3, librsvg, libappindicator-gtk3,

     

       3
       3
       -
         desktop_file_utils, gnome3, mate, hicolor_icon_theme, wrapGAppsHook

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, dbus-glib,

     

       2
       2
       +
         libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3,

     

       3
       3
       +
         desktop-file-utils, gnome3, mate, hicolor-icon-theme, wrapGAppsHook

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     
···

       16
       16
        
           pkgconfig

     

       17
       17
        
           intltool

     

       18
       18
        
           itstool

     

       19
       19
       -
           desktop_file_utils

     

       19
       19
       +
           desktop-file-utils

     

       20
       20
        
           wrapGAppsHook

     

       21
       21
        
         ];

     

       22
       22
        
       

     

       23
       23
        
         buildInputs = [

     

       24
       24
        
           libxml2

     

       25
       25
       -
           dbus_glib

     

       25
       25
       +
           dbus-glib

     

       26
       26
        
           libxklavier

     

       27
       27
       -
           libcanberra_gtk3

     

       27
       27
       +
           libcanberra-gtk3

     

       28
       28
        
           librsvg

     

       29
       29
        
           libappindicator-gtk3

     

       30
       30
        
           gnome3.gtk

     

       31
       31
        
           gnome3.dconf

     

       32
       32
       -
           hicolor_icon_theme

     

       32
       32
       +
           hicolor-icon-theme

     

       33
       33
        
           mate.mate-desktop

     

       34
       34
        
           mate.libmatekbd

     

       35
       35
        
           mate.mate-menus

+2 -2

pkgs/desktops/mate/mate-icon-theme-faenza/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, autoreconfHook, mate, hicolor_icon_theme }:

     

       1
       1
       +
       { stdenv, fetchurl, autoreconfHook, mate, hicolor-icon-theme }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "mate-icon-theme-faenza-${version}";

     
···

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ autoreconfHook ];

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = [ mate.mate-icon-theme hicolor_icon_theme ];

     

       14
       14
       +
         buildInputs = [ mate.mate-icon-theme hicolor-icon-theme ];

     

       15
       15
        
         

     

       16
       16
        
         meta = {

     

       17
       17
        
           description = "Faenza icon theme from MATE";

+2 -2

pkgs/desktops/mate/mate-icon-theme/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, librsvg, hicolor_icon_theme, gtk3, mate }:

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, librsvg, hicolor-icon-theme, gtk3, mate }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "mate-icon-theme-${version}";

     
···

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ pkgconfig intltool iconnamingutils ];

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = [ librsvg hicolor_icon_theme ];

     

       14
       14
       +
         buildInputs = [ librsvg hicolor-icon-theme ];

     

       15
       15
        
         

     

       16
       16
        
         postInstall = ''

     

       17
       17
        
           for theme in "$out"/share/icons/*; do

+2 -2

pkgs/desktops/mate/mate-indicator-applet/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, intltool, gtk3, libindicator-gtk3, mate, hicolor_icon_theme, wrapGAppsHook }:

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, intltool, gtk3, libindicator-gtk3, mate, hicolor-icon-theme, wrapGAppsHook }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "mate-indicator-applet-${version}";

     
···

       19
       19
        
           gtk3

     

       20
       20
        
           libindicator-gtk3

     

       21
       21
        
           mate.mate-panel

     

       22
       22
       -
           hicolor_icon_theme

     

       22
       22
       +
           hicolor-icon-theme

     

       23
       23
        
         ];

     

       24
       24
        
       

     

       25
       25
        
         meta = with stdenv.lib; {

+2 -2

pkgs/desktops/mate/mate-media/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, intltool, libtool, libxml2, libcanberra_gtk3, gnome3, mate, wrapGAppsHook }:

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, intltool, libtool, libxml2, libcanberra-gtk3, gnome3, mate, wrapGAppsHook }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "mate-media-${version}";

     
···

       11
       11
        
       

     

       12
       12
        
         buildInputs = [

     

       13
       13
        
           libxml2

     

       14
       14
       -
           libcanberra_gtk3

     

       14
       14
       +
           libcanberra-gtk3

     

       15
       15
        
           gnome3.gtk

     

       16
       16
        
           mate.libmatemixer

     

       17
       17
        
           mate.mate-desktop

+3 -3

pkgs/desktops/mate/mate-notification-daemon/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, intltool, dbus_glib, libcanberra_gtk3,

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, intltool, dbus-glib, libcanberra-gtk3,

     

       2
       2
        
         libnotify, libwnck3, gnome3, mate, wrapGAppsHook }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     
···

       17
       17
        
         ];

     

       18
       18
        
       

     

       19
       19
        
         buildInputs = [

     

       20
       20
       -
           dbus_glib

     

       21
       21
       -
           libcanberra_gtk3

     

       20
       20
       +
           dbus-glib

     

       21
       21
       +
           libcanberra-gtk3

     

       22
       22
        
           libnotify

     

       23
       23
        
           libwnck3

     

       24
       24
        
           gnome3.gtk

+3 -3

pkgs/desktops/mate/mate-panel/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, intltool, itstool, glib, dbus_glib, libwnck3, librsvg, libxml2, gnome3, mate, hicolor_icon_theme, wrapGAppsHook }:

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, intltool, itstool, glib, dbus-glib, libwnck3, librsvg, libxml2, gnome3, mate, hicolor-icon-theme, wrapGAppsHook }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "mate-panel-${version}";

     
···

       18
       18
        
       

     

       19
       19
        
         buildInputs = [

     

       20
       20
        
           glib

     

       21
       21
       -
           dbus_glib

     

       21
       21
       +
           dbus-glib

     

       22
       22
        
           libwnck3

     

       23
       23
        
           librsvg

     

       24
       24
        
           libxml2

     
···

       27
       27
        
           mate.libmateweather

     

       28
       28
        
           mate.mate-desktop

     

       29
       29
        
           mate.mate-menus

     

       30
       30
       -
           hicolor_icon_theme

     

       30
       30
       +
           hicolor-icon-theme

     

       31
       31
        
         ];

     

       32
       32
        
       

     

       33
       33
        
         NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";

+4 -4

pkgs/desktops/mate/mate-power-manager/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, libnotify, libcanberra_gtk3, dbus_glib, upower, gnome3, libtool, wrapGAppsHook }:

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, libtool, wrapGAppsHook }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "mate-power-manager-${version}";

     
···

       13
       13
        
            glib

     

       14
       14
        
            itstool

     

       15
       15
        
            libxml2

     

       16
       16
       -
            libcanberra_gtk3

     

       16
       16
       +
            libcanberra-gtk3

     

       17
       17
        
            gnome3.gtk

     

       18
       18
       -
            gnome3.libgnome_keyring

     

       18
       18
       +
            gnome3.libgnome-keyring

     

       19
       19
        
            libnotify

     

       20
       20
       -
            dbus_glib

     

       20
       20
       +
            dbus-glib

     

       21
       21
        
            upower

     

       22
       22
        
            mate.mate-panel

     

       23
       23
        
         ];

+2 -2

pkgs/desktops/mate/mate-screensaver/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus_glib, libXScrnSaver, libnotify, pam, systemd, mate, wrapGAppsHook }:

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus-glib, libXScrnSaver, libnotify, pam, systemd, mate, wrapGAppsHook }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "mate-screensaver-${version}";

     
···

       17
       17
        
       

     

       18
       18
        
         buildInputs = [

     

       19
       19
        
           gtk3

     

       20
       20
       -
           dbus_glib

     

       20
       20
       +
           dbus-glib

     

       21
       21
        
           libXScrnSaver

     

       22
       22
        
           libnotify

     

       23
       23
        
           pam

+3 -3

pkgs/desktops/mate/mate-sensors-applet/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, dbus_glib, lm_sensors, mate, hicolor_icon_theme, wrapGAppsHook }:

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, dbus-glib, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "mate-sensors-applet-${version}";

     
···

       23
       23
        
           libxslt

     

       24
       24
        
           libatasmart

     

       25
       25
        
           libnotify

     

       26
       26
       -
           dbus_glib

     

       26
       26
       +
           dbus-glib

     

       27
       27
        
           lm_sensors

     

       28
       28
        
           mate.mate-panel

     

       29
       29
       -
           hicolor_icon_theme

     

       29
       29
       +
           hicolor-icon-theme

     

       30
       30
        
         ];

     

       31
       31
        
       

     

       32
       32
        
         meta = with stdenv.lib; {

+4 -4

pkgs/desktops/mate/mate-session-manager/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, intltool, xtrans, dbus_glib, systemd,

     

       2
       2
       -
         libSM, libXtst, gtk3, hicolor_icon_theme, mate,

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, intltool, xtrans, dbus-glib, systemd,

     

       2
       2
       +
         libSM, libXtst, gtk3, hicolor-icon-theme, mate,

     

       3
       3
        
         wrapGAppsHook

     

       4
       4
        
       }:

     

       5
       5
        
       

     
···

       20
       20
        
         ];

     

       21
       21
        
       

     

       22
       22
        
         buildInputs = [

     

       23
       23
       -
           dbus_glib

     

       23
       23
       +
           dbus-glib

     

       24
       24
        
           systemd

     

       25
       25
        
           libSM

     

       26
       26
        
           libXtst

     

       27
       27
        
           gtk3

     

       28
       28
        
           mate.mate-desktop

     

       29
       29
       -
           hicolor_icon_theme

     

       29
       29
       +
           hicolor-icon-theme

     

       30
       30
        
         ];

     

       31
       31
        
       

     

       32
       32
        
         meta = with stdenv.lib; {

+3 -3

pkgs/desktops/mate/mate-settings-daemon/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, intltool, glib, dbus_glib, libxklavier, libcanberra_gtk3, libnotify, nss, polkit, gnome3, mate, wrapGAppsHook

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, intltool, glib, dbus-glib, libxklavier, libcanberra-gtk3, libnotify, nss, polkit, gnome3, mate, wrapGAppsHook

     

       2
       2
        
       , pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio

     

       3
       3
        
       }:

     

       4
       4
        
       

     
···

       18
       18
        
         ];

     

       19
       19
        
       

     

       20
       20
        
         buildInputs = [

     

       21
       21
       -
           dbus_glib

     

       21
       21
       +
           dbus-glib

     

       22
       22
        
           libxklavier

     

       23
       23
       -
           libcanberra_gtk3

     

       23
       23
       +
           libcanberra-gtk3

     

       24
       24
        
           libnotify

     

       25
       25
        
           nss

     

       26
       26
        
           polkit

+4 -4

pkgs/desktops/mate/mate-user-share/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, dbus_glib, libnotify, libxml2, libcanberra_gtk3, mod_dnssd, apacheHttpd, hicolor_icon_theme, mate, wrapGAppsHook }:

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, dbus-glib, libnotify, libxml2, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "mate-user-share-${version}";

     
···

       18
       18
        
       

     

       19
       19
        
         buildInputs = [

     

       20
       20
        
           gtk3

     

       21
       21
       -
           dbus_glib

     

       21
       21
       +
           dbus-glib

     

       22
       22
        
           libnotify

     

       23
       23
       -
           libcanberra_gtk3

     

       23
       23
       +
           libcanberra-gtk3

     

       24
       24
        
           libxml2

     

       25
       25
        
           mate.caja

     

       26
       26
       -
           hicolor_icon_theme

     

       26
       26
       +
           hicolor-icon-theme

     

       27
       27
        
           # Should mod_dnssd and apacheHttpd be runtime dependencies?

     

       28
       28
        
           # In gnome-user-share they are not.

     

       29
       29
        
           #mod_dnssd

+3 -3

pkgs/desktops/mate/mate-utils/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libgtop, libcanberra_gtk3, mate, hicolor_icon_theme, wrapGAppsHook }:

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libgtop, libcanberra-gtk3, mate, hicolor-icon-theme, wrapGAppsHook }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "mate-utils-${version}";

     
···

       19
       19
        
         buildInputs = [

     

       20
       20
        
           gtk3

     

       21
       21
        
           libgtop

     

       22
       22
       -
           libcanberra_gtk3

     

       22
       22
       +
           libcanberra-gtk3

     

       23
       23
        
           libxml2

     

       24
       24
        
           mate.mate-panel

     

       25
       25
       -
           hicolor_icon_theme

     

       25
       25
       +
           hicolor-icon-theme

     

       26
       26
        
         ];

     

       27
       27
        
       

     

       28
       28
        
         meta = with stdenv.lib; {

+1 -1

pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix

···

       27
       27
        
         ];

     

       28
       28
        
         buildInputs = with gnome3; [

     

       29
       29
        
           glib gtk3 granite libnotify gettext vte_290 libgee

     

       30
       30
       -
           gsettings_desktop_schemas defaultIconTheme

     

       30
       30
       +
           gsettings-desktop-schemas defaultIconTheme

     

       31
       31
        
         ];

     

       32
       32
        
         meta = {

     

       33
       33
        
           description = "Elementary OS's terminal";

+2 -2

pkgs/desktops/plasma-5/bluedevil.nix

···

       1
       1
        
       {

     

       2
       2
       -
         mkDerivation, extra-cmake-modules, shared_mime_info,

     

       2
       2
       +
         mkDerivation, extra-cmake-modules, shared-mime-info,

     

       3
       3
        
         bluez-qt, kcoreaddons, kdbusaddons, kded, ki18n, kiconthemes, kio,

     

       4
       4
        
         knotifications, kwidgetsaddons, kwindowsystem, plasma-framework, qtdeclarative

     

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
        
       mkDerivation {

     

       8
       8
        
         name = "bluedevil";

     

       9
       9
       -
         nativeBuildInputs = [ extra-cmake-modules shared_mime_info ];

     

       9
       9
       +
         nativeBuildInputs = [ extra-cmake-modules shared-mime-info ];

     

       10
       10
        
         buildInputs = [

     

       11
       11
        
           bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative kcoreaddons

     

       12
       12
        
           kdbusaddons kded kiconthemes knotifications kwidgetsaddons

+2 -2

pkgs/desktops/plasma-5/default.nix

···

       26
       26
        
       

     

       27
       27
        
       {

     

       28
       28
        
         libsForQt5, lib, fetchurl,

     

       29
       29
       -
         gconf, gsettings_desktop_schemas,

     

       29
       29
       +
         gconf, gsettings-desktop-schemas,

     

       30
       30
        
         debug ? false,

     

       31
       31
        
       }:

     

       32
       32
        
       

     
···

       105
       105
        
             breeze-plymouth = callPackage ./breeze-plymouth {};

     

       106
       106
        
             kactivitymanagerd = callPackage ./kactivitymanagerd.nix {};

     

       107
       107
        
             kde-cli-tools = callPackage ./kde-cli-tools.nix {};

     

       108
       108
       -
             kde-gtk-config = callPackage ./kde-gtk-config { inherit gsettings_desktop_schemas; };

     

       108
       108
       +
             kde-gtk-config = callPackage ./kde-gtk-config { inherit gsettings-desktop-schemas; };

     

       109
       109
        
             kdecoration = callPackage ./kdecoration.nix {};

     

       110
       110
        
             kdeplasma-addons = callPackage ./kdeplasma-addons.nix {};

     

       111
       111
        
             kgamma5 = callPackage ./kgamma5.nix {};

+3 -3

pkgs/desktops/plasma-5/kde-gtk-config/default.nix

···

       2
       2
        
         mkDerivation,

     

       3
       3
        
         extra-cmake-modules,

     

       4
       4
        
         glib, gtk2, gtk3, karchive, kcmutils, kconfigwidgets, ki18n, kiconthemes, kio,

     

       5
       5
       -
         knewstuff, gsettings_desktop_schemas

     

       5
       5
       +
         knewstuff, gsettings-desktop-schemas

     

       6
       6
        
       }:

     

       7
       7
        
       

     

       8
       8
        
       mkDerivation {

     
···

       10
       10
        
         nativeBuildInputs = [ extra-cmake-modules ];

     

       11
       11
        
         buildInputs = [

     

       12
       12
        
           ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes

     

       13
       13
       -
           knewstuff gsettings_desktop_schemas

     

       13
       13
       +
           knewstuff gsettings-desktop-schemas

     

       14
       14
        
         ];

     

       15
       15
        
         patches = [ ./0001-follow-symlinks.patch ];

     

       16
       16
        
         cmakeFlags = [

     

       17
       17
        
           "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"

     

       18
       18
        
           "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"

     

       19
       19
       -
           "-DGLIB_SCHEMAS_DIR=${gsettings_desktop_schemas.out}/"

     

       19
       19
       +
           "-DGLIB_SCHEMAS_DIR=${gsettings-desktop-schemas.out}/"

     

       20
       20
        
         ];

     

       21
       21
        
       }

+1 -1

pkgs/desktops/plasma-5/plasma-nm/0001-mobile-broadband-provider-info-path.patch

···

       16
       16
        
        #include <KLocale>

     

       17
       17
        
        

     

       18
       18
        
       -const QString MobileProviders::ProvidersFile = "/usr/share/mobile-broadband-provider-info/serviceproviders.xml";

     

       19
       19
       -
       +const QString MobileProviders::ProvidersFile = "@mobile_broadband_provider_info@/share/mobile-broadband-provider-info/serviceproviders.xml";

     

       19
       19
       +
       +const QString MobileProviders::ProvidersFile = "@mobile-broadband-provider-info@/share/mobile-broadband-provider-info/serviceproviders.xml";

     

       20
       20
        
        

     

       21
       21
        
        bool localeAwareCompare(const QString & one, const QString & two) {

     

       22
       22
        
            return one.localeAwareCompare(two) < 0;

+3 -3

pkgs/desktops/plasma-5/plasma-nm/default.nix

···

       4
       4
        
         kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative,

     

       5
       5
        
         kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews, knotifications,

     

       6
       6
        
         kservice, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui,

     

       7
       7
       -
         mobile_broadband_provider_info, modemmanager-qt, networkmanager-qt,

     

       7
       7
       +
         mobile-broadband-provider-info, modemmanager-qt, networkmanager-qt,

     

       8
       8
        
         openconnect, openvpn, plasma-framework, qca-qt5, qtdeclarative, qttools, solid

     

       9
       9
        
       }:

     

       10
       10
        
       

     
···

       15
       15
        
           kdeclarative kdelibs4support ki18n kio kwindowsystem plasma-framework

     

       16
       16
        
           qtdeclarative kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes

     

       17
       17
        
           kinit kitemviews knotifications kservice kwallet kwidgetsaddons kxmlgui

     

       18
       18
       -
           mobile_broadband_provider_info modemmanager-qt networkmanager-qt openconnect

     

       18
       18
       +
           mobile-broadband-provider-info modemmanager-qt networkmanager-qt openconnect

     

       19
       19
        
           qca-qt5 solid

     

       20
       20
        
         ];

     

       21
       21
        
         patches = [

     

       22
       22
        
           (substituteAll {

     

       23
       23
        
             src = ./0001-mobile-broadband-provider-info-path.patch;

     

       24
       24
       -
             inherit mobile_broadband_provider_info;

     

       24
       24
       +
             inherit mobile-broadband-provider-info;

     

       25
       25
        
           })

     

       26
       26
        
           (substituteAll {

     

       27
       27
        
             src = ./0002-openvpn-binary-path.patch;

+2 -2

pkgs/desktops/plasma-5/plasma-pa.nix

···

       2
       2
        
         mkDerivation,

     

       3
       3
        
         extra-cmake-modules, kdoctools,

     

       4
       4
        
         gconf, glib, kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel, ki18n,

     

       5
       5
       -
         libcanberra_gtk3, libpulseaudio, plasma-framework, qtdeclarative, kwindowsystem

     

       5
       5
       +
         libcanberra-gtk3, libpulseaudio, plasma-framework, qtdeclarative, kwindowsystem

     

       6
       6
        
       }:

     

       7
       7
        
       

     

       8
       8
        
       mkDerivation {

     
···

       10
       10
        
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       11
       11
        
         buildInputs = [

     

       12
       12
        
           gconf glib kconfigwidgets kcoreaddons kdeclarative kglobalaccel ki18n

     

       13
       13
       -
           libcanberra_gtk3 libpulseaudio plasma-framework qtdeclarative kwindowsystem

     

       13
       13
       +
           libcanberra-gtk3 libpulseaudio plasma-framework qtdeclarative kwindowsystem

     

       14
       14
        
         ];

     

       15
       15
        
       }

+2 -2

pkgs/desktops/plasma-5/sddm-kcm.nix

···

       1
       1
        
       {

     

       2
       2
       -
         mkDerivation, extra-cmake-modules, shared_mime_info,

     

       2
       2
       +
         mkDerivation, extra-cmake-modules, shared-mime-info,

     

       3
       3
        
         libpthreadstubs, libXcursor, libXdmcp,

     

       4
       4
        
         qtquickcontrols2, qtx11extras,

     

       5
       5
        
         karchive, ki18n, kio, knewstuff

     
···

       7
       7
        
       

     

       8
       8
        
       mkDerivation {

     

       9
       9
        
         name = "sddm-kcm";

     

       10
       10
       -
         nativeBuildInputs = [ extra-cmake-modules shared_mime_info ];

     

       10
       10
       +
         nativeBuildInputs = [ extra-cmake-modules shared-mime-info ];

     

       11
       11
        
         buildInputs = [

     

       12
       12
        
           libpthreadstubs libXcursor libXdmcp

     

       13
       13
        
           qtquickcontrols2 qtx11extras

+2 -2

pkgs/desktops/rox/rox-filer/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, libxml2, gtk, libSM, shared_mime_info, hicolor_icon_theme }:

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, libxml2, gtk, libSM, shared-mime-info, hicolor-icon-theme }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         version = "2.11";

     
···

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ pkgconfig ];

     

       15
       15
       -
         buildInputs = [ libxml2 gtk shared_mime_info hicolor_icon_theme libSM ];

     

       15
       15
       +
         buildInputs = [ libxml2 gtk shared-mime-info hicolor-icon-theme libSM ];

     

       16
       16
        
       

     

       17
       17
        
         patches = [

     

       18
       18
        
           ./rox-filer-2.11-in-source-build.patch

+2 -2

pkgs/desktops/xfce/applications/mousepad.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, intltool, libxfce4util

     

       2
       2
       -
       , gtk, gtksourceview, dbus, dbus_glib, makeWrapper

     

       2
       2
       +
       , gtk, gtksourceview, dbus, dbus-glib, makeWrapper

     

       3
       3
        
       , dconf }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     
···

       17
       17
        
       

     

       18
       18
        
         buildInputs =

     

       19
       19
        
           [ pkgconfig intltool libxfce4util

     

       20
       20
       -
             gtk gtksourceview dbus dbus_glib makeWrapper

     

       20
       20
       +
             gtk gtksourceview dbus dbus-glib makeWrapper

     

       21
       21
        
             dconf

     

       22
       22
        
           ];

     

       23
       23

+2 -2

pkgs/desktops/xfce/applications/orage.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, bison, flex, intltool, gtk, libical, dbus_glib

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, bison, flex, intltool, gtk, libical, dbus-glib

     

       2
       2
        
       , libnotify, popt, xfce

     

       3
       3
        
       }:

     

       4
       4
        
       

     
···

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [ pkgconfig intltool bison flex ];

     

       17
       17
        
         

     

       18
       18
       -
         buildInputs = [ gtk libical dbus_glib libnotify popt xfce.libxfce4util

     

       18
       18
       +
         buildInputs = [ gtk libical dbus-glib libnotify popt xfce.libxfce4util

     

       19
       19
        
           xfce.xfce4panel ];

     

       20
       20
        
       

     

       21
       21
        
         preFixup = "rm $out/share/icons/hicolor/icon-theme.cache ";

+2 -2

pkgs/desktops/xfce/applications/parole.nix

···

       1
       1
        
       { stdenv, fetchurl, makeWrapper, pkgconfig, intltool, gst_all_1

     

       2
       2
       -
       , gtk, dbus_glib, libxfce4ui, libxfce4util, xfconf

     

       2
       2
       +
       , gtk, dbus-glib, libxfce4ui, libxfce4util, xfconf

     

       3
       3
        
       , taglib, libnotify

     

       4
       4
        
       , withGstPlugins ? true

     

       5
       5
        
       }:

     
···

       19
       19
        
       

     

       20
       20
        
         buildInputs = [

     

       21
       21
        
           makeWrapper 

     

       22
       22
       -
           gtk dbus_glib libxfce4ui libxfce4util xfconf

     

       22
       22
       +
           gtk dbus-glib libxfce4ui libxfce4util xfconf

     

       23
       23
        
           taglib libnotify

     

       24
       24
        
         ] ++ (with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav]);

     

       25
       25

+5 -5

pkgs/desktops/xfce/applications/ristretto.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, intltool, libexif, gtk

     

       2
       2
       -
       , exo, dbus_glib, libxfce4util, libxfce4ui, xfconf

     

       3
       3
       -
       , hicolor_icon_theme, makeWrapper

     

       2
       2
       +
       , exo, dbus-glib, libxfce4util, libxfce4ui, xfconf

     

       3
       3
       +
       , hicolor-icon-theme, makeWrapper

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     
···

       15
       15
        
         name = "${p_name}-${ver_maj}.${ver_min}";

     

       16
       16
        
       

     

       17
       17
        
         buildInputs =

     

       18
       18
       -
           [ pkgconfig intltool libexif gtk dbus_glib exo libxfce4util

     

       19
       19
       -
             libxfce4ui xfconf hicolor_icon_theme makeWrapper

     

       18
       18
       +
           [ pkgconfig intltool libexif gtk dbus-glib exo libxfce4util

     

       19
       19
       +
             libxfce4ui xfconf hicolor-icon-theme makeWrapper

     

       20
       20
        
           ];

     

       21
       21
        
       

     

       22
       22
        
         postInstall = ''

     

       23
       23
        
           wrapProgram "$out/bin/ristretto" \

     

       24
       24
       -
             --prefix XDG_DATA_DIRS : "${hicolor_icon_theme}/share"

     

       24
       24
       +
             --prefix XDG_DATA_DIRS : "${hicolor-icon-theme}/share"

     

       25
       25
        
         '';

     

       26
       26
        
       

     

       27
       27
        
         meta = {

+2 -2

pkgs/desktops/xfce/applications/terminal.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, intltool, ncurses, gtk, vte, dbus_glib

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, intltool, ncurses, gtk, vte, dbus-glib

     

       2
       2
        
       , exo, libxfce4util, libxfce4ui

     

       3
       3
        
       }:

     

       4
       4
        
       

     
···

       14
       14
        
         name = "${p_name}-${ver_maj}.${ver_min}";

     

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [ pkgconfig ];

     

       17
       17
       -
         buildInputs = [ intltool exo gtk vte libxfce4util ncurses dbus_glib libxfce4ui ];

     

       17
       17
       +
         buildInputs = [ intltool exo gtk vte libxfce4util ncurses dbus-glib libxfce4ui ];

     

       18
       18
        
       

     

       19
       19
        
         meta = {

     

       20
       20
        
           homepage = http://www.xfce.org/projects/terminal;

+2 -2

pkgs/desktops/xfce/applications/xfce4-screenshooter.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, intltool, xfce4panel, libxfce4util, gtk, libsoup

     

       2
       2
       -
       , makeWrapper, glib_networking, exo, hicolor_icon_theme, wrapGAppsHook }:

     

       2
       2
       +
       , makeWrapper, glib-networking, exo, hicolor-icon-theme, wrapGAppsHook }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         p_name  = "xfce4-screenshooter";

     
···

       17
       17
        
         ];

     

       18
       18
        
       

     

       19
       19
        
         buildInputs = [

     

       20
       20
       -
           xfce4panel libxfce4util gtk libsoup exo hicolor_icon_theme glib_networking

     

       20
       20
       +
           xfce4panel libxfce4util gtk libsoup exo hicolor-icon-theme glib-networking

     

       21
       21
        
         ];

     

       22
       22
        
       

     

       23
       23
        
         meta = {

+2 -2

pkgs/desktops/xfce/core/exo.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, intltool, URI, glib, gtk, libxfce4ui, libxfce4util

     

       2
       2
       -
       , hicolor_icon_theme }:

     

       2
       2
       +
       , hicolor-icon-theme }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         p_name  = "exo";

     
···

       16
       16
        
           # lib/xfce4/exo-1/exo-compose-mail-1 is a perl script :-/

     

       17
       17
        
       

     

       18
       18
        
         nativeBuildInputs = [ pkgconfig intltool ];

     

       19
       19
       -
         buildInputs = [ URI glib gtk libxfce4ui libxfce4util hicolor_icon_theme ];

     

       19
       19
       +
         buildInputs = [ URI glib gtk libxfce4ui libxfce4util hicolor-icon-theme ];

     

       20
       20
        
       

     

       21
       21
        
         meta = with stdenv.lib; {

     

       22
       22
        
           homepage = "http://www.xfce.org/projects/${p_name}";

+2 -2

pkgs/desktops/xfce/core/libxfce4ui.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, intltool, xorg, gtk, libxfce4util, xfconf

     

       2
       2
       -
       , libglade, libstartup_notification, hicolor_icon_theme

     

       2
       2
       +
       , libglade, libstartup_notification, hicolor-icon-theme

     

       3
       3
        
       , withGtk3 ? false, gtk3

     

       4
       4
        
       }:

     

       5
       5
        
       let

     
···

       22
       22
        
       

     

       23
       23
        
         buildInputs =

     

       24
       24
        
           [ gtk libxfce4util xfconf libglade

     

       25
       25
       -
             libstartup_notification hicolor_icon_theme

     

       25
       25
       +
             libstartup_notification hicolor-icon-theme

     

       26
       26
        
           ] ++ optional withGtk3 gtk3;

     

       27
       27
        
       

     

       28
       28
        
         propagatedBuildInputs = [ xorg.libICE xorg.libSM ];

+2 -2

pkgs/desktops/xfce/core/libxfcegui4.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, intltool, gtk

     

       2
       2
       -
       , libxfce4util, xfconf, libglade, libstartup_notification, hicolor_icon_theme }:

     

       2
       2
       +
       , libxfce4util, xfconf, libglade, libstartup_notification, hicolor-icon-theme }:

     

       3
       3
        
       let

     

       4
       4
        
         p_name  = "libxfcegui4";

     

       5
       5
        
         ver_maj = "4.10";

     
···

       25
       25
        
       

     

       26
       26
        
         buildInputs =

     

       27
       27
        
           [ pkgconfig intltool gtk libxfce4util xfconf libglade

     

       28
       28
       -
             libstartup_notification hicolor_icon_theme

     

       28
       28
       +
             libstartup_notification hicolor-icon-theme

     

       29
       29
        
           ];

     

       30
       30
        
       

     

       31
       31
        
         meta = {

+2 -2

pkgs/desktops/xfce/core/thunar-build.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, intltool

     

       2
       2
       -
       , gtk, dbus_glib, libstartup_notification, libnotify, libexif, pcre, udev

     

       2
       2
       +
       , gtk, dbus-glib, libstartup_notification, libnotify, libexif, pcre, udev

     

       3
       3
        
       , exo, libxfce4util, xfconf, xfce4panel, wrapGAppsHook

     

       4
       4
        
       }:

     

       5
       5
        
       

     
···

       24
       24
        
         nativeBuildInputs = [ pkgconfig wrapGAppsHook ];

     

       25
       25
        
         buildInputs = [

     

       26
       26
        
           intltool

     

       27
       27
       -
           gtk dbus_glib libstartup_notification libnotify libexif pcre udev

     

       27
       27
       +
           gtk dbus-glib libstartup_notification libnotify libexif pcre udev

     

       28
       28
        
           exo libxfce4util xfconf xfce4panel

     

       29
       29
        
         ];

     

       30
       30
        
         # TODO: optionality?

+2 -2

pkgs/desktops/xfce/core/tumbler.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, intltool, dbus_glib, gdk_pixbuf, curl, freetype

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, intltool, dbus-glib, gdk_pixbuf, curl, freetype

     

       2
       2
        
       , libgsf, poppler, bzip2 }:

     

       3
       3
        
       let

     

       4
       4
        
         p_name  = "tumbler";

     
···

       17
       17
        
       

     

       18
       18
        
         nativeBuildInputs = [ pkgconfig ];

     

       19
       19
        
         buildInputs = [

     

       20
       20
       -
           intltool dbus_glib gdk_pixbuf curl freetype

     

       20
       20
       +
           intltool dbus-glib gdk_pixbuf curl freetype

     

       21
       21
        
           poppler libgsf bzip2

     

       22
       22
        
         ];

     

       23
       23

+4 -4

pkgs/desktops/xfce/core/xfce4-panel.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui

     

       2
       2
        
       , libxfce4ui_gtk3, libwnck, exo, garcon, xfconf, libstartup_notification

     

       3
       3
       -
       , makeWrapper, xfce4mixer, hicolor_icon_theme

     

       4
       4
       -
       , withGtk3 ? false, gtk3, gettext, glib_networking

     

       3
       3
       +
       , makeWrapper, xfce4mixer, hicolor-icon-theme

     

       4
       4
       +
       , withGtk3 ? false, gtk3, gettext, glib-networking

     

       5
       5
        
       }:

     

       6
       6
        
       let

     

       7
       7
        
         inherit (stdenv.lib) optional;

     
···

       30
       30
        
       

     

       31
       31
        
         buildInputs =

     

       32
       32
        
           [ pkgconfig intltool gtk libxfce4util exo libwnck

     

       33
       33
       -
             garcon xfconf libstartup_notification makeWrapper hicolor_icon_theme

     

       33
       33
       +
             garcon xfconf libstartup_notification makeWrapper hicolor-icon-theme

     

       34
       34
        
           ] ++ xfce4mixer.gst_plugins

     

       35
       35
        
             ++ optional withGtk3 gtk3;

     

       36
       36
        
       

     
···

       41
       41
        
         postInstall = ''

     

       42
       42
        
           wrapProgram "$out/bin/xfce4-panel" \

     

       43
       43
        
             --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \

     

       44
       44
       -
             --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules"

     

       44
       44
       +
             --prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules"

     

       45
       45
        
         '';

     

       46
       46
        
       

     

       47
       47
        
         enableParallelBuilding = true;

+4 -4

pkgs/desktops/xfce/core/xfce4-power-manager.nix

···

       1
       1
       -
       { stdenv, lib, fetchurl, pkgconfig, intltool, glib, gtk, dbus_glib, upower, xfconf

     

       2
       2
       -
       , libxfce4ui, libxfce4util, libnotify, xfce4panel, hicolor_icon_theme

     

       1
       1
       +
       { stdenv, lib, fetchurl, pkgconfig, intltool, glib, gtk, dbus-glib, upower, xfconf

     

       2
       2
       +
       , libxfce4ui, libxfce4util, libnotify, xfce4panel, hicolor-icon-theme

     

       3
       3
        
       , withGtk3 ? false, gtk3, libxfce4ui_gtk3, xfce4panel_gtk3 }:

     

       4
       4
        
       let

     

       5
       5
        
         p_name  = "xfce4-power-manager";

     
···

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         buildInputs =

     

       21
       21
       -
           [ pkgconfig intltool glib dbus_glib upower xfconf libxfce4util

     

       22
       22
       -
             libnotify hicolor_icon_theme

     

       21
       21
       +
           [ pkgconfig intltool glib dbus-glib upower xfconf libxfce4util

     

       22
       22
       +
             libnotify hicolor-icon-theme

     

       23
       23
        
           ] ++

     

       24
       24
        
           (if withGtk3

     

       25
       25
        
           then [ gtk3 libxfce4ui_gtk3 xfce4panel_gtk3 ]

+4 -4

pkgs/desktops/xfce/core/xfce4-session.nix

···

       1
       1
        
       { stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gtk, polkit

     

       2
       2
       -
       , libxfce4util, libxfce4ui, xfce4panel, libwnck, dbus_glib, xfconf, libglade, xorg

     

       3
       3
       -
       , hicolor_icon_theme

     

       2
       2
       +
       , libxfce4util, libxfce4ui, xfce4panel, libwnck, dbus-glib, xfconf, libglade, xorg

     

       3
       3
       +
       , hicolor-icon-theme

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       let

     
···

       22
       22
        
         ];

     

       23
       23
        
       

     

       24
       24
        
         buildInputs =

     

       25
       25
       -
           [ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck dbus_glib

     

       25
       25
       +
           [ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck dbus-glib

     

       26
       26
        
             xfconf xfce4panel libglade xorg.iceauth xorg.libSM

     

       27
       27
       -
             polkit hicolor_icon_theme

     

       27
       27
       +
             polkit hicolor-icon-theme

     

       28
       28
        
           ]; #TODO: upower-glib, gconf (assistive?), gnome keyring

     

       29
       29
        
       

     

       30
       30
        
         preBuild = ''

+2 -2

pkgs/desktops/xfce/core/xfconf.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util, dbus_glib }:

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util, dbus-glib }:

     

       2
       2
        
       let

     

       3
       3
        
         p_name  = "xfconf";

     

       4
       4
        
         ver_maj = "4.12";

     
···

       17
       17
        
         #TODO: no perl bingings yet (ExtUtils::Depends, ExtUtils::PkgConfig, Glib)

     

       18
       18
        
         nativeBuildInputs = [ pkgconfig ];

     

       19
       19
        
         buildInputs = [ intltool glib libxfce4util ];

     

       20
       20
       -
         propagatedBuildInputs = [ dbus_glib ];

     

       20
       20
       +
         propagatedBuildInputs = [ dbus-glib ];

     

       21
       21
        
       

     

       22
       22
        
         meta = with stdenv.lib; {

     

       23
       23
        
           homepage = http://docs.xfce.org/xfce/xfconf/start;

+2 -2

pkgs/desktops/xfce/core/xfdesktop.nix

···

       1
       1
        
       { stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui

     

       2
       2
        
       , libwnck, xfconf, libglade, xfce4panel, thunar, exo, garcon, libnotify

     

       3
       3
       -
       , hicolor_icon_theme }:

     

       3
       3
       +
       , hicolor-icon-theme }:

     

       4
       4
        
       let

     

       5
       5
        
         p_name  = "xfdesktop";

     

       6
       6
        
         ver_maj = "4.12";

     
···

       16
       16
        
       

     

       17
       17
        
         buildInputs = [

     

       18
       18
        
           pkgconfig intltool gtk libxfce4util libxfce4ui libwnck xfconf

     

       19
       19
       -
           libglade xfce4panel thunar exo garcon libnotify hicolor_icon_theme

     

       19
       19
       +
           libglade xfce4panel thunar exo garcon libnotify hicolor-icon-theme

     

       20
       20
        
         ];

     

       21
       21
        
       

     

       22
       22
        
         patches = [(fetchpatch {

+2 -2

pkgs/development/compilers/boo/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, pkgconfig, dbus, mono, makeWrapper, nant

     

       2
       2
       -
       , shared_mime_info, gtksourceview, gtk2

     

       2
       2
       +
       , shared-mime-info, gtksourceview, gtk2

     

       3
       3
        
       , targetVersion ? "4.5" }:

     

       4
       4
        
       

     

       5
       5
        
       let

     
···

       18
       18
        
       

     

       19
       19
        
         nativeBuildInputs = [ pkgconfig ];

     

       20
       20
        
         buildInputs = [

     

       21
       21
       -
           mono makeWrapper nant shared_mime_info gtksourceview

     

       21
       21
       +
           mono makeWrapper nant shared-mime-info gtksourceview

     

       22
       22
        
           gtk2

     

       23
       23
        
         ];

     

       24
       24

+4 -4

pkgs/development/haskell-modules/hackage-packages.nix

···

       84276
       84276
        
            }) {};

     

       84277
       84277
        
       

     

       84278
       84278
        
         "gnome-keyring" = callPackage

     

       84279
       84279
       -
           ({ mkDerivation, base, bytestring, c2hs, gnome_keyring, text, time

     

       84279
       84279
       +
           ({ mkDerivation, base, bytestring, c2hs, gnome-keyring, text, time

     

       84280
       84280
        
            }:

     

       84281
       84281
        
            mkDerivation {

     

       84282
       84282
        
              pname = "gnome-keyring";

     

       84283
       84283
        
              version = "0.3.1";

     

       84284
       84284
        
              sha256 = "08fayi4ixqyzin7lxyx2s3yap377y6nrdf4fmv7bi895j2k642l8";

     

       84285
       84285
        
              libraryHaskellDepends = [ base bytestring text time ];

     

       84286
       84286
       -
              librarySystemDepends = [ gnome_keyring ];

     

       84287
       84287
       -
              libraryPkgconfigDepends = [ gnome_keyring ];

     

       84286
       84286
       +
              librarySystemDepends = [ gnome-keyring ];

     

       84287
       84287
       +
              libraryPkgconfigDepends = [ gnome-keyring ];

     

       84288
       84288
        
              libraryToolDepends = [ c2hs ];

     

       84289
       84289
        
              homepage = "https://john-millikin.com/software/haskell-gnome-keyring/";

     

       84290
       84290
        
              description = "Bindings for libgnome-keyring";

     

       84291
       84291
        
              license = stdenv.lib.licenses.gpl3;

     

       84292
       84292
        
              hydraPlatforms = stdenv.lib.platforms.none;

     

       84293
       84293
       -
            }) {inherit (pkgs.gnome2) gnome_keyring;};

     

       84293
       84293
       +
            }) {inherit (pkgs.gnome2) gnome-keyring;};

     

       84294
       84294
        
       

     

       84295
       84295
        
         "gnomevfs" = callPackage

     

       84296
       84296
        
           ({ mkDerivation, array, base, containers, glib, gnome_vfs

+4 -4

pkgs/development/libraries/appstream-glib/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, substituteAll, pkgconfig, gettext, gtk3, glib

     

       2
       2
       -
       , gtk_doc, libarchive, gobjectIntrospection, libxslt, pngquant

     

       2
       2
       +
       , gtk-doc, libarchive, gobjectIntrospection, libxslt, pngquant

     

       3
       3
        
       , sqlite, libsoup, gcab, attr, acl, docbook_xsl, docbook_xml_dtd_42

     

       4
       4
       -
       , libuuid, json_glib, meson, gperf, ninja

     

       4
       4
       +
       , libuuid, json-glib, meson, gperf, ninja

     

       5
       5
        
       }:

     

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
        
         name = "appstream-glib-0.7.6";

     
···

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         nativeBuildInputs = [

     

       20
       20
       -
           meson pkgconfig ninja gtk_doc libxslt docbook_xsl docbook_xml_dtd_42

     

       20
       20
       +
           meson pkgconfig ninja gtk-doc libxslt docbook_xsl docbook_xml_dtd_42

     

       21
       21
        
         ];

     

       22
       22
        
         buildInputs = [

     

       23
       23
        
           glib gettext sqlite libsoup

     

       24
       24
       -
           gcab attr acl libuuid json_glib

     

       24
       24
       +
           gcab attr acl libuuid json-glib

     

       25
       25
        
           libarchive gobjectIntrospection gperf

     

       26
       26
        
         ];

     

       27
       27
        
         propagatedBuildInputs = [ gtk3 ];

+2 -2

pkgs/development/libraries/at-spi2-atk/default.nix

···

       1
       1
        
       { stdenv, fetchurl, python, pkgconfig, popt, atk, libX11, libICE, xorg, libXi

     

       2
       2
       -
       , intltool, dbus_glib, at_spi2_core, libSM }:

     

       2
       2
       +
       , intltool, dbus-glib, at-spi2-core, libSM }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         versionMajor = "2.26";

     
···

       14
       14
        
       

     

       15
       15
        
         nativeBuildInputs = [ pkgconfig intltool ];

     

       16
       16
        
         buildInputs = [ python popt atk libX11 libICE xorg.libXtst libXi

     

       17
       17
       -
                         dbus_glib at_spi2_core libSM ];

     

       17
       17
       +
                         dbus-glib at-spi2-core libSM ];

     

       18
       18
        
       

     

       19
       19
        
         meta = with stdenv.lib; {

     

       20
       20
        
           platforms = platforms.unix;

+2 -2

pkgs/development/libraries/at-spi2-core/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, python, pkgconfig, popt, gettext, dbus_glib

     

       1
       1
       +
       { stdenv, fetchurl, python, pkgconfig, popt, gettext, dbus-glib

     

       2
       2
        
       , libX11, xextproto, libSM, libICE, libXtst, libXi, gobjectIntrospection }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     
···

       16
       16
        
       

     

       17
       17
        
         nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection ];

     

       18
       18
        
         buildInputs = [

     

       19
       19
       -
           python popt dbus_glib

     

       19
       19
       +
           python popt dbus-glib

     

       20
       20
        
           libX11 xextproto libSM libICE libXtst libXi

     

       21
       21
        
         ];

     

       22
       22

+2 -2

pkgs/development/libraries/clutter/default.nix

···

       1
       1
        
       { stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes

     

       2
       2
       -
       , libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json_glib, 

     

       2
       2
       +
       , libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json-glib, 

     

       3
       3
        
       gobjectIntrospection, gtk3

     

       4
       4
        
       }:

     

       5
       5
        
       

     
···

       19
       19
        
         nativeBuildInputs = [ pkgconfig ];

     

       20
       20
        
         propagatedBuildInputs =

     

       21
       21
        
           [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango

     

       22
       22
       -
             atk json_glib gobjectIntrospection libxcb

     

       22
       22
       +
             atk json-glib gobjectIntrospection libxcb

     

       23
       23
        
           ];

     

       24
       24
        
       

     

       25
       25
        
         configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK

+2 -2

pkgs/development/libraries/dleyna-renderer/default.nix

···

       1
       1
       -
       { stdenv, autoreconfHook, pkgconfig, fetchFromGitHub, dleyna-connector-dbus, dleyna-core, gssdp, gupnp, gupnp_av, gupnp_dlna, libsoup, makeWrapper }:

     

       1
       1
       +
       { stdenv, autoreconfHook, pkgconfig, fetchFromGitHub, dleyna-connector-dbus, dleyna-core, gssdp, gupnp, gupnp-av, gupnp-dlna, libsoup, makeWrapper }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "dleyna-renderer";

     
···

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ];

     

       15
       15
       -
         buildInputs = [ dleyna-core dleyna-connector-dbus gssdp gupnp gupnp_av gupnp_dlna libsoup ];

     

       15
       15
       +
         buildInputs = [ dleyna-core dleyna-connector-dbus gssdp gupnp gupnp-av gupnp-dlna libsoup ];

     

       16
       16
        
       

     

       17
       17
        
         preFixup = ''

     

       18
       18
        
           wrapProgram "$out/libexec/dleyna-renderer-service" \

+2 -2

pkgs/development/libraries/dleyna-server/default.nix

···

       1
       1
       -
       { stdenv, autoreconfHook, makeWrapper, pkgconfig, fetchFromGitHub, dleyna-core, dleyna-connector-dbus, gssdp, gupnp, gupnp_av, gupnp_dlna, libsoup }:

     

       1
       1
       +
       { stdenv, autoreconfHook, makeWrapper, pkgconfig, fetchFromGitHub, dleyna-core, dleyna-connector-dbus, gssdp, gupnp, gupnp-av, gupnp-dlna, libsoup }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "dleyna-server";

     
···

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ];

     

       15
       15
       -
         buildInputs = [ dleyna-core dleyna-connector-dbus gssdp gupnp gupnp_av gupnp_dlna libsoup ];

     

       15
       15
       +
         buildInputs = [ dleyna-core dleyna-connector-dbus gssdp gupnp gupnp-av gupnp-dlna libsoup ];

     

       16
       16
        
       

     

       17
       17
        
         preFixup = ''

     

       18
       18
        
           wrapProgram "$out/libexec/dleyna-server-service" \

+2 -2

pkgs/development/libraries/farstream/default.nix

···

       1
       1
        
       { stdenv, fetchurl, libnice, pkgconfig, pythonPackages, gstreamer, gst-plugins-base

     

       2
       2
       -
       , gst-python, gupnp_igd

     

       2
       2
       +
       , gst-python, gupnp-igd

     

       3
       3
        
       , gst-plugins-good, gst-plugins-bad, gst-libav

     

       4
       4
        
       }:

     

       5
       5
        
       

     
···

       12
       12
        
           sha256 = "0249ncd20x5mf884fd8bw75c3118b9fdml837v4fib349xmrqfrb";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       -
         buildInputs = [ libnice python pygobject2 gupnp_igd libnice ];

     

       15
       15
       +
         buildInputs = [ libnice python pygobject2 gupnp-igd libnice ];

     

       16
       16
        
       

     

       17
       17
        
         nativeBuildInputs = [ pkgconfig ];

     

       18
       18

+1 -1

pkgs/development/libraries/gdk-pixbuf/default.nix

···

       5
       5
        
         ver_maj = "2.36";

     

       6
       6
        
         ver_min = "7";

     

       7
       7
        
         # TODO: since 2.36.8 gdk-pixbuf gets configured to use mime-type sniffing,

     

       8
       8
       -
         # which apparently requires access to shared_mime_info files during runtime.

     

       8
       8
       +
         # which apparently requires access to shared-mime-info files during runtime.

     

       9
       9
        
       in

     

       10
       10
        
       stdenv.mkDerivation rec {

     

       11
       11
        
         name = "gdk-pixbuf-${ver_maj}.${ver_min}";

+2 -2

pkgs/development/libraries/gegl/3.0.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg, which

     

       2
       2
       -
       , librsvg, pango, gtk, bzip2, json_glib, intltool, autoreconfHook, libraw

     

       2
       2
       +
       , librsvg, pango, gtk, bzip2, json-glib, intltool, autoreconfHook, libraw

     

       3
       3
        
       , libwebp, gnome3 }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     
···

       26
       26
        
           libraw libwebp gnome3.gexiv2

     

       27
       27
        
         ];

     

       28
       28
        
       

     

       29
       29
       -
         propagatedBuildInputs = [ glib json_glib babl ]; # for gegl-3.0.pc

     

       29
       29
       +
         propagatedBuildInputs = [ glib json-glib babl ]; # for gegl-3.0.pc

     

       30
       30
        
       

     

       31
       31
        
         nativeBuildInputs = [ pkgconfig intltool which autoreconfHook ];

     

       32
       32

+5 -5

pkgs/development/libraries/geoclue/2.0.nix

···

       1
       1
       -
       { fetchurl, stdenv, intltool, libintlOrEmpty, pkgconfig, glib, json_glib, libsoup, geoip

     

       2
       2
       -
       , dbus, dbus_glib, modemmanager, avahi, glib_networking, wrapGAppsHook

     

       1
       1
       +
       { fetchurl, stdenv, intltool, libintlOrEmpty, pkgconfig, glib, json-glib, libsoup, geoip

     

       2
       2
       +
       , dbus, dbus-glib, modemmanager, avahi, glib-networking, wrapGAppsHook

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       with stdenv.lib;

     
···

       19
       19
        
         ];

     

       20
       20
        
       

     

       21
       21
        
         buildInputs = libintlOrEmpty ++

     

       22
       22
       -
          [ glib json_glib libsoup geoip

     

       23
       23
       -
            dbus dbus_glib avahi

     

       22
       22
       +
          [ glib json-glib libsoup geoip

     

       23
       23
       +
            dbus dbus-glib avahi

     

       24
       24
        
          ] ++ optionals (!stdenv.isDarwin) [ modemmanager ];

     

       25
       25
        
       

     

       26
       26
       -
         propagatedBuildInputs = [ dbus dbus_glib glib glib_networking ];

     

       26
       26
       +
         propagatedBuildInputs = [ dbus dbus-glib glib glib-networking ];

     

       27
       27
        
       

     

       28
       28
        
         preConfigure = ''

     

       29
       29
        
            substituteInPlace configure --replace "-Werror" ""

+4 -4

pkgs/development/libraries/geoclue/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, dbus, dbus_glib, glib, pkgconfig, libxml2, gnome2,

     

       2
       2
       -
         libxslt, glib_networking }:

     

       1
       1
       +
       { stdenv, fetchurl, dbus, dbus-glib, glib, pkgconfig, libxml2, gnome2,

     

       2
       2
       +
         libxslt, glib-networking }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         name = "geoclue-0.12.0";

     
···

       11
       11
        
         outputs = [ "out" "dev" ];

     

       12
       12
        
       

     

       13
       13
        
         nativeBuildInputs = [ pkgconfig ];

     

       14
       14
       -
         buildInputs = [ libxml2 gnome2.GConf libxslt glib_networking ];

     

       14
       14
       +
         buildInputs = [ libxml2 gnome2.GConf libxslt glib-networking ];

     

       15
       15
        
       

     

       16
       16
       -
         propagatedBuildInputs = [dbus glib dbus_glib];

     

       16
       16
       +
         propagatedBuildInputs = [dbus glib dbus-glib];

     

       17
       17
        
       

     

       18
       18
        
         hardeningDisable = [ "format" ];

     

       19
       19

+2 -2

pkgs/development/libraries/glib-networking/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, glib, intltool, gnutls, libproxy

     

       2
       2
       -
       , gsettings_desktop_schemas }:

     

       2
       2
       +
       , gsettings-desktop-schemas }:

     

       3
       3
        
       

     

       4
       4
        
       let

     

       5
       5
        
         ver_maj = "2.54";

     
···

       22
       22
        
         '';

     

       23
       23
        
       

     

       24
       24
        
         nativeBuildInputs = [ pkgconfig intltool ];

     

       25
       25
       -
         propagatedBuildInputs = [ glib gnutls libproxy gsettings_desktop_schemas ];

     

       25
       25
       +
         propagatedBuildInputs = [ glib gnutls libproxy gsettings-desktop-schemas ];

     

       26
       26
        
       

     

       27
       27
        
         NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";

     

       28
       28

+3 -3

pkgs/development/libraries/glib/default.nix

···

       4
       4
        
       , utillinuxMinimal ? null

     

       5
       5
        
       

     

       6
       6
        
       # this is just for tests (not in closure of any regular package)

     

       7
       7
       -
       , coreutils, dbus_daemon, libxml2, tzdata, desktop_file_utils, shared_mime_info, doCheck ? false

     

       7
       7
       +
       , coreutils, dbus_daemon, libxml2, tzdata, desktop-file-utils, shared-mime-info, doCheck ? false

     

       8
       8
        
       }:

     

       9
       9
        
       

     

       10
       10
        
       with stdenv.lib;

     
···

       65
       65
        
       

     

       66
       66
        
         buildInputs = [ libelf setupHook pcre ]

     

       67
       67
        
           ++ optionals stdenv.isLinux [ utillinuxMinimal ] # for libmount

     

       68
       68
       -
           ++ optionals doCheck [ tzdata libxml2 desktop_file_utils shared_mime_info ];

     

       68
       68
       +
           ++ optionals doCheck [ tzdata libxml2 desktop-file-utils shared-mime-info ];

     

       69
       69
        
       

     

       70
       70
        
         nativeBuildInputs = [ pkgconfig gettext perl python ];

     

       71
       71
        
       

     
···

       124
       124
        
           export XDG_CACHE_HOME="$TMP"

     

       125
       125
        
           export XDG_RUNTIME_HOME="$TMP"

     

       126
       126
        
           export HOME="$TMP"

     

       127
       127
       -
           export XDG_DATA_DIRS="${desktop_file_utils}/share:${shared_mime_info}/share"

     

       127
       127
       +
           export XDG_DATA_DIRS="${desktop-file-utils}/share:${shared-mime-info}/share"

     

       128
       128
        
           export G_TEST_DBUS_DAEMON="${dbus_daemon.out}/bin/dbus-daemon"

     

       129
       129
        
           export PATH="$PATH:$(pwd)/gobject"

     

       130
       130
        
           echo "PATH=$PATH"

+2 -2

pkgs/development/libraries/gnutls-kdh/generic.nix

···

       1
       1
        
       { lib, fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip

     

       2
       2
       -
       , guileBindings, guile, perl, gmp, autogen, libidn, p11_kit, unbound, libiconv

     

       2
       2
       +
       , guileBindings, guile, perl, gmp, autogen, libidn, p11-kit, unbound, libiconv

     

       3
       3
        
       , tpmSupport ? true, trousers, nettools, bash, gperftools, gperf, gettext, automake

     

       4
       4
        
       , yacc, texinfo

     

       5
       5
        
       

     
···

       52
       52
        
         # systemkey-args.h.

     

       53
       53
        
         enableParallelBuilding = false;

     

       54
       54
        
       

     

       55
       55
       -
         buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp

     

       55
       55
       +
         buildInputs = [ lzo lzip nettle libtasn1 libidn p11-kit zlib gmp

     

       56
       56
        
         autogen gperftools gperf gettext automake yacc texinfo ]

     

       57
       57
        
           ++ lib.optional doCheck nettools

     

       58
       58
        
           ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv

+2 -2

pkgs/development/libraries/gnutls/generic.nix

···

       1
       1
        
       { lib, fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip

     

       2
       2
       -
       , guileBindings, guile, perl, gmp, autogen, libidn, p11_kit, libiconv

     

       2
       2
       +
       , guileBindings, guile, perl, gmp, autogen, libidn, p11-kit, libiconv

     

       3
       3
        
       , tpmSupport ? false, trousers, which, nettools, libunistring

     

       4
       4
        
       , unbound, dns-root-data, gettext

     

       5
       5
        
       

     
···

       40
       40
        
       

     

       41
       41
        
         enableParallelBuilding = true;

     

       42
       42
        
       

     

       43
       43
       -
         buildInputs = [ lzo lzip libtasn1 libidn p11_kit zlib gmp autogen libunistring unbound ]

     

       43
       43
       +
         buildInputs = [ lzo lzip libtasn1 libidn p11-kit zlib gmp autogen libunistring unbound ]

     

       44
       44
        
           ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv

     

       45
       45
        
           ++ lib.optional stdenv.isDarwin gettext

     

       46
       46
        
           ++ lib.optional (tpmSupport && stdenv.isLinux) trousers

+2 -2

pkgs/development/libraries/gstreamer/validate/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, gstreamer, gst-plugins-base

     

       2
       2
       -
       , python, gobjectIntrospection, json_glib

     

       2
       2
       +
       , python, gobjectIntrospection, json-glib

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     
···

       24
       24
        
         ];

     

       25
       25
        
       

     

       26
       26
        
         buildInputs = [

     

       27
       27
       -
           python json_glib

     

       27
       27
       +
           python json-glib

     

       28
       28
        
         ];

     

       29
       29
        
       

     

       30
       30
        
         propagatedBuildInputs = [ gstreamer gst-plugins-base ];

+4 -4

pkgs/development/libraries/gtk+/3.x.nix

···

       1
       1
        
       { stdenv, fetchurl, fetchpatch, pkgconfig, gettext, perl

     

       2
       2
       -
       , expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, gobjectIntrospection

     

       3
       3
       -
       , xorg, epoxy, json_glib, libxkbcommon, gmp

     

       2
       2
       +
       , expat, glib, cairo, pango, gdk_pixbuf, atk, at-spi2-atk, gobjectIntrospection

     

       3
       3
       +
       , xorg, epoxy, json-glib, libxkbcommon, gmp

     

       4
       4
        
       , waylandSupport ? stdenv.isLinux, wayland, wayland-protocols

     

       5
       5
        
       , xineramaSupport ? stdenv.isLinux

     

       6
       6
        
       , cupsSupport ? stdenv.isLinux, cups ? null

     
···

       38
       38
        
           })

     

       39
       39
        
         ];

     

       40
       40
        
       

     

       41
       41
       -
         buildInputs = [ libxkbcommon epoxy json_glib ];

     

       41
       41
       +
         buildInputs = [ libxkbcommon epoxy json-glib ];

     

       42
       42
        
         propagatedBuildInputs = with xorg; with stdenv.lib;

     

       43
       43
       -
           [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk gnome3.gsettings_desktop_schemas

     

       43
       43
       +
           [ expat glib cairo pango gdk_pixbuf atk at-spi2-atk gnome3.gsettings-desktop-schemas

     

       44
       44
        
             libXrandr libXrender libXcomposite libXi libXcursor libSM libICE ]

     

       45
       45
        
           ++ optionals waylandSupport [ wayland wayland-protocols ]

     

       46
       46
        
           ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Cocoa ])

+2 -2

pkgs/development/libraries/gtk-mac-integration/default.nix

···

       1
       1
       -
       { stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, glib, gtk_doc, gtk, gobjectIntrospection }:

     

       1
       1
       +
       { stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, glib, gtk-doc, gtk, gobjectIntrospection }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "gtk-mac-integration-2.0.8";

     
···

       10
       10
        
           sha256 = "1fbhnvj0rqc3089ypvgnpkp6ad2rr37v5qk38008dgamb9h7f3qs";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
       -
         nativeBuildInputs = [ autoreconfHook pkgconfig gtk_doc gobjectIntrospection ];

     

       13
       13
       +
         nativeBuildInputs = [ autoreconfHook pkgconfig gtk-doc gobjectIntrospection ];

     

       14
       14
        
         buildInputs = [ glib ];

     

       15
       15
        
         propagatedBuildInputs = [ gtk ];

     

       16
       16

+1 -1

pkgs/development/libraries/gvfs/default.nix

···

       27
       27
        
             samba libmtp libcap polkit

     

       28
       28
        
             # ToDo: a ligther version of libsoup to have FTP/HTTP support?

     

       29
       29
        
           ] ++ stdenv.lib.optionals gnomeSupport (with gnome; [

     

       30
       30
       -
             libsoup libgnome_keyring gconf gcr

     

       30
       30
       +
             libsoup libgnome-keyring gconf gcr

     

       31
       31
        
             # ToDo: not working and probably useless until gnome3 from x-updates

     

       32
       32
        
           ]);

     

       33
       33

+2 -2

pkgs/development/libraries/indicator-application/gtk2.nix

···

       1
       1
        
       { stdenv, fetchurl, lib, file

     

       2
       2
        
       , pkgconfig, autoconf

     

       3
       3
       -
       , glib, dbus_glib, json_glib

     

       3
       3
       +
       , glib, dbus-glib, json-glib

     

       4
       4
        
       , gtk2, libindicator-gtk2, libdbusmenu-gtk2, libappindicator-gtk2 }:

     

       5
       5
        
       

     

       6
       6
        
       with lib;

     
···

       17
       17
        
         nativeBuildInputs = [ pkgconfig autoconf ];

     

       18
       18
        
       

     

       19
       19
        
         buildInputs = [

     

       20
       20
       -
           glib dbus_glib json_glib

     

       20
       20
       +
           glib dbus-glib json-glib

     

       21
       21
        
           gtk2 libindicator-gtk2 libdbusmenu-gtk2 libappindicator-gtk2

     

       22
       22
        
         ];

     

       23
       23

+2 -2

pkgs/development/libraries/indicator-application/gtk3.nix

···

       1
       1
        
       { stdenv, fetchurl, lib, file

     

       2
       2
        
       , pkgconfig, autoconf

     

       3
       3
       -
       , glib, dbus_glib, json_glib

     

       3
       3
       +
       , glib, dbus-glib, json-glib

     

       4
       4
        
       , gtk3, libindicator-gtk3, libdbusmenu-gtk3, libappindicator-gtk3 }:

     

       5
       5
        
       

     

       6
       6
        
       with lib;

     
···

       19
       19
        
         nativeBuildInputs = [ pkgconfig autoconf ];

     

       20
       20
        
       

     

       21
       21
        
         buildInputs = [

     

       22
       22
       -
           glib dbus_glib json_glib

     

       22
       22
       +
           glib dbus-glib json-glib

     

       23
       23
        
           gtk3 libindicator-gtk3 libdbusmenu-gtk3 libappindicator-gtk3

     

       24
       24
        
         ];

     

       25
       25

+2 -2

pkgs/development/libraries/kde-frameworks/kcoreaddons.nix

···

       1
       1
        
       {

     

       2
       2
        
         mkDerivation, lib, fetchurl, writeScript,

     

       3
       3
        
         extra-cmake-modules,

     

       4
       4
       -
         qtbase, qttools, shared_mime_info

     

       4
       4
       +
         qtbase, qttools, shared-mime-info

     

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
        
       mkDerivation {

     
···

       11
       11
        
           broken = builtins.compareVersions qtbase.version "5.7.0" < 0;

     

       12
       12
        
         };

     

       13
       13
        
         nativeBuildInputs = [ extra-cmake-modules ];

     

       14
       14
       -
         buildInputs = [ qttools shared_mime_info ];

     

       14
       14
       +
         buildInputs = [ qttools shared-mime-info ];

     

       15
       15
        
         propagatedBuildInputs = [ qtbase ];

     

       16
       16
        
       }

+2 -2

pkgs/development/libraries/kde-frameworks/kservice/default.nix

···

       2
       2
        
         mkDerivation, lib, copyPathsToStore,

     

       3
       3
        
         bison, extra-cmake-modules, flex,

     

       4
       4
        
         kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem,

     

       5
       5
       -
         qtbase, shared_mime_info,

     

       5
       5
       +
         qtbase, shared-mime-info,

     

       6
       6
        
       }:

     

       7
       7
        
       

     

       8
       8
        
       mkDerivation {

     
···

       14
       14
        
           kcrash kdbusaddons ki18n kwindowsystem qtbase

     

       15
       15
        
         ];

     

       16
       16
        
         propagatedBuildInputs = [ kconfig kcoreaddons ];

     

       17
       17
       -
         propagatedUserEnvPkgs = [ shared_mime_info ]; # for kbuildsycoca5

     

       17
       17
       +
         propagatedUserEnvPkgs = [ shared-mime-info ]; # for kbuildsycoca5

     

       18
       18
        
         patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);

     

       19
       19
        
       }

+2 -2

pkgs/development/libraries/keybinder/default.nix

···

       1
       1
        
       { stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, gnome3

     

       2
       2
       -
       , gtk_doc, gtk2, python2Packages, lua, libX11, libXext, libXrender, gobjectIntrospection

     

       2
       2
       +
       , gtk-doc, gtk2, python2Packages, lua, libX11, libXext, libXrender, gobjectIntrospection

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       let

     
···

       16
       16
        
       

     

       17
       17
        
         nativeBuildInputs = [ pkgconfig ];

     

       18
       18
        
         buildInputs = [

     

       19
       19
       -
           autoconf automake libtool gnome3.gnome_common gtk_doc gnome3.gtk3

     

       19
       19
       +
           autoconf automake libtool gnome3.gnome-common gtk-doc gnome3.gtk3

     

       20
       20
        
           python pygobject3 pygtk lua libX11 libXext libXrender gobjectIntrospection gtk2

     

       21
       21
        
         ];

     

       22
       22

+2 -2

pkgs/development/libraries/keybinder3/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, gnome3

     

       2
       2
       -
       , gtk_doc, gtk3, python, lua, libX11, libXext, libXrender, gobjectIntrospection

     

       2
       2
       +
       , gtk-doc, gtk3, python, lua, libX11, libXext, libXrender, gobjectIntrospection

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     
···

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [ pkgconfig ];

     

       17
       17
        
         buildInputs = [

     

       18
       18
       -
           autoconf automake libtool gnome3.gnome_common gtk_doc

     

       18
       18
       +
           autoconf automake libtool gnome3.gnome-common gtk-doc

     

       19
       19
        
           libX11 libXext libXrender gobjectIntrospection gtk3

     

       20
       20
        
         ];

     

       21
       21

+2 -2

pkgs/development/libraries/lasso/default.nix

···

       1
       1
       -
       { stdenv, autoconf, automake, autoreconfHook, fetchurl, glib, gobjectIntrospection, gtk_doc, libtool, libxml2, libxslt, openssl, pkgconfig, python27Packages, xmlsec, zlib }:

     

       1
       1
       +
       { stdenv, autoconf, automake, autoreconfHook, fetchurl, glib, gobjectIntrospection, gtk-doc, libtool, libxml2, libxslt, openssl, pkgconfig, python27Packages, xmlsec, zlib }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
       

     
···

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ autoreconfHook pkgconfig ];

     

       15
       15
       -
         buildInputs = [ autoconf automake glib gobjectIntrospection gtk_doc libtool libxml2 libxslt openssl python27Packages.six xmlsec zlib ];

     

       15
       15
       +
         buildInputs = [ autoconf automake glib gobjectIntrospection gtk-doc libtool libxml2 libxslt openssl python27Packages.six xmlsec zlib ];

     

       16
       16
        
       

     

       17
       17
        
         configurePhase = ''

     

       18
       18
        
           ./configure --with-pkg-config=$PKG_CONFIG_PATH \

+2 -2

pkgs/development/libraries/libaccounts-glib/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitLab, autoconf, automake, glib

     

       2
       2
       -
       , gtk_doc, libtool, libxml2, libxslt, pkgconfig, sqlite }:

     

       2
       2
       +
       , gtk-doc, libtool, libxml2, libxslt, pkgconfig, sqlite }:

     

       3
       3
        
       

     

       4
       4
        
       let version = "1.23"; in

     

       5
       5
        
       stdenv.mkDerivation rec {

     
···

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         buildInputs = [ glib libxml2 libxslt sqlite ];

     

       16
       16
       -
         nativeBuildInputs = [ autoconf automake gtk_doc libtool pkgconfig ];

     

       16
       16
       +
         nativeBuildInputs = [ autoconf automake gtk-doc libtool pkgconfig ];

     

       17
       17
        
       

     

       18
       18
        
         postPatch = ''

     

       19
       19
        
           NOCONFIGURE=1 ./autogen.sh

+2 -2

pkgs/development/libraries/libappindicator/default.nix

···

       2
       2
        
       

     

       3
       3
        
       { stdenv, fetchurl, lib, file

     

       4
       4
        
       , pkgconfig, autoconf

     

       5
       5
       -
       , glib, dbus_glib, gtkVersion

     

       5
       5
       +
       , glib, dbus-glib, gtkVersion

     

       6
       6
        
       , gtk2 ? null, libindicator-gtk2 ? null, libdbusmenu-gtk2 ? null

     

       7
       7
        
       , gtk3 ? null, libindicator-gtk3 ? null, libdbusmenu-gtk3 ? null

     

       8
       8
        
       , python2Packages, gobjectIntrospection, vala

     
···

       33
       33
        
           else [ gtk3 libdbusmenu-gtk3 ];

     

       34
       34
        
       

     

       35
       35
        
         buildInputs = [

     

       36
       36
       -
           glib dbus_glib

     

       36
       36
       +
           glib dbus-glib

     

       37
       37
        
           python pygobject2 pygtk gobjectIntrospection vala

     

       38
       38
        
         ] ++ (if gtkVersion == "2"

     

       39
       39
        
           then [ libindicator-gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ]

+2 -2

pkgs/development/libraries/libaudclient/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, glib, dbus_glib }:

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, glib, dbus-glib }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "libaudclient-3.5-rc2";

     
···

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ pkgconfig ];

     

       13
       13
       -
         buildInputs = [ glib dbus_glib ];

     

       13
       13
       +
         buildInputs = [ glib dbus-glib ];

     

       14
       14
        
       

     

       15
       15
        
         meta = with stdenv.lib; {

     

       16
       16
        
           description = "Legacy D-Bus client library for Audacious";

+2 -2

pkgs/development/libraries/libchamplain/default.nix

···

       1
       1
        
       { fetchurl, stdenv, pkgconfig, glib, gtk3, cairo, clutter, sqlite

     

       2
       2
       -
       , clutter_gtk, libsoup, gobjectIntrospection /*, libmemphis */ }:

     

       2
       2
       +
       , clutter-gtk, libsoup, gobjectIntrospection /*, libmemphis */ }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         major = "0.12";

     
···

       14
       14
        
         nativeBuildInputs = [ pkgconfig ];

     

       15
       15
        
         buildInputs = [ gobjectIntrospection ];

     

       16
       16
        
       

     

       17
       17
       -
         propagatedBuildInputs = [ glib gtk3 cairo clutter_gtk sqlite libsoup ];

     

       17
       17
       +
         propagatedBuildInputs = [ glib gtk3 cairo clutter-gtk sqlite libsoup ];

     

       18
       18
        
       

     

       19
       19
        
         meta = with stdenv.lib; {

     

       20
       20
        
           inherit version;

+4 -4

pkgs/development/libraries/libdbusmenu/default.nix

···

       1
       1
        
       { stdenv, fetchurl, lib, file

     

       2
       2
        
       , pkgconfig, intltool

     

       3
       3
       -
       , glib, dbus_glib, json_glib

     

       4
       4
       -
       , gobjectIntrospection, vala_0_38, gnome_doc_utils

     

       3
       3
       +
       , glib, dbus-glib, json-glib

     

       4
       4
       +
       , gobjectIntrospection, vala_0_38, gnome-doc-utils

     

       5
       5
        
       , gtkVersion ? null, gtk2 ? null, gtk3 ? null }:

     

       6
       6
        
       

     

       7
       7
        
       with lib;

     
···

       21
       21
        
         nativeBuildInputs = [ pkgconfig intltool ];

     

       22
       22
        
       

     

       23
       23
        
         buildInputs = [

     

       24
       24
       -
           glib dbus_glib json_glib

     

       25
       25
       -
           gobjectIntrospection vala_0_38 gnome_doc_utils

     

       24
       24
       +
           glib dbus-glib json-glib

     

       25
       25
       +
           gobjectIntrospection vala_0_38 gnome-doc-utils

     

       26
       26
        
         ] ++ optional (gtkVersion != null) (if gtkVersion == "2" then gtk2 else gtk3);

     

       27
       27
        
       

     

       28
       28
        
         postPatch = ''

+3 -3

pkgs/development/libraries/libgksu/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, wrapGAppsHook, gtk2, gnome2, gnome3,

     

       2
       2
        
         libstartup_notification, libgtop, perl, perlXMLParser,

     

       3
       3
       -
         autoreconfHook, intltool, gtk_doc, docbook_xsl, xauth, sudo

     

       3
       3
       +
         autoreconfHook, intltool, gtk-doc, docbook_xsl, xauth, sudo

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     
···

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [

     

       17
       17
       -
           pkgconfig autoreconfHook intltool gtk_doc docbook_xsl wrapGAppsHook

     

       17
       17
       +
           pkgconfig autoreconfHook intltool gtk-doc docbook_xsl wrapGAppsHook

     

       18
       18
        
         ];

     

       19
       19
        
       

     

       20
       20
        
         buildInputs = [

     

       21
       21
        
           gtk2 gnome2.GConf libstartup_notification

     

       22
       22
       -
           gnome3.libgnome_keyring libgtop gnome2.libglade perl perlXMLParser

     

       22
       22
       +
           gnome3.libgnome-keyring libgtop gnome2.libglade perl perlXMLParser

     

       23
       23
        
         ];

     

       24
       24
        
       

     

       25
       25
        
         enableParallelBuilding = true;

+2 -2

pkgs/development/libraries/libgsystem/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk_doc, gobjectIntrospection

     

       1
       1
       +
       { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, gobjectIntrospection

     

       2
       2
        
       , glib, attr, systemd

     

       3
       3
        
       }:

     

       4
       4
        
       

     
···

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         nativeBuildInputs = [

     

       23
       23
       -
           autoreconfHook pkgconfig gtk_doc gobjectIntrospection

     

       23
       23
       +
           autoreconfHook pkgconfig gtk-doc gobjectIntrospection

     

       24
       24
        
         ];

     

       25
       25
        
       

     

       26
       26
        
         propagatedBuildInputs = [ glib attr systemd ];

+2 -2

pkgs/development/libraries/libhttpseverywhere/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, meson, ninja, valadoc

     

       2
       2
       -
       , gnome3, glib, json_glib, libarchive, libsoup, gobjectIntrospection }:

     

       2
       2
       +
       , gnome3, glib, json-glib, libarchive, libsoup, gobjectIntrospection }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         major = "0.6";

     
···

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [ gnome3.vala gobjectIntrospection meson ninja pkgconfig valadoc ];

     

       17
       17
       -
         buildInputs = [ glib gnome3.libgee json_glib libsoup libarchive ];

     

       17
       17
       +
         buildInputs = [ glib gnome3.libgee json-glib libsoup libarchive ];

     

       18
       18
        
       

     

       19
       19
        
         mesonFlags = "-Denable_valadoc=true";

     

       20
       20

+4 -4

pkgs/development/libraries/libindicate/default.nix

···

       2
       2
        
       

     

       3
       3
        
       { stdenv, fetchurl, lib, file

     

       4
       4
        
       , pkgconfig, autoconf

     

       5
       5
       -
       , glib, dbus_glib, libdbusmenu-glib

     

       5
       5
       +
       , glib, dbus-glib, libdbusmenu-glib

     

       6
       6
        
       , gtkVersion, gtk2 ? null, gtk3 ? null

     

       7
       7
       -
       , pythonPackages, gobjectIntrospection, vala, gnome_doc_utils

     

       7
       7
       +
       , pythonPackages, gobjectIntrospection, vala, gnome-doc-utils

     

       8
       8
        
       , monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null

     

       9
       9
        
        }:

     

       10
       10
        
       

     
···

       24
       24
        
           sha256 = "10am0ymajx633b33anf6b79j37k61z30v9vaf5f9fwk1x5cw1q21";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
       -
         nativeBuildInputs = [ pkgconfig autoconf gobjectIntrospection vala gnome_doc_utils ];

     

       27
       27
       +
         nativeBuildInputs = [ pkgconfig autoconf gobjectIntrospection vala gnome-doc-utils ];

     

       28
       28
        
       

     

       29
       29
        
         buildInputs = [

     

       30
       30
       -
           glib dbus_glib libdbusmenu-glib

     

       30
       30
       +
           glib dbus-glib libdbusmenu-glib

     

       31
       31
        
           python pygobject2 pygtk

     

       32
       32
        
         ] ++ (if gtkVersion == "2"

     

       33
       33
        
           then [ gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ]

+3 -3

pkgs/development/libraries/libmx/default.nix

···

       1
       1
        
       { stdenv, fetchurl

     

       2
       2
        
       , libtool, pkgconfig, automake, autoconf, intltool

     

       3
       3
       -
       , glib, gobjectIntrospection, gtk2, gtk_doc

     

       4
       4
       -
       , clutter, clutter_gtk

     

       3
       3
       +
       , glib, gobjectIntrospection, gtk2, gtk-doc

     

       4
       4
       +
       , clutter, clutter-gtk

     

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     
···

       36
       36
        
           automake autoconf libtool

     

       37
       37
        
           intltool

     

       38
       38
        
           gobjectIntrospection glib

     

       39
       39
       -
           gtk2 gtk_doc clutter clutter_gtk

     

       39
       39
       +
           gtk2 gtk-doc clutter clutter-gtk

     

       40
       40
        
         ];

     

       41
       41
        
       

     

       42
       42
        
         # patch to resolve GL errors

+2 -2

pkgs/development/libraries/libnice/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, glib, gupnp_igd, gst_all_1, gnutls }:

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, glib, gupnp-igd, gst_all_1, gnutls }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "libnice-0.1.14";

     
···

       10
       10
        
       

     

       11
       11
        
         nativeBuildInputs = [ pkgconfig ];

     

       12
       12
        
         buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gnutls ];

     

       13
       13
       -
         propagatedBuildInputs = [ glib gupnp_igd ];

     

       13
       13
       +
         propagatedBuildInputs = [ glib gupnp-igd ];

     

       14
       14
        
       

     

       15
       15
        
         meta = {

     

       16
       16
        
           homepage = https://nice.freedesktop.org/wiki/;

+2 -2

pkgs/development/libraries/libosinfo/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, intltool, gobjectIntrospection, gtk_doc, docbook_xsl

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, intltool, gobjectIntrospection, gtk-doc, docbook_xsl

     

       2
       2
        
       , glib, libsoup, libxml2, libxslt, check, curl, perl, hwdata, osinfo-db, vala ? null

     

       3
       3
        
       }:

     

       4
       4
        
       

     
···

       13
       13
        
         outputs = [ "out" "dev" "devdoc" ];

     

       14
       14
        
       

     

       15
       15
        
         nativeBuildInputs = [

     

       16
       16
       -
           pkgconfig vala intltool gobjectIntrospection gtk_doc docbook_xsl

     

       16
       16
       +
           pkgconfig vala intltool gobjectIntrospection gtk-doc docbook_xsl

     

       17
       17
        
         ] ++ stdenv.lib.optionals doCheck checkInputs;

     

       18
       18
        
         checkInputs = [ check curl perl ];

     

       19
       19
        
         buildInputs = [ glib libsoup libxml2 libxslt ];

+2 -2

pkgs/development/libraries/libpsl/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, autoreconfHook, docbook_xsl, gtk_doc, icu

     

       1
       1
       +
       { stdenv, fetchFromGitHub, autoreconfHook, docbook_xsl, gtk-doc, icu

     

       2
       2
        
       , libxslt, pkgconfig, python2 }:

     

       3
       3
        
       

     

       4
       4
        
       let

     
···

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         buildInputs = [ icu libxslt ];

     

       28
       28
       -
         nativeBuildInputs = [ autoreconfHook docbook_xsl gtk_doc pkgconfig python2 ];

     

       28
       28
       +
         nativeBuildInputs = [ autoreconfHook docbook_xsl gtk-doc pkgconfig python2 ];

     

       29
       29
        
       

     

       30
       30
        
         postPatch = ''

     

       31
       31
        
           substituteInPlace src/psl.c --replace bits/stat.h sys/stat.h

+1 -1

pkgs/development/libraries/libsecret/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, glib, pkgconfig, intltool, libxslt, docbook_xsl, gtk_doc

     

       1
       1
       +
       { stdenv, fetchurl, glib, pkgconfig, intltool, libxslt, docbook_xsl, gtk-doc

     

       2
       2
        
       , libgcrypt, gobjectIntrospection, vala_0_38 }:

     

       3
       3
        
       let

     

       4
       4
        
         version = "0.18.5";

+4 -4

pkgs/development/libraries/libskk/default.nix

···

       1
       1
        
       { stdenv, fetchurl, fetchFromGitHub,

     

       2
       2
        
         libtool, gettext, pkgconfig,

     

       3
       3
       -
         vala, gnome_common, gobjectIntrospection,

     

       4
       4
       -
         libgee, json_glib, skk-dicts }:

     

       3
       3
       +
         vala, gnome-common, gobjectIntrospection,

     

       4
       4
       +
         libgee, json-glib, skk-dicts }:

     

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
        
         name = "libskk-${version}";

     
···

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         buildInputs = [ skk-dicts ];

     

       18
       18
       -
         nativeBuildInputs = [ vala gnome_common gobjectIntrospection libtool gettext pkgconfig ];

     

       19
       19
       -
         propagatedBuildInputs = [ libgee json_glib ];

     

       18
       18
       +
         nativeBuildInputs = [ vala gnome-common gobjectIntrospection libtool gettext pkgconfig ];

     

       19
       19
       +
         propagatedBuildInputs = [ libgee json-glib ];

     

       20
       20
        
       

     

       21
       21
        
         preConfigure = ''

     

       22
       22
        
           ./autogen.sh

+4 -4

pkgs/development/libraries/libsoup/default.nix

···

       1
       1
        
       { stdenv, fetchurl, fetchpatch, glib, libxml2, pkgconfig

     

       2
       2
       -
       , gnomeSupport ? true, libgnome_keyring3, sqlite, glib_networking, gobjectIntrospection

     

       2
       2
       +
       , gnomeSupport ? true, libgnome-keyring3, sqlite, glib-networking, gobjectIntrospection

     

       3
       3
        
       , valaSupport ? true, vala_0_38

     

       4
       4
        
       , libintlOrEmpty

     

       5
       5
        
       , intltool, python }:

     
···

       37
       37
        
           ++ stdenv.lib.optionals valaSupport [ vala_0_38 ];

     

       38
       38
        
         nativeBuildInputs = [ pkgconfig ];

     

       39
       39
        
         propagatedBuildInputs = [ glib libxml2 gobjectIntrospection ]

     

       40
       40
       -
           ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring3 ];

     

       41
       41
       -
         passthru.propagatedUserEnvPackages = [ glib_networking.out ];

     

       40
       40
       +
           ++ stdenv.lib.optionals gnomeSupport [ libgnome-keyring3 ];

     

       41
       41
       +
         passthru.propagatedUserEnvPackages = [ glib-networking.out ];

     

       42
       42
        
       

     

       43
       43
       -
         # glib_networking is a runtime dependency, not a compile-time dependency

     

       43
       43
       +
         # glib-networking is a runtime dependency, not a compile-time dependency

     

       44
       44
        
         configureFlags = "--disable-tls-check"

     

       45
       45
        
           + " --enable-vala=${if valaSupport then "yes" else "no"}"

     

       46
       46
        
           + stdenv.lib.optionalString (!gnomeSupport) " --without-gnome";

+2 -2

pkgs/development/libraries/libunique/3.x.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig

     

       2
       2
       -
       , dbus, dbus_glib, gtk3, gobjectIntrospection

     

       2
       2
       +
       , dbus, dbus-glib, gtk3, gobjectIntrospection

     

       3
       3
        
       , gtkdoc, docbook_xml_dtd_45, docbook_xsl

     

       4
       4
        
       , libxslt, libxml2 }:

     

       5
       5
        
       

     
···

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         nativeBuildInputs = [ pkgconfig ];

     

       21
       21
       -
         buildInputs = [ dbus dbus_glib gtk3 gobjectIntrospection gtkdoc docbook_xml_dtd_45 docbook_xsl libxslt libxml2 ];

     

       21
       21
       +
         buildInputs = [ dbus dbus-glib gtk3 gobjectIntrospection gtkdoc docbook_xml_dtd_45 docbook_xsl libxslt libxml2 ];

     

       22
       22
        
       

     

       23
       23
        
         meta = {

     

       24
       24
        
           homepage = https://wiki.gnome.org/Attic/LibUnique;

+2 -2

pkgs/development/libraries/libunique/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, glib, gtk2, dbus_glib }:

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, glib, gtk2, dbus-glib }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "libunique-1.1.6";

     
···

       17
       17
        
           ++ [ ./gcc7-bug.patch ];

     

       18
       18
        
       

     

       19
       19
        
         nativeBuildInputs = [ pkgconfig ];

     

       20
       20
       -
         buildInputs = [ glib gtk2 dbus_glib ];

     

       20
       20
       +
         buildInputs = [ glib gtk2 dbus-glib ];

     

       21
       21
        
       

     

       22
       22
        
         # don't make deprecated usages hard errors

     

       23
       23
        
         preBuild = ''substituteInPlace unique/dbus/Makefile --replace -Werror ""'';

+1 -1

pkgs/development/libraries/osm-gps-map/default.nix

···

       16
       16
        
         buildInputs = [

     

       17
       17
        
           cairo glib gobjectIntrospection

     

       18
       18
        
         ] ++ (with gnome3; [

     

       19
       19
       -
           gnome_common gtk libsoup

     

       19
       19
       +
           gnome-common gtk libsoup

     

       20
       20
        
         ]);

     

       21
       21
        
       

     

       22
       22
        
         meta = with stdenv.lib; {

+2 -2

pkgs/development/libraries/polkit/default.nix

···

       1
       1
        
       { stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, glib, expat, pam

     

       2
       2
        
       , intltool, spidermonkey_17 , gobjectIntrospection, libxslt, docbook_xsl

     

       3
       3
       -
       , docbook_xml_dtd_412, gtk_doc

     

       3
       3
       +
       , docbook_xml_dtd_412, gtk-doc

     

       4
       4
        
       , useSystemd ? stdenv.isLinux, systemd

     

       5
       5
        
       }:

     

       6
       6
        
       

     
···

       50
       50
        
         outputs = [ "bin" "dev" "out" ]; # small man pages in $bin

     

       51
       51
        
       

     

       52
       52
        
         nativeBuildInputs =

     

       53
       53
       -
           [ gtk_doc pkgconfig autoreconfHook intltool gobjectIntrospection ]

     

       53
       53
       +
           [ gtk-doc pkgconfig autoreconfHook intltool gobjectIntrospection ]

     

       54
       54
        
           ++ [ libxslt docbook_xsl docbook_xml_dtd_412 ]; # man pages

     

       55
       55
        
         buildInputs =

     

       56
       56
        
           [ glib expat pam spidermonkey_17 gobjectIntrospection ]

+2 -2

pkgs/development/libraries/spice-gtk/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, spice_protocol, gettext, celt_0_5_1

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, spice-protocol, gettext, celt_0_5_1

     

       2
       2
        
       , openssl, libpulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib

     

       3
       3
        
       , cyrus_sasl, python2Packages, autoreconfHook, usbredir, libsoup

     

       4
       4
        
       , gtk3, epoxy }:

     
···

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         buildInputs = [

     

       19
       19
       -
           spice_protocol celt_0_5_1 openssl libpulseaudio pixman gobjectIntrospection

     

       19
       19
       +
           spice-protocol celt_0_5_1 openssl libpulseaudio pixman gobjectIntrospection

     

       20
       20
        
           libjpeg_turbo zlib cyrus_sasl python pygtk usbredir gtk3 epoxy

     

       21
       21
        
         ];

     

       22
       22

+2 -2

pkgs/development/libraries/spice/default.nix

···

       1
       1
        
       { stdenv, fetchurl, fetchpatch, pkgconfig, pixman, celt, alsaLib

     

       2
       2
        
       , openssl, libXrandr, libXfixes, libXext, libXrender, libXinerama

     

       3
       3
       -
       , libjpeg, zlib, spice_protocol, python, pyparsing, glib, cyrus_sasl

     

       3
       3
       +
       , libjpeg, zlib, spice-protocol, python, pyparsing, glib, cyrus_sasl

     

       4
       4
        
       , lz4 }:

     

       5
       5
        
       

     

       6
       6
        
       with stdenv.lib;

     
···

       36
       36
        
                         libXrandr libXfixes libXrender libXext libXinerama

     

       37
       37
        
                         python pyparsing glib cyrus_sasl lz4 ];

     

       38
       38
        
       

     

       39
       39
       -
         nativeBuildInputs = [ pkgconfig spice_protocol ];

     

       39
       39
       +
         nativeBuildInputs = [ pkgconfig spice-protocol ];

     

       40
       40
        
       

     

       41
       41
        
         NIX_CFLAGS_COMPILE = "-fno-stack-protector";

     

       42
       42

+2 -2

pkgs/development/libraries/telepathy/farstream/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, telepathy_glib, farstream, dbus_glib }:

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, telepathy-glib, farstream, dbus-glib }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "${pname}-0.6.2";

     
···

       9
       9
        
           sha256 = "02ky12bb92prr5f6xmvmfq4yz2lj33li6nj4829a98hk5pr9k83g";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         propagatedBuildInputs = [ dbus_glib telepathy_glib farstream ];

     

       12
       12
       +
         propagatedBuildInputs = [ dbus-glib telepathy-glib farstream ];

     

       13
       13
        
         nativeBuildInputs = [ pkgconfig ];

     

       14
       14
        
       

     

       15
       15
        
         meta = {

+2 -2

pkgs/development/libraries/telepathy/glib/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, dbus_glib, glib, python2, pkgconfig, libxslt

     

       1
       1
       +
       { stdenv, fetchurl, dbus-glib, glib, python2, pkgconfig, libxslt

     

       2
       2
        
       , gobjectIntrospection, valaSupport ? true, vala_0_38, glibcLocales }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     
···

       11
       11
        
       

     

       12
       12
        
         configureFlags = stdenv.lib.optional valaSupport "--enable-vala-bindings";

     

       13
       13
        
         LC_ALL = "en_US.UTF-8";

     

       14
       14
       -
         propagatedBuildInputs = [dbus_glib glib gobjectIntrospection];

     

       14
       14
       +
         propagatedBuildInputs = [dbus-glib glib gobjectIntrospection];

     

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [ pkgconfig libxslt ] ++ stdenv.lib.optional valaSupport vala_0_38;

     

       17
       17
        
         buildInputs = [ glibcLocales python2 ];

+4 -4

pkgs/development/libraries/telepathy/qt/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, cmake, qtbase, pkgconfig, python2Packages, dbus_glib, dbus_daemon

     

       2
       2
       -
       , telepathy_farstream, telepathy_glib, fetchpatch }:

     

       1
       1
       +
       { stdenv, fetchurl, cmake, qtbase, pkgconfig, python2Packages, dbus-glib, dbus_daemon

     

       2
       2
       +
       , telepathy-farstream, telepathy-glib, fetchpatch }:

     

       3
       3
        
       

     

       4
       4
        
       let

     

       5
       5
        
         inherit (python2Packages) python dbus-python;

     
···

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ cmake pkgconfig python ];

     

       15
       15
       -
         propagatedBuildInputs = [ qtbase telepathy_farstream telepathy_glib ];

     

       16
       16
       -
         buildInputs = [ dbus_glib ];

     

       15
       15
       +
         propagatedBuildInputs = [ qtbase telepathy-farstream telepathy-glib ];

     

       16
       16
       +
         buildInputs = [ dbus-glib ];

     

       17
       17
        
         checkInputs = [ dbus_daemon dbus-python ];

     

       18
       18
        
       

     

       19
       19
        
         patches = [

+2 -2

pkgs/development/libraries/uhttpmock/default.nix

···

       1
       1
       -
       { stdenv, lib, fetchFromGitLab, autoconf, gtk_doc, automake, libtool, pkgconfig, glib, libsoup, gobjectIntrospection }:

     

       1
       1
       +
       { stdenv, lib, fetchFromGitLab, autoconf, gtk-doc, automake, libtool, pkgconfig, glib, libsoup, gobjectIntrospection }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         version="0.5.0";

     
···

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ pkgconfig ];

     

       15
       15
       -
         buildInputs = [ autoconf gtk_doc automake libtool glib libsoup gobjectIntrospection ];

     

       15
       15
       +
         buildInputs = [ autoconf gtk-doc automake libtool glib libsoup gobjectIntrospection ];

     

       16
       16
        
       

     

       17
       17
        
         preConfigure = "./autogen.sh";

     

       18
       18

+2 -2

pkgs/development/libraries/umockdev/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, automake, autoconf, libtool, gtk_doc

     

       1
       1
       +
       { stdenv, fetchFromGitHub, automake, autoconf, libtool, gtk-doc

     

       2
       2
        
       , pkgconfig, glib, systemd, libgudev, vala }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     
···

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         buildInputs = [ glib systemd libgudev ];

     

       16
       16
       -
         nativeBuildInputs = [ automake autoconf libtool gtk_doc pkgconfig vala ];

     

       16
       16
       +
         nativeBuildInputs = [ automake autoconf libtool gtk-doc pkgconfig vala ];

     

       17
       17
        
       

     

       18
       18
        
         preConfigure = "NOCONFIGURE=1 ./autogen.sh";

     

       19
       19

+4 -4

pkgs/development/libraries/webkitgtk/2.18.nix

···

       1
       1
        
       { stdenv, fetchurl, perl, python2, ruby, bison, gperf, cmake

     

       2
       2
        
       , pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls

     

       3
       3
       -
       , gtk3, wayland, libwebp, enchant, xlibs, libxkbcommon, epoxy, at_spi2_core

     

       4
       4
       -
       , libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11_kit

     

       3
       3
       +
       , gtk3, wayland, libwebp, enchant, xlibs, libxkbcommon, epoxy, at-spi2-core

     

       4
       4
       +
       , libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11-kit

     

       5
       5
        
       , libidn, libedit, readline, mesa, libintlOrEmpty

     

       6
       6
        
       , enableGeoLocation ? true, geoclue2, sqlite

     

       7
       7
        
       , enableGtk2Plugins ? false, gtk2 ? null

     
···

       88
       88
        
       

     

       89
       89
        
         buildInputs = libintlOrEmpty ++ [

     

       90
       90
        
           libwebp enchant libnotify gnutls pcre nettle libidn

     

       91
       91
       -
           libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11_kit

     

       92
       92
       -
           sqlite gst-plugins-base gst-plugins-bad libxkbcommon epoxy at_spi2_core

     

       91
       91
       +
           libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11-kit

     

       92
       92
       +
           sqlite gst-plugins-base gst-plugins-bad libxkbcommon epoxy at-spi2-core

     

       93
       93
        
         ] ++ optional enableGeoLocation geoclue2

     

       94
       94
        
           ++ optional enableGtk2Plugins gtk2

     

       95
       95
        
           ++ (with xlibs; [ libXdmcp libXt libXtst ])

+5 -5

pkgs/development/libraries/zeitgeist/default.nix

···

       1
       1
        
       { stdenv, fetchgit, pkgconfig, glib, sqlite, gnome3, vala_0_38

     

       2
       2
       -
       , intltool, libtool, dbus_libs, telepathy_glib

     

       3
       3
       -
       , gtk3, json_glib, librdf_raptor2, dbus_glib

     

       2
       2
       +
       , intltool, libtool, dbus_libs, telepathy-glib

     

       3
       3
       +
       , gtk3, json-glib, librdf_raptor2, dbus-glib

     

       4
       4
        
       , pythonSupport ? true, python2Packages

     

       5
       5
        
       }:

     

       6
       6
        
       

     
···

       18
       18
        
       

     

       19
       19
        
         configureFlags = [ "--with-session-bus-services-dir=$(out)/share/dbus-1/services" ];

     

       20
       20
        
       

     

       21
       21
       -
         nativeBuildInputs = [ pkgconfig gnome3.gnome_common intltool libtool vala_0_38 ];

     

       22
       22
       -
         buildInputs = [ glib sqlite dbus_libs telepathy_glib dbus_glib

     

       23
       23
       -
                         gtk3 json_glib librdf_raptor2 python2Packages.rdflib ];

     

       21
       21
       +
         nativeBuildInputs = [ pkgconfig gnome3.gnome-common intltool libtool vala_0_38 ];

     

       22
       22
       +
         buildInputs = [ glib sqlite dbus_libs telepathy-glib dbus-glib

     

       23
       23
       +
                         gtk3 json-glib librdf_raptor2 python2Packages.rdflib ];

     

       24
       24
        
       

     

       25
       25
        
         prePatch = "patchShebangs .";

     

       26
       26

+2 -2

pkgs/development/python-modules/dbus/default.nix

···

       1
       1
       -
       { lib, fetchurl, buildPythonPackage, python, pkgconfig, dbus, dbus_glib, dbus_tools, isPyPy

     

       1
       1
       +
       { lib, fetchurl, buildPythonPackage, python, pkgconfig, dbus, dbus-glib, dbus_tools, isPyPy

     

       2
       2
        
       , ncurses, pygobject3 }:

     

       3
       3
        
       

     

       4
       4
        
       if isPyPy then throw "dbus-python not supported for interpreter ${python.executable}" else buildPythonPackage rec {

     
···

       15
       15
        
         postPatch = "patchShebangs .";

     

       16
       16
        
       

     

       17
       17
        
         nativeBuildInputs = [ pkgconfig ];

     

       18
       18
       -
         buildInputs = [ dbus dbus_glib ]

     

       18
       18
       +
         buildInputs = [ dbus dbus-glib ]

     

       19
       19
        
           ++ lib.optionals doCheck [ dbus_tools pygobject3 ]

     

       20
       20
        
           # My guess why it's sometimes trying to -lncurses.

     

       21
       21
        
           # It seems not to retain the dependency anyway.

+2 -2

pkgs/development/python-modules/pyatspi/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, at_spi2_core, pythonPackages }:

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, at-spi2-core, pythonPackages }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "pyatspi";

     
···

       13
       13
        
         broken = true;

     

       14
       14
        
       

     

       15
       15
        
         buildInputs = [

     

       16
       16
       -
           at_spi2_core

     

       16
       16
       +
           at-spi2-core

     

       17
       17
        
           pkgconfig

     

       18
       18
        
           pythonPackages.python

     

       19
       19
        
           pythonPackages.pygobject3

+2 -2

pkgs/development/python-modules/pykde4/kdelibs.nix

···

       1
       1
        
       {

     

       2
       2
        
         stdenv, fetchurl,

     

       3
       3
       -
         automoc4, cmake_2_8, libxslt, perl, pkgconfig, shared_mime_info,

     

       3
       3
       +
         automoc4, cmake_2_8, libxslt, perl, pkgconfig, shared-mime-info,

     

       4
       4
        
         attica, docbook_xml_dtd_42, docbook_xsl, giflib,

     

       5
       5
        
         libdbusmenu_qt, libjpeg, phonon, qt4

     

       6
       6
        
       }:

     
···

       16
       16
        
         enableParallelBuilding = true;

     

       17
       17
        
       

     

       18
       18
        
         nativeBuildInputs = [

     

       19
       19
       -
           automoc4 cmake_2_8 libxslt perl pkgconfig shared_mime_info

     

       19
       19
       +
           automoc4 cmake_2_8 libxslt perl pkgconfig shared-mime-info

     

       20
       20
        
         ];

     

       21
       21
        
         buildInputs = [

     

       22
       22
        
           attica giflib libdbusmenu_qt libjpeg

+2 -2

pkgs/development/tools/analysis/massif-visualizer/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         mkDerivation, lib, fetchurl,

     

       3
       3
       -
         extra-cmake-modules, shared_mime_info,

     

       3
       3
       +
         extra-cmake-modules, shared-mime-info,

     

       4
       4
        
         qtsvg, qtxmlpatterns, karchive, kconfig, kcoreaddons, kparts, kio, ki18n,

     

       5
       5
        
         kdiagram, kgraphviewer

     

       6
       6
        
       }:

     
···

       14
       14
        
           sha256 = "0v8z6r9gngzckvqyxjm9kp7hilwfqibyk2f9vag9l98ar0iwr97q";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         nativeBuildInputs = [ extra-cmake-modules shared_mime_info ];

     

       17
       17
       +
         nativeBuildInputs = [ extra-cmake-modules shared-mime-info ];

     

       18
       18
        
       

     

       19
       19
        
         buildInputs = [

     

       20
       20
        
           qtsvg qtxmlpatterns karchive kconfig kcoreaddons kparts kio ki18n

+2 -2

pkgs/development/tools/documentation/gtk-doc/default.nix

···

       1
       1
        
       { stdenv, fetchurl, autoreconfHook, pkgconfig, perl, python, libxml2Python, libxslt, which

     

       2
       2
       -
       , docbook_xml_dtd_43, docbook_xsl, gnome_doc_utils, dblatex, gettext, itstool }:

     

       2
       2
       +
       , docbook_xml_dtd_43, docbook_xsl, gnome-doc-utils, dblatex, gettext, itstool }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         name = "gtk-doc-${version}";

     
···

       19
       19
        
         nativeBuildInputs = [ autoreconfHook ];

     

       20
       20
        
         buildInputs =

     

       21
       21
        
          [ pkgconfig perl python libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl

     

       22
       22
       -
            gnome_doc_utils dblatex gettext which itstool

     

       22
       22
       +
            gnome-doc-utils dblatex gettext which itstool

     

       23
       23
        
          ];

     

       24
       24
        
       

     

       25
       25
        
         configureFlags = "--disable-scrollkeeper";

+2 -2

pkgs/development/tools/misc/eggdbus/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib }:

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, glib, dbus, dbus-glib }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "eggdbus-0.6";

     
···

       9
       9
        
         };

     

       10
       10
        
         

     

       11
       11
        
         nativeBuildInputs = [ pkgconfig ];

     

       12
       12
       -
         buildInputs = [ glib dbus dbus_glib ];

     

       12
       12
       +
         buildInputs = [ glib dbus dbus-glib ];

     

       13
       13
        
       

     

       14
       14
        
         meta = {

     

       15
       15
        
           homepage = https://hal.freedesktop.org/releases/;

+2 -2

pkgs/development/tools/misc/gtkdialog/default.nix

···

       1
       1
       -
       {stdenv, fetchurl, gtk2, pkgconfig, hicolor_icon_theme }:

     

       1
       1
       +
       {stdenv, fetchurl, gtk2, pkgconfig, hicolor-icon-theme }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation {

     

       4
       4
        
         name = "gtkdialog-0.8.3";

     
···

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         nativeBuildInputs = [ pkgconfig ];

     

       12
       12
       -
         buildInputs = [ gtk2 hicolor_icon_theme ];

     

       12
       12
       +
         buildInputs = [ gtk2 hicolor-icon-theme ];

     

       13
       13
        
       

     

       14
       14
        
         meta = {

     

       15
       15
        
           homepage = https://code.google.com/archive/p/gtkdialog/;

+2 -2

pkgs/games/openclonk/default.nix

···

       1
       1
        
       { stdenv, fetchurl, cmake, gnome3, pcre, freetype, glew, gtk3, libjpeg, libpng,

     

       2
       2
        
         SDL, SDL_mixer, libupnp, xorg, pkgconfig, gtest, tinyxml, gmock, readline,

     

       3
       3
       -
         libxkbcommon, epoxy, at_spi2_core, dbus, libxml2,

     

       3
       3
       +
         libxkbcommon, epoxy, at-spi2-core, dbus, libxml2,

     

       4
       4
        
         enableSoundtrack ? false # Enable the "Open Clonk Soundtrack - Explorers Journey" by David Oerther

     

       5
       5
        
       }:

     

       6
       6
        
       

     
···

       29
       29
        
         buildInputs = [

     

       30
       30
        
           cmake gnome3.gtksourceview pcre freetype glew gtk3 libjpeg libpng SDL

     

       31
       31
        
           SDL_mixer libupnp tinyxml xorg.libpthreadstubs libxkbcommon xorg.libXdmcp

     

       32
       32
       -
           pkgconfig gtest gmock readline epoxy at_spi2_core dbus libxml2

     

       32
       32
       +
           pkgconfig gtest gmock readline epoxy at-spi2-core dbus libxml2

     

       33
       33
        
         ];

     

       34
       34
        
       

     

       35
       35
        
         meta = with stdenv.lib; {

+1 -1

pkgs/games/steam/runtime-wrapped.nix

···

       38
       38
        
           libcap

     

       39
       39
        
           SDL2

     

       40
       40
        
           libusb1

     

       41
       41
       -
           dbus_glib

     

       41
       41
       +
           dbus-glib

     

       42
       42
        
           libav

     

       43
       43
        
           atk

     

       44
       44
        
           # Only libraries are needed from those two

+2 -2

pkgs/misc/drivers/xboxdrv/default.nix

···

       1
       1
        
       { stdenv, fetchurl, scons, libX11, pkgconfig

     

       2
       2
       -
       , libusb1, boost, glib, dbus_glib }:

     

       2
       2
       +
       , libusb1, boost, glib, dbus-glib }:

     

       3
       3
        
       

     

       4
       4
        
       let

     

       5
       5
        
         version = "0.8.8";

     
···

       16
       16
        
         '';

     

       17
       17
        
       

     

       18
       18
        
         nativeBuildInputs = [ pkgconfig ];

     

       19
       19
       -
         buildInputs = [ scons libX11 libusb1 boost glib dbus_glib];

     

       19
       19
       +
         buildInputs = [ scons libX11 libusb1 boost glib dbus-glib];

     

       20
       20
        
       

     

       21
       21
        
         meta = with stdenv.lib; {

     

       22
       22
        
           homepage = https://pingus.seul.org/~grumbel/xboxdrv/;

+2 -2

pkgs/misc/emulators/desmume/default.nix

···

       3
       3
        
       , libXmu

     

       4
       4
        
       , lua

     

       5
       5
        
       , agg, alsaLib, soundtouch, openal

     

       6
       6
       -
       , desktop_file_utils

     

       6
       6
       +
       , desktop-file-utils

     

       7
       7
        
       , gtk2, gtkglext, libglade, pangox_compat

     

       8
       8
        
       , mesa_glu, libpcap, SDL, zziplib }:

     

       9
       9
        
       

     
···

       28
       28
        
       

     

       29
       29
        
         buildInputs =

     

       30
       30
        
         [ pkgconfig libtool intltool libXmu lua agg alsaLib soundtouch

     

       31
       31
       -
           openal desktop_file_utils gtk2 gtkglext libglade pangox_compat

     

       31
       31
       +
           openal desktop-file-utils gtk2 gtkglext libglade pangox_compat

     

       32
       32
        
           mesa_glu libpcap SDL zziplib ];

     

       33
       33
        
       

     

       34
       34
        
         configureFlags = [

+1 -1

pkgs/misc/emulators/nestopia/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, SDL2, alsaLib, gtk3, mesa_glu

     

       2
       2
       -
       , makeWrapper, mesa, libarchive, libao, unzip, xdg_utils, gsettings_desktop_schemas

     

       2
       2
       +
       , makeWrapper, mesa, libarchive, libao, unzip, xdg_utils, gsettings-desktop-schemas

     

       3
       3
        
       , epoxy, gdk_pixbuf, gnome3, wrapGAppsHook

     

       4
       4
        
       }:

     

       5
       5

+2 -2

pkgs/misc/screensavers/light-locker/default.nix

···

       8
       8
        
       , libXScrnSaver

     

       9
       9
        
       , libXxf86misc

     

       10
       10
        
       , gtk3

     

       11
       11
       -
       , dbus_glib

     

       11
       11
       +
       , dbus-glib

     

       12
       12
        
       , systemd

     

       13
       13
        
       , wrapGAppsHook

     

       14
       14
        
       }:

     
···

       30
       30
        
       

     

       31
       31
        
         nativeBuildInputs = [ pkgconfig ];

     

       32
       32
        
         buildInputs = [ which xfce.xfce4_dev_tools glib systemd

     

       33
       33
       -
                         libX11 libXScrnSaver libXxf86misc gtk3 dbus_glib wrapGAppsHook ];

     

       33
       33
       +
                         libX11 libXScrnSaver libXxf86misc gtk3 dbus-glib wrapGAppsHook ];

     

       34
       34
        
       

     

       35
       35
        
         preConfigure = ''

     

       36
       36
        
           ./autogen.sh

+1 -1

pkgs/misc/themes/adapta/default.nix

···

       21
       21
        
           inkscape

     

       22
       22
        
           libxml2

     

       23
       23
        
           glib.dev

     

       24
       24
       -
           gnome3.gnome_shell

     

       24
       24
       +
           gnome3.gnome-shell

     

       25
       25
        
         ];

     

       26
       26
        
       

     

       27
       27
        
         buildInputs = [

+1 -1

pkgs/misc/themes/materia-theme/default.nix

···

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ gnome3.glib libxml2 ];

     

       15
       15
        
       

     

       16
       16
       -
         buildInputs = [ gnome3.gnome_themes_standard gdk_pixbuf librsvg ];

     

       16
       16
       +
         buildInputs = [ gnome3.gnome-themes-standard gdk_pixbuf librsvg ];

     

       17
       17
        
       

     

       18
       18
        
         propagatedUserEnvPkgs = [ gtk-engine-murrine ];

     

       19
       19

+7 -7

pkgs/os-specific/linux/firmware/fwupd/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, fetchpatch, gtk_doc, pkgconfig, gobjectIntrospection, intltool

     

       2
       2
       -
       , libgudev, polkit, appstream-glib, gusb, sqlite, libarchive, glib_networking

     

       1
       1
       +
       { stdenv, fetchurl, fetchpatch, gtk-doc, pkgconfig, gobjectIntrospection, intltool

     

       2
       2
       +
       , libgudev, polkit, appstream-glib, gusb, sqlite, libarchive, glib-networking

     

       3
       3
        
       , libsoup, help2man, gpgme, libxslt, elfutils, libsmbios, efivar, glibcLocales

     

       4
       4
        
       , fwupdate, libyaml, valgrind, meson, libuuid, colord, docbook_xml_dtd_43, docbook_xsl

     

       5
       5
       -
       , ninja, gcab, gnutls, python3, wrapGAppsHook, json_glib

     

       6
       6
       -
       , shared_mime_info, umockdev

     

       5
       5
       +
       , ninja, gcab, gnutls, python3, wrapGAppsHook, json-glib

     

       6
       6
       +
       , shared-mime-info, umockdev

     

       7
       7
        
       }:

     

       8
       8
        
       let

     

       9
       9
        
         # Updating? Keep $out/etc synchronized with passthru.filesInstalledToEtc

     
···

       20
       20
        
         outputs = [ "out" "devdoc" "man" "installedTests" ];

     

       21
       21
        
       

     

       22
       22
        
         nativeBuildInputs = [

     

       23
       23
       -
           meson ninja gtk_doc pkgconfig gobjectIntrospection intltool glibcLocales shared_mime_info

     

       23
       23
       +
           meson ninja gtk-doc pkgconfig gobjectIntrospection intltool glibcLocales shared-mime-info

     

       24
       24
        
           valgrind gcab docbook_xml_dtd_43 docbook_xsl help2man libxslt python wrapGAppsHook

     

       25
       25
        
         ];

     

       26
       26
        
         buildInputs = [

     

       27
       27
        
           polkit appstream-glib gusb sqlite libarchive libsoup elfutils libsmbios fwupdate libyaml

     

       28
       28
       -
           libgudev colord gpgme libuuid gnutls glib_networking efivar json_glib umockdev

     

       28
       28
       +
           libgudev colord gpgme libuuid gnutls glib-networking efivar json-glib umockdev

     

       29
       29
        
         ];

     

       30
       30
        
       

     

       31
       31
        
         LC_ALL = "en_US.UTF-8"; # For po/make-images

     
···

       50
       50
        
         doCheck = true;

     

       51
       51
        
       

     

       52
       52
        
         preFixup = ''

     

       53
       53
       -
           gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared_mime_info}/share")

     

       53
       53
       +
           gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share")

     

       54
       54
        
         '';

     

       55
       55
        
       

     

       56
       56
        
         mesonFlags = [

+2 -2

pkgs/os-specific/linux/iio-sensor-proxy/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, autoconf-archive, gettext, libtool, intltool, autoconf, automake

     

       2
       2
       -
       , glib, gtk3, gtk_doc, libgudev, pkgconfig, systemd }:

     

       2
       2
       +
       , glib, gtk3, gtk-doc, libgudev, pkgconfig, systemd }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         name = "iio-sensor-proxy-${version}";

     
···

       21
       21
        
         buildInputs = [

     

       22
       22
        
           glib

     

       23
       23
        
           gtk3

     

       24
       24
       -
           gtk_doc

     

       24
       24
       +
           gtk-doc

     

       25
       25
        
           libgudev

     

       26
       26
        
           systemd

     

       27
       27
        
         ];

+1 -1

pkgs/os-specific/linux/pmount/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, cryptsetup, dbus, dbus_glib, intltool, ntfs3g, utillinux

     

       1
       1
       +
       { stdenv, fetchurl, cryptsetup, dbus, dbus-glib, intltool, ntfs3g, utillinux

     

       2
       2
        
       , mediaDir ? "/media/"

     

       3
       3
        
       , lockDir ? "/var/lock/pmount"

     

       4
       4
        
       , whiteList ? "/etc/pmount.allow"

+2 -2

pkgs/os-specific/linux/pommed/default.nix

···

       3
       3
        
       , fetchurl

     

       4
       4
        
       , pciutils

     

       5
       5
        
       , confuse

     

       6
       6
       -
       , dbus, dbus_glib

     

       6
       6
       +
       , dbus, dbus-glib

     

       7
       7
        
       , alsaLib

     

       8
       8
        
       , audiofile

     

       9
       9
        
       , pkgconfig

     
···

       37
       37
        
           dbus

     

       38
       38
        
           alsaLib

     

       39
       39
        
           audiofile

     

       40
       40
       -
           dbus_glib

     

       40
       40
       +
           dbus-glib

     

       41
       41
        
           pkgconfig

     

       42
       42
        
           gtk2

     

       43
       43
        
           gettext

+2 -2

pkgs/os-specific/linux/prl-tools/default.nix

···

       1
       1
        
       { stdenv, lib, requireFile, makeWrapper, substituteAll, p7zip

     

       2
       2
       -
       , gawk, utillinux, xorg, glib, dbus_glib, zlib

     

       2
       2
       +
       , gawk, utillinux, xorg, glib, dbus-glib, zlib

     

       3
       3
        
       , kernel ? null, libsOnly ? false

     

       4
       4
        
       , undmg, fetchurl

     

       5
       5
        
       }:

     
···

       65
       65
        
       

     

       66
       66
        
         libPath = with xorg;

     

       67
       67
        
                   stdenv.lib.makeLibraryPath ([ stdenv.cc.cc libXrandr libXext libX11 libXcomposite libXinerama ]

     

       68
       68
       -
                   ++ lib.optionals (!libsOnly) [ libXi glib dbus_glib zlib ]);

     

       68
       68
       +
                   ++ lib.optionals (!libsOnly) [ libXi glib dbus-glib zlib ]);

     

       69
       69
        
       

     

       70
       70
        
       

     

       71
       71
        
         installPhase = ''

+2 -2

pkgs/os-specific/linux/shadow/default.nix

···

       1
       1
        
       { stdenv, fetchpatch, fetchFromGitHub, autoreconfHook, libxslt, libxml2

     

       2
       2
       -
       , docbook_xml_dtd_412, docbook_xsl, gnome_doc_utils, flex, bison

     

       2
       2
       +
       , docbook_xml_dtd_412, docbook_xsl, gnome-doc-utils, flex, bison

     

       3
       3
        
       , pam ? null, glibcCross ? null

     

       4
       4
        
       , buildPlatform, hostPlatform

     

       5
       5
        
       }:

     
···

       31
       31
        
       

     

       32
       32
        
         buildInputs = stdenv.lib.optional (pam != null && stdenv.isLinux) pam;

     

       33
       33
        
         nativeBuildInputs = [autoreconfHook libxslt libxml2

     

       34
       34
       -
           docbook_xml_dtd_412 docbook_xsl gnome_doc_utils flex bison

     

       34
       34
       +
           docbook_xml_dtd_412 docbook_xsl gnome-doc-utils flex bison

     

       35
       35
        
           ];

     

       36
       36
        
       

     

       37
       37
        
         patches =

+2 -2

pkgs/os-specific/linux/udisks-glue/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, automake, autoconf, udisks, dbus_glib, glib, confuse }:

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, automake, autoconf, udisks, dbus-glib, glib, confuse }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation {

     

       4
       4
        
         name = "udisks-glue-1.3.5";

     
···

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         nativeBuildInputs = [ pkgconfig ];

     

       12
       12
       -
         buildInputs = [ automake autoconf udisks dbus_glib glib confuse ];

     

       12
       12
       +
         buildInputs = [ automake autoconf udisks dbus-glib glib confuse ];

     

       13
       13
        
       

     

       14
       14
        
         preConfigure = "sh autogen.sh";

     

       15
       15

+2 -2

pkgs/os-specific/linux/udisks/1-default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, sg3_utils, udev, glib, dbus, dbus_glib

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, sg3_utils, udev, glib, dbus, dbus-glib

     

       2
       2
        
       , polkit, parted, lvm2, libatasmart, intltool, libuuid, mdadm

     

       3
       3
        
       , libxslt, docbook_xsl, utillinux, libgudev }:

     

       4
       4
        
       

     
···

       27
       27
        
           '';

     

       28
       28
        
       

     

       29
       29
        
         buildInputs =

     

       30
       30
       -
           [ sg3_utils udev glib dbus dbus_glib polkit parted libgudev

     

       30
       30
       +
           [ sg3_utils udev glib dbus dbus-glib polkit parted libgudev

     

       31
       31
        
             lvm2 libatasmart intltool libuuid libxslt docbook_xsl

     

       32
       32
        
           ];

     

       33
       33

+2 -2

pkgs/os-specific/linux/upower/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, glib, dbus_glib

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, glib, dbus-glib

     

       2
       2
        
       , intltool, libxslt, docbook_xsl, udev, libgudev, libusb1

     

       3
       3
        
       , useSystemd ? true, systemd, gobjectIntrospection

     

       4
       4
        
       }:

     
···

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         buildInputs =

     

       17
       17
       -
           [ dbus_glib intltool libxslt docbook_xsl udev libgudev libusb1 gobjectIntrospection ]

     

       17
       17
       +
           [ dbus-glib intltool libxslt docbook_xsl udev libgudev libusb1 gobjectIntrospection ]

     

       18
       18
        
           ++ stdenv.lib.optional useSystemd systemd;

     

       19
       19
        
       

     

       20
       20
        
         nativeBuildInputs = [ pkgconfig ];

+2 -2

pkgs/os-specific/linux/usbguard/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         stdenv, fetchurl, lib,

     

       3
       3
        
         libxslt, pandoc, pkgconfig,

     

       4
       4
       -
         dbus_glib, libcap_ng, libqb, libseccomp, polkit, protobuf, qtbase, qttools, qtsvg,

     

       4
       4
       +
         dbus-glib, libcap_ng, libqb, libseccomp, polkit, protobuf, qtbase, qttools, qtsvg,

     

       5
       5
        
         libgcrypt ? null,

     

       6
       6
        
         libsodium ? null

     

       7
       7
        
       }:

     
···

       33
       33
        
         ];

     

       34
       34
        
       

     

       35
       35
        
         buildInputs = [

     

       36
       36
       -
           dbus_glib

     

       36
       36
       +
           dbus-glib

     

       37
       37
        
           libcap_ng

     

       38
       38
        
           libqb

     

       39
       39
        
           libseccomp

+2 -2

pkgs/servers/gpsd/default.nix

···

       1
       1
       -
       { fetchurl, stdenv, scons, pkgconfig, dbus, dbus_glib

     

       1
       1
       +
       { fetchurl, stdenv, scons, pkgconfig, dbus, dbus-glib

     

       2
       2
        
       , ncurses, libX11, libXt, libXpm, libXaw, libXext

     

       3
       3
        
       , libusb1, docbook_xml_dtd_412, docbook_xsl, bc

     

       4
       4
        
       , libxslt, xmlto, gpsdUser ? "gpsd", gpsdGroup ? "dialout"

     
···

       22
       22
        
         ];

     

       23
       23
        
       

     

       24
       24
        
         buildInputs = [

     

       25
       25
       -
           python2Packages.python dbus dbus_glib ncurses libX11 libXt libXpm libXaw libXext

     

       25
       25
       +
           python2Packages.python dbus dbus-glib ncurses libX11 libXt libXpm libXaw libXext

     

       26
       26
        
           libxslt libusb1

     

       27
       27
        
         ];

     

       28
       28

+1 -1

pkgs/servers/x11/xorg/default.nix

···

       1
       1
        
       # THIS IS A GENERATED FILE.  DO NOT EDIT!

     

       2
       2
        
       args @ { clangStdenv, fetchurl, fetchgit, fetchpatch, stdenv, pkgconfig, intltool, freetype, fontconfig

     

       3
       3
       -
       , libxslt, expat, libpng, zlib, perl, mesa_drivers, spice_protocol

     

       3
       3
       +
       , libxslt, expat, libpng, zlib, perl, mesa_drivers, spice-protocol

     

       4
       4
        
       , dbus, libuuid, openssl, gperf, m4, libevdev, tradcpp, libinput, mcpp, makeWrapper, autoreconfHook

     

       5
       5
        
       , autoconf, automake, libtool, xmlto, asciidoc, flex, bison, python, mtdev, pixman, ... }: with args;

     

       6
       6

+1 -1

pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl

···

       230
       230
        
       print OUT <<EOF;

     

       231
       231
        
       # THIS IS A GENERATED FILE.  DO NOT EDIT!

     

       232
       232
        
       args @ { clangStdenv, fetchurl, fetchgit, fetchpatch, stdenv, pkgconfig, intltool, freetype, fontconfig

     

       233
       233
       -
       , libxslt, expat, libpng, zlib, perl, mesa_drivers, spice_protocol

     

       233
       233
       +
       , libxslt, expat, libpng, zlib, perl, mesa_drivers, spice-protocol

     

       234
       234
        
       , dbus, libuuid, openssl, gperf, m4, libevdev, tradcpp, libinput, mcpp, makeWrapper, autoreconfHook

     

       235
       235
        
       , autoconf, automake, libtool, xmlto, asciidoc, flex, bison, python, mtdev, pixman, ... }: with args;

     

       236
       236

+1 -1

pkgs/servers/x11/xorg/overrides.nix

···

       390
       390
        
         };

     

       391
       391
        
       

     

       392
       392
        
         xf86videoqxl = attrs: attrs // {

     

       393
       393
       -
           buildInputs =  attrs.buildInputs ++ [ args.spice_protocol ];

     

       393
       393
       +
           buildInputs =  attrs.buildInputs ++ [ args.spice-protocol ];

     

       394
       394
        
         };

     

       395
       395
        
       

     

       396
       396
        
         xf86videosiliconmotion = attrs: attrs // {

+2 -2

pkgs/test/openftd/default.nix

···

       28
       28
        
       { stdenv, fetchurl

     

       29
       29
        
       , zlib, libxml2, libxslt, firefox, openssl, curl

     

       30
       30
        
       , glib, gtk, libgnomeui, libgtkhtml

     

       31
       31
       -
       , pkgconfig, dbus_glib, realCurl, pcre, libsexy, gtkspell, libnotify

     

       31
       31
       +
       , pkgconfig, dbus-glib, realCurl, pcre, libsexy, gtkspell, libnotify

     

       32
       32
        
       }:

     

       33
       33
        
        

     

       34
       34
        
       stdenv.mkDerivation {

     
···

       42
       42
        
       

     

       43
       43
        
         buildInputs = [

     

       44
       44
        
           zlib libxml2 libxslt firefox openssl curl

     

       45
       45
       -
           glib gtk pkgconfig dbus_glib realCurl pcre libsexy libgnomeui gtkspell libnotify libgtkhtml

     

       45
       45
       +
           glib gtk pkgconfig dbus-glib realCurl pcre libsexy libgnomeui gtkspell libnotify libgtkhtml

     

       46
       46
        
         ];

     

       47
       47
        
       

     

       48
       48
        
         configureFlags="--with-libcurl-libraries=${curl.out}/lib --with-libcurl-headers=${curl.dev}/include --with-pcre_libraries=${pcre.out}/lib --with-pcre_headers=${pcre.dev}/include";

+2 -2

pkgs/tools/bluetooth/blueman/default.nix

···

       1
       1
        
       { stdenv, lib, fetchurl, intltool, pkgconfig, pythonPackages, bluez, polkit, gtk3

     

       2
       2
        
       , obex_data_server, xdg_utils, libnotify, dnsmasq, dhcp

     

       3
       3
       -
       , hicolor_icon_theme, librsvg, wrapGAppsHook, gobjectIntrospection

     

       3
       3
       +
       , hicolor-icon-theme, librsvg, wrapGAppsHook, gobjectIntrospection

     

       4
       4
        
       , withPulseAudio ? true, libpulseaudio }:

     

       5
       5
        
       

     

       6
       6
        
       let

     
···

       20
       20
        
           pythonPackages.wrapPython wrapGAppsHook

     

       21
       21
        
         ];

     

       22
       22
        
       

     

       23
       23
       -
         buildInputs = [ bluez gtk3 pythonPackages.python libnotify librsvg hicolor_icon_theme ]

     

       23
       23
       +
         buildInputs = [ bluez gtk3 pythonPackages.python libnotify librsvg hicolor-icon-theme ]

     

       24
       24
        
                       ++ pythonPath

     

       25
       25
        
                       ++ lib.optional withPulseAudio libpulseaudio;

     

       26
       26

+2 -2

pkgs/tools/bluetooth/obex-data-server/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, libusb, glib, dbus_glib, bluez, openobex, dbus_libs }:

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, libusb, glib, dbus-glib, bluez, openobex, dbus_libs }:

     

       2
       2
        
          

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "obex-data-server-0.4.6";

     
···

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         nativeBuildInputs = [ pkgconfig ];

     

       12
       12
       -
         buildInputs = [ libusb glib dbus_glib bluez openobex dbus_libs ];

     

       12
       12
       +
         buildInputs = [ libusb glib dbus-glib bluez openobex dbus_libs ];

     

       13
       13
        
       

     

       14
       14
        
         patches = [ ./obex-data-server-0.4.6-build-fixes-1.patch ];

     

       15
       15

+4 -4

pkgs/tools/cd-dvd/brasero/default.nix

···

       1
       1
        
       { stdenv, lib, fetchurl, pkgconfig, gtk3, itstool, gst_all_1, libxml2, libnotify

     

       2
       2
       -
       , libcanberra_gtk3, intltool, makeWrapper, dvdauthor, libburn, libisofs

     

       3
       3
       -
       , vcdimager, wrapGAppsHook, hicolor_icon_theme }:

     

       2
       2
       +
       , libcanberra-gtk3, intltool, makeWrapper, dvdauthor, libburn, libisofs

     

       3
       3
       +
       , vcdimager, wrapGAppsHook, hicolor-icon-theme }:

     

       4
       4
        
       

     

       5
       5
        
       # libdvdcss is "too old" (in fast "too new"), see https://bugs.launchpad.net/ubuntu/+source/brasero/+bug/611590

     

       6
       6
        
       

     
···

       20
       20
        
       

     

       21
       21
        
         nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook ];

     

       22
       22
        
       

     

       23
       23
       -
         buildInputs = [ gtk3 libxml2 libnotify libcanberra_gtk3 libburn libisofs

     

       24
       24
       -
                         hicolor_icon_theme

     

       23
       23
       +
         buildInputs = [ gtk3 libxml2 libnotify libcanberra-gtk3 libburn libisofs

     

       24
       24
       +
                         hicolor-icon-theme

     

       25
       25
        
                         gst_all_1.gstreamer gst_all_1.gst-plugins-base

     

       26
       26
        
                         gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad

     

       27
       27
        
                         gst_all_1.gst-plugins-ugly gst_all_1.gst-libav ];

+2 -2

pkgs/tools/graphics/gromit-mpx/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, autoreconfHook, autoconf, automake, pkgconfig

     

       2
       2
        
       , gtk, glib, pcre, libappindicator, libpthreadstubs, libXdmcp

     

       3
       3
       -
       , libxkbcommon, epoxy, at_spi2_core, dbus, libdbusmenu-glib

     

       3
       3
       +
       , libxkbcommon, epoxy, at-spi2-core, dbus, libdbusmenu-glib

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     
···

       18
       18
        
         buildInputs = [

     

       19
       19
        
           autoconf automake autoreconfHook

     

       20
       20
        
           gtk glib pcre libappindicator libpthreadstubs

     

       21
       21
       -
           libXdmcp libxkbcommon epoxy at_spi2_core

     

       21
       21
       +
           libXdmcp libxkbcommon epoxy at-spi2-core

     

       22
       22
        
           dbus libdbusmenu-glib

     

       23
       23
        
         ];

     

       24
       24

+2 -2

pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, cmake, pkgconfig, fcitx, librime, brise, hicolor_icon_theme }:

     

       1
       1
       +
       { stdenv, fetchurl, cmake, pkgconfig, fcitx, librime, brise, hicolor-icon-theme }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "fcitx-rime-${version}";

     
···

       9
       9
        
           sha256 = "0bd8snfa6jr8dhnm0s0z021iryh5pbaf7p15rhkgbigw2pssczpr";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = [ cmake pkgconfig fcitx librime brise hicolor_icon_theme ];

     

       12
       12
       +
         buildInputs = [ cmake pkgconfig fcitx librime brise hicolor-icon-theme ];

     

       13
       13
        
       

     

       14
       14
        
         # cmake cannont automatically find our nonstandard brise install location

     

       15
       15
        
         cmakeFlags = [ "-DRIME_DATA_DIR=${brise}/share/rime-data" ];

+4 -4

pkgs/tools/inputmethods/ibus/default.nix

···

       1
       1
        
       { stdenv, fetchurl, fetchFromGitHub, autoreconfHook, gconf, intltool, makeWrapper, pkgconfig

     

       2
       2
        
       , vala, wrapGAppsHook, atk, dbus, dconf ? null, glib, gdk_pixbuf, gobjectIntrospection, gtk2

     

       3
       3
       -
       , gtk3, gtk_doc, isocodes, python3, json_glib, libnotify ? null, enablePythonLibrary ? true

     

       3
       3
       +
       , gtk3, gtk-doc, isocodes, python3, json-glib, libnotify ? null, enablePythonLibrary ? true

     

       4
       4
        
       , enableUI ? true, withWayland ? false, libxkbcommon ? null, wayland ? null }:

     

       5
       5
        
       

     

       6
       6
        
       assert withWayland -> wayland != null && libxkbcommon != null;

     
···

       76
       76
        
           substituteInPlace data/dconf/Makefile.am --replace "dconf update" true

     

       77
       77
        
           substituteInPlace configure.ac --replace '$python2dir/ibus' $out/${python3.sitePackages}/ibus

     

       78
       78
        
           echo \#!${stdenv.shell} > data/dconf/make-dconf-override-db.sh

     

       79
       79
       -
           cp ${gtk_doc}/share/gtk-doc/data/gtk-doc.make .

     

       79
       79
       +
           cp ${gtk-doc}/share/gtk-doc/data/gtk-doc.make .

     

       80
       80
        
         '';

     

       81
       81
        
       

     

       82
       82
        
         preAutoreconf = "touch ChangeLog";

     
···

       97
       97
        
         nativeBuildInputs = [

     

       98
       98
        
           autoreconfHook

     

       99
       99
        
           gconf

     

       100
       100
       -
           gtk_doc

     

       100
       100
       +
           gtk-doc

     

       101
       101
        
           intltool

     

       102
       102
        
           makeWrapper

     

       103
       103
        
           pkgconfig

     
···

       116
       116
        
           gtk2

     

       117
       117
        
           gtk3

     

       118
       118
        
           isocodes

     

       119
       119
       -
           json_glib

     

       119
       119
       +
           json-glib

     

       120
       120
        
           libnotify

     

       121
       121
        
         ] ++ optionals withWayland [

     

       122
       122
        
           libxkbcommon

+4 -4

pkgs/tools/inputmethods/ibus/wrapper.nix

···

       1
       1
        
       { stdenv, runCommand, makeWrapper, lndir

     

       2
       2
       -
       , dconf, hicolor_icon_theme, ibus, librsvg, plugins

     

       2
       2
       +
       , dconf, hicolor-icon-theme, ibus, librsvg, plugins

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       let

     
···

       7
       7
        
         env = {

     

       8
       8
        
           buildInputs = [ ibus ] ++ plugins;

     

       9
       9
        
           nativeBuildInputs = [ lndir makeWrapper ];

     

       10
       10
       -
           propagatedUserEnvPackages = [ hicolor_icon_theme ];

     

       10
       10
       +
           propagatedUserEnvPackages = [ hicolor-icon-theme ];

     

       11
       11
        
           paths = [ ibus ] ++ plugins;

     

       12
       12
        
           inherit (ibus) meta;

     

       13
       13
        
         };

     
···

       37
       37
        
                 --set IBUS_TABLE_LOCATION "$out/share/ibus-table" \

     

       38
       38
        
                 --prefix PYTHONPATH : "$PYTHONPATH" \

     

       39
       39
        
                 --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \

     

       40
       40
       -
                 --suffix XDG_DATA_DIRS : "${hicolor_icon_theme}/share"

     

       40
       40
       +
                 --suffix XDG_DATA_DIRS : "${hicolor-icon-theme}/share"

     

       41
       41
        
           done

     

       42
       42
        
       

     

       43
       43
        
           for prog in ibus-daemon; do

     
···

       56
       56
        
                 --set IBUS_TABLE_LOCATION "$out/share/ibus-table" \

     

       57
       57
        
                 --prefix PYTHONPATH : "$PYTHONPATH" \

     

       58
       58
        
                 --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \

     

       59
       59
       -
                 --suffix XDG_DATA_DIRS : "${hicolor_icon_theme}/share" \

     

       59
       59
       +
                 --suffix XDG_DATA_DIRS : "${hicolor-icon-theme}/share" \

     

       60
       60
        
                 --add-flags "--cache=refresh"

     

       61
       61
        
           done

     

       62
       62
        
         '';

+2 -2

pkgs/tools/misc/gparted/default.nix

···

       1
       1
        
       { stdenv, fetchurl, intltool, gettext, makeWrapper

     

       2
       2
       -
       , parted, glib, libuuid, pkgconfig, gtkmm2, libxml2, hicolor_icon_theme

     

       2
       2
       +
       , parted, glib, libuuid, pkgconfig, gtkmm2, libxml2, hicolor-icon-theme

     

       3
       3
        
       , gpart, hdparm, procps, utillinux

     

       4
       4
        
       }:

     

       5
       5
        
       

     
···

       13
       13
        
       

     

       14
       14
        
         configureFlags = [ "--disable-doc" ];

     

       15
       15
        
       

     

       16
       16
       -
         buildInputs = [ parted glib libuuid gtkmm2 libxml2 hicolor_icon_theme ];

     

       16
       16
       +
         buildInputs = [ parted glib libuuid gtkmm2 libxml2 hicolor-icon-theme ];

     

       17
       17
        
         nativeBuildInputs = [ intltool gettext makeWrapper pkgconfig ];

     

       18
       18
        
       

     

       19
       19
        
         postInstall = ''

+2 -2

pkgs/tools/misc/mdbtools/git.nix

···

       1
       1
        
       { stdenv, fetchgit, glib, readline, bison, flex, pkgconfig,

     

       2
       2
       -
         libiconv, autoreconfHook, which, txt2man, gnome_doc_utils, scrollkeeper }:

     

       2
       2
       +
         libiconv, autoreconfHook, which, txt2man, gnome-doc-utils, scrollkeeper }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation {

     

       5
       5
        
         name = "mdbtools-git-2014-07-25";

     
···

       13
       13
        
         nativeBuildInputs = [ pkgconfig ];

     

       14
       14
        
         buildInputs = [

     

       15
       15
        
           glib readline bison flex autoreconfHook which txt2man

     

       16
       16
       -
           gnome_doc_utils scrollkeeper libiconv

     

       16
       16
       +
           gnome-doc-utils scrollkeeper libiconv

     

       17
       17
        
         ];

     

       18
       18
        
       

     

       19
       19
        
         preAutoreconf = ''

+3 -3

pkgs/tools/misc/mimeo/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, desktop_file_utils, file, python3Packages }:

     

       1
       1
       +
       { stdenv, fetchurl, desktop-file-utils, file, python3Packages }:

     

       2
       2
        
       

     

       3
       3
        
       python3Packages.buildPythonApplication rec {

     

       4
       4
        
         name = "mimeo-${version}";

     
···

       9
       9
        
           sha256 = "126g3frks6zn6yc1r005qpmxg1pvvvf06ivpyvd9xribn2mwki2z";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = [ file desktop_file_utils ];

     

       12
       12
       +
         buildInputs = [ file desktop-file-utils ];

     

       13
       13
        
       

     

       14
       14
        
         propagatedBuildInputs = [ python3Packages.pyxdg ];

     

       15
       15
        
       

     

       16
       16
        
         preConfigure = ''

     

       17
       17
        
           substituteInPlace Mimeo.py \

     

       18
       18
        
             --replace "EXE_UPDATE_DESKTOP_DATABASE = 'update-desktop-database'" \

     

       19
       19
       -
                       "EXE_UPDATE_DESKTOP_DATABASE = '${desktop_file_utils}/bin/update-desktop-database'" \

     

       19
       19
       +
                       "EXE_UPDATE_DESKTOP_DATABASE = '${desktop-file-utils}/bin/update-desktop-database'" \

     

       20
       20
        
             --replace "EXE_FILE = 'file'" \

     

       21
       21
        
                       "EXE_FILE = '${file}/bin/file'"

     

       22
       22
        
         '';

+2 -2

pkgs/tools/misc/ostree/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk_doc, gobjectIntrospection

     

       1
       1
       +
       { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, gobjectIntrospection

     

       2
       2
        
       , libgsystem, xz, e2fsprogs, libsoup, gpgme, which, autoconf, automake, libtool, fuse

     

       3
       3
        
       , libarchive, libcap, bzip2, yacc, libxslt, docbook_xsl, docbook_xml_dtd_42

     

       4
       4
        
       }:

     
···

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
        
         nativeBuildInputs = [

     

       33
       33
       -
           autoconf automake libtool pkgconfig gtk_doc gobjectIntrospection which yacc

     

       33
       33
       +
           autoconf automake libtool pkgconfig gtk-doc gobjectIntrospection which yacc

     

       34
       34
        
           libxslt docbook_xsl docbook_xml_dtd_42

     

       35
       35
        
         ];

     

       36
       36

+2 -2

pkgs/tools/misc/parcellite/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, autoreconfHook

     

       2
       2
       -
       , gtk2, hicolor_icon_theme, intltool, pkgconfig

     

       2
       2
       +
       , gtk2, hicolor-icon-theme, intltool, pkgconfig

     

       3
       3
        
       , which, wrapGAppsHook, xdotool }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     
···

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [ autoreconfHook intltool pkgconfig wrapGAppsHook ];

     

       17
       17
       -
         buildInputs = [ gtk2 hicolor_icon_theme ];

     

       17
       17
       +
         buildInputs = [ gtk2 hicolor-icon-theme ];

     

       18
       18
        
       

     

       19
       19
        
         preFixup = ''

     

       20
       20
        
           # Need which and xdotool on path to fix auto-pasting.

+2 -2

pkgs/tools/misc/rmlint/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub,

     

       2
       2
       -
         gettext, glib, json_glib, libelf, pkgconfig, scons, sphinx, utillinux }:

     

       2
       2
       +
         gettext, glib, json-glib, libelf, pkgconfig, scons, sphinx, utillinux }:

     

       3
       3
        
       

     

       4
       4
        
       with stdenv.lib;

     

       5
       5
        
       stdenv.mkDerivation rec {

     
···

       16
       16
        
         configurePhase = "scons config";

     

       17
       17
        
       

     

       18
       18
        
         nativeBuildInputs = [ pkgconfig ];

     

       19
       19
       -
         buildInputs = [ gettext glib json_glib libelf scons sphinx utillinux ];

     

       19
       19
       +
         buildInputs = [ gettext glib json-glib libelf scons sphinx utillinux ];

     

       20
       20
        
       

     

       21
       21
        
         buildPhase = "scons";

     

       22
       22

+2 -2

pkgs/tools/misc/rpm-ostree/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, ostree, rpm, which, autoconf, automake, libtool, pkgconfig,

     

       2
       2
       -
         libcap, glib, libgsystem, json_glib, libarchive, libsolv, librepo, gtk_doc, elfutils,

     

       2
       2
       +
         libcap, glib, libgsystem, json-glib, libarchive, libsolv, librepo, gtk-doc, elfutils,

     

       3
       3
        
         gperf, cmake, pcre, check, python, libxslt, docbook_xsl, docbook_xml_dtd_42, acl }:

     

       4
       4
        
       

     

       5
       5
        
       let

     
···

       31
       31
        
         nativeBuildInputs = [ pkgconfig ];

     

       32
       32
        
         buildInputs = [

     

       33
       33
        
           which autoconf automake libtool libcap ostree rpm glib libgsystem gperf

     

       34
       34
       -
           json_glib libarchive libsolv librepo gtk_doc libxslt docbook_xsl docbook_xml_dtd_42

     

       34
       34
       +
           json-glib libarchive libsolv librepo gtk-doc libxslt docbook_xsl docbook_xml_dtd_42

     

       35
       35
        
           cmake pcre check python

     

       36
       36
        
           # FIXME: get rid of this once libarchive properly propagates this

     

       37
       37
        
           acl

+4 -4

pkgs/tools/misc/system-config-printer/default.nix

···

       1
       1
        
       { stdenv, fetchurl, udev, intltool, pkgconfig, glib, xmlto, wrapGAppsHook

     

       2
       2
        
       , makeWrapper, gtk3, docbook_xml_dtd_412, docbook_xsl

     

       3
       3
       -
       , libxml2, desktop_file_utils, libusb1, cups, gdk_pixbuf, pango, atk, libnotify

     

       4
       4
       -
       , gobjectIntrospection, libgnome_keyring3

     

       3
       3
       +
       , libxml2, desktop-file-utils, libusb1, cups, gdk_pixbuf, pango, atk, libnotify

     

       4
       4
       +
       , gobjectIntrospection, libgnome-keyring3

     

       5
       5
        
       , cups-filters

     

       6
       6
        
       , pythonPackages

     

       7
       7
        
       , withGUI ? true

     
···

       20
       20
        
       

     

       21
       21
        
         buildInputs =

     

       22
       22
        
           [ intltool pkgconfig glib udev libusb1 cups xmlto

     

       23
       23
       -
             libxml2 docbook_xml_dtd_412 docbook_xsl desktop_file_utils

     

       23
       23
       +
             libxml2 docbook_xml_dtd_412 docbook_xsl desktop-file-utils

     

       24
       24
        
             pythonPackages.python pythonPackages.wrapPython

     

       25
       25
        
             libnotify gobjectIntrospection gdk_pixbuf pango atk

     

       26
       26
       -
             libgnome_keyring3

     

       26
       26
       +
             libgnome-keyring3

     

       27
       27
        
           ];

     

       28
       28
        
       

     

       29
       29
        
         nativeBuildInputs = [ wrapGAppsHook ];

+2 -2

pkgs/tools/misc/yad/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, intltool, gtk2, hicolor_icon_theme

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, intltool, gtk2, hicolor-icon-theme

     

       2
       2
        
       , wrapGAppsHook }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     
···

       16
       16
        
         # for gcc5: c11 inline semantics breaks the build

     

       17
       17
        
         NIX_CFLAGS_COMPILE = "-fgnu89-inline";

     

       18
       18
        
       

     

       19
       19
       -
         buildInputs = [ gtk2 hicolor_icon_theme ];

     

       19
       19
       +
         buildInputs = [ gtk2 hicolor-icon-theme ];

     

       20
       20
        
       

     

       21
       21
        
         nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ];

     

       22
       22

+3 -3

pkgs/tools/networking/gupnp-tools/default.nix

···

       1
       1
       -
       {fetchurl, stdenv, gupnp, gssdp, pkgconfig, gtk3, libuuid, intltool, gupnp_av, gnome3, gnome2, makeWrapper}:

     

       1
       1
       +
       {fetchurl, stdenv, gupnp, gssdp, pkgconfig, gtk3, libuuid, intltool, gupnp-av, gnome3, gnome2, makeWrapper}:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "gupnp-tools-${version}";

     
···

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ pkgconfig ];

     

       13
       13
       -
         buildInputs = [gupnp libuuid gssdp gtk3 intltool gupnp_av

     

       13
       13
       +
         buildInputs = [gupnp libuuid gssdp gtk3 intltool gupnp-av

     

       14
       14
        
                        gnome2.gnome_icon_theme makeWrapper];

     

       15
       15
        
       

     

       16
       16
        
         postInstall = ''

     

       17
       17
        
           for program in gupnp-av-cp gupnp-universal-cp; do

     

       18
       18
        
             wrapProgram "$out/bin/$program" \

     

       19
       19
       -
               --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:${gnome2.gnome_icon_theme}/share:$out/share"

     

       19
       19
       +
               --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome-themes-standard}/share:${gnome2.gnome_icon_theme}/share:$out/share"

     

       20
       20
        
           done

     

       21
       21
        
         '';

     

       22
       22

+2 -2

pkgs/tools/networking/megatools/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, glib, fuse, curl, glib_networking

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, glib, fuse, curl, glib-networking

     

       2
       2
        
       , asciidoc, wrapGAppsHook }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     
···

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         nativeBuildInputs = [ pkgconfig wrapGAppsHook asciidoc ];

     

       14
       14
       -
         buildInputs = [ glib glib_networking fuse curl ];

     

       14
       14
       +
         buildInputs = [ glib glib-networking fuse curl ];

     

       15
       15
        
       

     

       16
       16
        
         meta = with stdenv.lib; {

     

       17
       17
        
           description = "Command line client for Mega.co.nz";

+2 -2

pkgs/tools/networking/modemmanager/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, udev, libgudev, polkit, dbus_glib, ppp, intltool, pkgconfig

     

       1
       1
       +
       { stdenv, fetchurl, udev, libgudev, polkit, dbus-glib, ppp, intltool, pkgconfig

     

       2
       2
        
       , libmbim, libqmi, systemd }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     
···

       12
       12
        
       

     

       13
       13
        
         nativeBuildInputs = [ intltool pkgconfig ];

     

       14
       14
        
       

     

       15
       15
       -
         buildInputs = [ udev libgudev polkit dbus_glib ppp libmbim libqmi systemd ];

     

       15
       15
       +
         buildInputs = [ udev libgudev polkit dbus-glib ppp libmbim libqmi systemd ];

     

       16
       16
        
       

     

       17
       17
        
         configureFlags = [

     

       18
       18
        
           "--with-polkit"

+7 -7

pkgs/tools/networking/network-manager-applet/default.nix

···

       1
       1
        
       { stdenv, fetchurl, intltool, pkgconfig, libglade, networkmanager, gnome3

     

       2
       2
        
       , libnotify, libsecret, polkit, isocodes, modemmanager

     

       3
       3
       -
       , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas

     

       4
       4
       -
       , udev, libgudev, hicolor_icon_theme, jansson, wrapGAppsHook, webkitgtk

     

       3
       3
       +
       , mobile-broadband-provider-info, glib-networking, gsettings-desktop-schemas

     

       4
       4
       +
       , udev, libgudev, hicolor-icon-theme, jansson, wrapGAppsHook, webkitgtk

     

       5
       5
        
       , libindicator-gtk3, libappindicator-gtk3, withGnome ? false }:

     

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     
···

       24
       24
        
         outputs = [ "out" "dev" ];

     

       25
       25
        
       

     

       26
       26
        
         buildInputs = [

     

       27
       27
       -
           gnome3.gtk libglade networkmanager libnotify libsecret gsettings_desktop_schemas

     

       28
       28
       -
           polkit isocodes udev libgudev gnome3.libgnome_keyring

     

       29
       29
       -
           modemmanager jansson glib_networking

     

       27
       27
       +
           gnome3.gtk libglade networkmanager libnotify libsecret gsettings-desktop-schemas

     

       28
       28
       +
           polkit isocodes udev libgudev gnome3.libgnome-keyring

     

       29
       29
       +
           modemmanager jansson glib-networking

     

       30
       30
        
           libindicator-gtk3 libappindicator-gtk3

     

       31
       31
        
         ] ++ stdenv.lib.optional withGnome webkitgtk;

     

       32
       32
        
       

     

       33
       33
        
         nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ];

     

       34
       34
        
       

     

       35
       35
       -
         propagatedUserEnvPkgs = [ gnome3.gnome_keyring hicolor_icon_theme ];

     

       35
       35
       +
         propagatedUserEnvPkgs = [ gnome3.gnome-keyring hicolor-icon-theme ];

     

       36
       36
        
       

     

       37
       37
        
         makeFlags = [

     

       38
       38
       -
           ''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile_broadband_provider_info}/share/mobile-broadband-provider-info/serviceproviders.xml\"''

     

       38
       38
       +
           ''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile-broadband-provider-info}/share/mobile-broadband-provider-info/serviceproviders.xml\"''

     

       39
       39
        
         ];

     

       40
       40
        
       

     

       41
       41
        
         preInstall = ''

+2 -2

pkgs/tools/networking/network-manager/0.9.8/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, intltool, pkgconfig, dbus_glib

     

       1
       1
       +
       { stdenv, fetchurl, intltool, pkgconfig, dbus-glib

     

       2
       2
        
       , udev, libnl, libuuid, gnutls, dhcp

     

       3
       3
        
       , libgcrypt, perl, libgudev, avahi, ppp, kmod }:

     

       4
       4
        
       

     
···

       41
       41
        
       

     

       42
       42
        
         buildInputs = [ udev libnl libuuid gnutls libgcrypt libgudev ];

     

       43
       43
        
       

     

       44
       44
       -
         propagatedBuildInputs = [ dbus_glib ];

     

       44
       44
       +
         propagatedBuildInputs = [ dbus-glib ];

     

       45
       45
        
       

     

       46
       46
        
         nativeBuildInputs = [ intltool pkgconfig ];

     

       47
       47

+2 -2

pkgs/tools/networking/network-manager/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, intltool, pkgconfig, dbus_glib

     

       1
       1
       +
       { stdenv, fetchurl, intltool, pkgconfig, dbus-glib

     

       2
       2
        
       , systemd, libgudev, libnl, libuuid, polkit, gnutls, ppp, dhcp, iptables

     

       3
       3
        
       , libgcrypt, dnsmasq, bluez5, readline

     

       4
       4
        
       , gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup

     
···

       81
       81
        
         buildInputs = [ systemd libgudev libnl libuuid polkit ppp libndp curl

     

       82
       82
        
                         bluez5 dnsmasq gobjectIntrospection modemmanager readline newt libsoup jansson ];

     

       83
       83
        
       

     

       84
       84
       -
         propagatedBuildInputs = [ dbus_glib gnutls libgcrypt python3Packages.pygobject3 ];

     

       84
       84
       +
         propagatedBuildInputs = [ dbus-glib gnutls libgcrypt python3Packages.pygobject3 ];

     

       85
       85
        
       

     

       86
       86
        
         nativeBuildInputs = [ autoreconfHook intltool pkgconfig libxslt docbook_xsl ];

     

       87
       87

+1 -1

pkgs/tools/networking/network-manager/fortisslvpn.nix

···

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         buildInputs = [ openfortivpn networkmanager ppp libtool libsecret ]

     

       16
       16
       -
           ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring gnome3.gconf gnome3.networkmanagerapplet ];

     

       16
       16
       +
           ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring gnome3.gconf gnome3.networkmanagerapplet ];

     

       17
       17
        
       

     

       18
       18
        
         nativeBuildInputs = [ automake autoconf intltool pkgconfig ];

     

       19
       19

+1 -1

pkgs/tools/networking/network-manager/iodine.nix

···

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         buildInputs = [ iodine networkmanager libsecret ]

     

       16
       16
       -
           ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring

     

       16
       16
       +
           ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring

     

       17
       17
        
                                               gnome3.networkmanagerapplet ];

     

       18
       18
        
       

     

       19
       19
        
         nativeBuildInputs = [ intltool pkgconfig ];

+1 -1

pkgs/tools/networking/network-manager/l2tp.nix

···

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         buildInputs = [ networkmanager ppp libsecret ]

     

       18
       18
       -
           ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring networkmanagerapplet ];

     

       18
       18
       +
           ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring networkmanagerapplet ];

     

       19
       19
        
       

     

       20
       20
        
         nativeBuildInputs = [ autoreconfHook libtool intltool pkgconfig ];

     

       21
       21

+1 -1

pkgs/tools/networking/network-manager/openconnect.nix

···

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         buildInputs = [ openconnect networkmanager libsecret ]

     

       16
       16
       -
           ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring gnome3.gconf ];

     

       16
       16
       +
           ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring gnome3.gconf ];

     

       17
       17
        
       

     

       18
       18
        
         nativeBuildInputs = [ intltool pkgconfig ];

     

       19
       19

+1 -1

pkgs/tools/networking/network-manager/openvpn.nix

···

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         buildInputs = [ openvpn networkmanager libsecret ]

     

       16
       16
       -
           ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring

     

       16
       16
       +
           ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring

     

       17
       17
        
                                               gnome3.networkmanagerapplet ];

     

       18
       18
        
       

     

       19
       19
        
         nativeBuildInputs = [ intltool pkgconfig ];

+1 -1

pkgs/tools/networking/network-manager/pptp.nix

···

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         buildInputs = [ networkmanager pptp ppp libsecret ]

     

       16
       16
       -
           ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring

     

       16
       16
       +
           ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring

     

       17
       17
        
                                               gnome3.networkmanagerapplet ];

     

       18
       18
        
       

     

       19
       19
        
         nativeBuildInputs = [ intltool pkgconfig ];

+2 -2

pkgs/tools/networking/network-manager/strongswan.nix

···

       1
       1
        
       { stdenv, fetchurl, intltool, pkgconfig, networkmanager, strongswanNM, procps

     

       2
       2
       -
       , gnome3, libgnome_keyring, libsecret }:

     

       2
       2
       +
       , gnome3, libgnome-keyring, libsecret }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         name    = "${pname}-${version}";

     
···

       17
       17
        
         '';

     

       18
       18
        
       

     

       19
       19
        
         buildInputs = [ networkmanager strongswanNM libsecret ]

     

       20
       20
       -
             ++ (with gnome3; [ gtk libgnome_keyring networkmanagerapplet ]);

     

       20
       20
       +
             ++ (with gnome3; [ gtk libgnome-keyring networkmanagerapplet ]);

     

       21
       21
        
       

     

       22
       22
        
         nativeBuildInputs = [ intltool pkgconfig ];

     

       23
       23

+1 -1

pkgs/tools/networking/network-manager/vpnc.nix

···

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         buildInputs = [ vpnc networkmanager libsecret ]

     

       16
       16
       -
           ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring

     

       16
       16
       +
           ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring

     

       17
       17
        
                                               gnome3.networkmanagerapplet ];

     

       18
       18
        
       

     

       19
       19
        
         nativeBuildInputs = [ intltool pkgconfig ];

+2 -2

pkgs/tools/networking/tlspool/default.nix

···

       1
       1
       -
       { pkgs, stdenv, fetchFromGitHub, unzip, libtool, pkgconfig, git, p11_kit,

     

       1
       1
       +
       { pkgs, stdenv, fetchFromGitHub, unzip, libtool, pkgconfig, git, p11-kit,

     

       2
       2
        
         libtasn1, db, openldap, libmemcached, cyrus_sasl, openssl, softhsm, bash,

     

       3
       3
        
         python, libkrb5, quickder, unbound, ldns, gnupg, gnutls-kdh,

     

       4
       4
        
         useSystemd ? true, systemd, swig

     
···

       18
       18
        
           sha256 = "1qyq6da5bsgb8y9f3jhfrnhbvjns4k80lpkrydkvfx83bg494370";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
       -
         propagatedBuildInputs = [ python softhsm openldap p11_kit.dev p11_kit.out gnupg ];

     

       21
       21
       +
         propagatedBuildInputs = [ python softhsm openldap p11-kit.dev p11-kit.out gnupg ];

     

       22
       22
        
         nativeBuildInputs = [ pkgconfig ];

     

       23
       23
        
         buildInputs = [ unbound unzip git libtasn1 db libmemcached cyrus_sasl openssl bash quickder

     

       24
       24
        
                         libkrb5 ldns libtool swig pkgs.pythonPackages.pip gnutls-kdh ]

+2 -2

pkgs/tools/package-management/packagekit/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, lib

     

       2
       2
        
       , intltool, glib, pkgconfig, polkit, python, sqlite, systemd

     

       3
       3
       -
       , gobjectIntrospection, vala_0_38, gtk_doc, autoreconfHook, autoconf-archive

     

       3
       3
       +
       , gobjectIntrospection, vala_0_38, gtk-doc, autoreconfHook, autoconf-archive

     

       4
       4
        
       # TODO: set enableNixBackend to true, as soon as it builds

     

       5
       5
        
       , nix, enableNixBackend ? false, boost

     

       6
       6
        
       , enableCommandNotFound ? false

     
···

       20
       20
        
         buildInputs = [ glib polkit systemd python gobjectIntrospection vala_0_38 ]

     

       21
       21
        
                         ++ lib.optional enableBashCompletion bash-completion;

     

       22
       22
        
         propagatedBuildInputs = [ sqlite nix boost ];

     

       23
       23
       -
         nativeBuildInputs = [ intltool pkgconfig autoreconfHook autoconf-archive gtk_doc ];

     

       23
       23
       +
         nativeBuildInputs = [ intltool pkgconfig autoreconfHook autoconf-archive gtk-doc ];

     

       24
       24
        
       

     

       25
       25
        
         preAutoreconf = ''

     

       26
       26
        
           gtkdocize

+2 -2

pkgs/tools/security/fprintd/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, intltool

     

       2
       2
       -
       , libfprint, glib, dbus_glib, polkit, nss, pam, systemd }:

     

       2
       2
       +
       , libfprint, glib, dbus-glib, polkit, nss, pam, systemd }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         name = "fprintd-${version}";

     
···

       10
       10
        
           sha256 = "05915i0bv7q62fqrs5diqwr8dz3pwqa1c1ivcgggkjyw0xk4ldp5";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
       -
         buildInputs = [ libfprint glib dbus_glib polkit nss pam systemd ];

     

       13
       13
       +
         buildInputs = [ libfprint glib dbus-glib polkit nss pam systemd ];

     

       14
       14
        
         nativeBuildInputs = [ pkgconfig intltool ];

     

       15
       15
        
       

     

       16
       16
        
         configureFlags = [ "--with-systemdsystemunitdir=$(out)/lib/systemd/system" ];

+2 -2

pkgs/tools/security/gencfsm/default.nix

···

       1
       1
        
       { stdenv, fetchurl, autoconf, automake, intltool, libtool, pkgconfig, encfs

     

       2
       2
       -
       , glib , gnome3, gtk3, libgnome_keyring, vala, wrapGAppsHook, xorg

     

       2
       2
       +
       , glib , gnome3, gtk3, libgnome-keyring, vala, wrapGAppsHook, xorg

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     
···

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ pkgconfig ];

     

       15
       15
        
         buildInputs = [ autoconf automake intltool libtool vala glib encfs

     

       16
       16
       -
           gtk3 libgnome_keyring gnome3.libgee xorg.libSM xorg.libICE

     

       16
       16
       +
           gtk3 libgnome-keyring gnome3.libgee xorg.libSM xorg.libICE

     

       17
       17
        
           wrapGAppsHook ];

     

       18
       18
        
       

     

       19
       19
        
         patches = [ ./makefile-mkdir.patch ];

+4 -4

pkgs/tools/security/qdigidoc/default.nix

···

       1
       1
        
       { stdenv, fetchurl, cmake, ccid, qttools, qttranslations, pkgconfig, pcsclite

     

       2
       2
       -
       , hicolor_icon_theme, libdigidocpp, opensc, shared_mime_info, openldap

     

       3
       3
       -
       , gettext, desktop_file_utils, makeWrapper }:

     

       2
       2
       +
       , hicolor-icon-theme, libdigidocpp, opensc, shared-mime-info, openldap

     

       3
       3
       +
       , gettext, desktop-file-utils, makeWrapper }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
       

     
···

       27
       27
        
       

     

       28
       28
        
         nativeBuildInputs = [ pkgconfig ];

     

       29
       29
        
         buildInputs = [ cmake ccid qttools pcsclite qttranslations

     

       30
       30
       -
                         hicolor_icon_theme libdigidocpp opensc shared_mime_info

     

       31
       31
       -
                         openldap gettext desktop_file_utils makeWrapper

     

       30
       30
       +
                         hicolor-icon-theme libdigidocpp opensc shared-mime-info

     

       31
       31
       +
                         openldap gettext desktop-file-utils makeWrapper

     

       32
       32
        
                       ];

     

       33
       33
        
       

     

       34
       34
        
         enableParallelBuilding = true;

+2 -2

pkgs/tools/security/qesteidutil/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, fetchpatch

     

       2
       2
        
       , cmake, ccid, qttools, qttranslations

     

       3
       3
       -
       , pkgconfig, pcsclite, hicolor_icon_theme 

     

       3
       3
       +
       , pkgconfig, pcsclite, hicolor-icon-theme 

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     
···

       21
       21
        
       

     

       22
       22
        
         nativeBuildInputs = [ pkgconfig ];

     

       23
       23
        
         buildInputs = [ cmake ccid qttools pcsclite qttranslations

     

       24
       24
       -
                         hicolor_icon_theme

     

       24
       24
       +
                         hicolor-icon-theme

     

       25
       25
        
                       ];

     

       26
       26
        
         

     

       27
       27
        
         meta = with stdenv.lib; {

+2 -2

pkgs/tools/system/thermald/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, dbus_libs, dbus_glib, libxml2 }:

     

       1
       1
       +
       { stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, dbus_libs, dbus-glib, libxml2 }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "thermald-${version}";

     
···

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ pkgconfig ];

     

       15
       15
       -
         buildInputs = [ autoconf automake libtool dbus_libs dbus_glib libxml2 ];

     

       15
       15
       +
         buildInputs = [ autoconf automake libtool dbus_libs dbus-glib libxml2 ];

     

       16
       16
        
       

     

       17
       17
        
         patchPhase = ''sed -e 's/upstartconfdir = \/etc\/init/upstartconfdir = $(out)\/etc\/init/' -i data/Makefile.am'';

     

       18
       18

+41

pkgs/top-level/aliases.nix

···

       34
       34
        
         ammonite-repl = ammonite; # added 2017-05-02

     

       35
       35
        
         arduino_core = arduino-core;  # added 2015-02-04

     

       36
       36
        
         asciidocFull = asciidoc-full;  # added 2014-06-22

     

       37
       37
       +
         at_spi2_atk = at-spi2-atk; # added 2018-02-25

     

       38
       38
       +
         at_spi2_core = at-spi2-core; # added 2018-02-25

     

       37
       39
        
         bar = lemonbar;  # added 2015-01-16

     

       38
       40
        
         bar-xft = lemonbar-xft;  # added 2015-01-16

     

       39
       41
        
         bashCompletion = bash-completion; # Added 2016-09-28

     
···

       44
       46
        
         cifs_utils = cifs-utils; # added 2016-08

     

       45
       47
        
         clangAnalyzer = clang-analyzer;  # added 2015-02-20

     

       46
       48
        
         clawsMail = claws-mail; # added 2016-04-29

     

       49
       49
       +
         clutter_gtk = clutter-gtk; # added 2018-02-25

     

       47
       50
        
         conkerorWrapper = conkeror; # added 2015-01

     

       48
       51
        
         cool-old-term = cool-retro-term; # added 2015-01-31

     

       49
       52
        
         cupsBjnp = cups-bjnp; # added 2016-01-02

     

       50
       53
        
         cups_filters = cups-filters; # added 2016-08

     

       51
       54
        
         cv = progress; # added 2015-09-06

     

       55
       55
       +
         dbus_glib = dbus-glib; # added 2018-02-25

     

       52
       56
        
         deadbeef-mpris2-plugin = deadbeefPlugins.mpris2; # added 2018-02-23

     

       53
       57
        
         debian_devscripts = debian-devscripts; # added 2016-03-23

     

       58
       58
       +
         desktop_file_utils = desktop-file-utils; # added 2018-02-25

     

       54
       59
        
         digikam5 = digikam; # added 2017-02-18

     

       55
       60
        
         double_conversion = double-conversion; # 2017-11-22

     

       56
       61
        
         dwarf_fortress = dwarf-fortress; # added 2016-01-23

     

       57
       62
        
         dwbWrapper = dwb; # added 2015-01

     

       58
       63
        
         enblendenfuse = enblend-enfuse; # 2015-09-30

     

       64
       64
       +
         evolution_data_server = evolution-data-server; # added 2018-02-25

     

       59
       65
        
         exfat-utils = exfat;                  # 2015-09-11

     

       60
       66
        
         firefox-esr-wrapper = firefox-esr;  # 2016-01

     

       61
       67
        
         firefox-wrapper = firefox;          # 2016-01

     
···

       65
       71
        
         gettextWithExpat = gettext; # 2016-02-19

     

       66
       72
        
         gdb-multitarget = gdb; # added 2017-11-13

     

       67
       73
        
         git-hub = gitAndTools.git-hub; # added 2016-04-29

     

       74
       74
       +
         glib_networking = glib-networking; # added 2018-02-25

     

       68
       75
        
         go-pup = pup; # added 2017-12-19

     

       69
       76
        
         googleAuthenticator = google-authenticator; # added 2016-10-16

     

       77
       77
       +
         gnome_doc_utils = gnome-doc-utils; # added 2018-02-25

     

       78
       78
       +
         gnome_themes_standard = gnome-themes-standard; # added 2018-02-25

     

       70
       79
        
         grantlee5 = libsForQt5.grantlee;  # added 2015-12-19

     

       80
       80
       +
         gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25

     

       71
       81
        
         gst_ffmpeg = gst-ffmpeg;  # added 2017-02

     

       72
       82
        
         gst_plugins_base = gst-plugins-base;  # added 2017-02

     

       73
       83
        
         gst_plugins_good = gst-plugins-good;  # added 2017-02

     

       74
       84
        
         gst_plugins_bad = gst-plugins-bad;  # added 2017-02

     

       75
       85
        
         gst_plugins_ugly = gst-plugins-ugly;  # added 2017-02

     

       76
       86
        
         gst_python = gst-python;  # added 2017-02

     

       87
       87
       +
         gtk_doc = gtk-doc; # added 2018-02-25

     

       77
       88
        
         guileCairo = guile-cairo; # added 2017-09-24

     

       78
       89
        
         guileGnome = guile-gnome; # added 2017-09-24

     

       79
       90
        
         guile_lib = guile-lib; # added 2017-09-24

     

       80
       91
        
         guileLint = guile-lint; # added 2017-09-27

     

       81
       92
        
         guile_ncurses = guile-ncurses; # added 2017-09-24

     

       93
       93
       +
         gupnp_av = gupnp-av; # added 2018-02-25

     

       94
       94
       +
         gupnp_dlna = gupnp-dlna; # added 2018-02-25

     

       95
       95
       +
         gupnp_igd = gupnp-igd; # added 2018-02-25

     

       82
       96
        
         gupnptools = gupnp-tools;  # added 2015-12-19

     

       83
       97
        
         gnustep-make = gnustep.make; # added 2016-7-6

     

       98
       98
       +
         hicolor_icon_theme = hicolor-icon-theme; # added 2018-02-25

     

       84
       99
        
         htmlTidy = html-tidy;  # added 2014-12-06

     

       85
       100
        
         iana_etc = iana-etc;  # added 2017-03-08

     

       86
       101
        
         idea = jetbrains; # added 2017-04-03

     

       87
       102
        
         inotifyTools = inotify-tools;

     

       88
       103
        
         joseki = apache-jena-fuseki; # added 2016-02-28

     

       104
       104
       +
         json_glib = json-glib; # added 2018-02-25

     

       89
       105
        
         jquery_ui = jquery-ui;  # added 2014-09-07

     

       90
       106
        
         kdiff3-qt5 = kdiff3; # added 2017-02-18

     

       91
       107
        
         keepassx2-http = keepassx-reboot; # added 2016-10-17

     
···

       95
       111
        
         krename-qt5 = krename; # added 2017-02-18

     

       96
       112
        
         letsencrypt = certbot; # added 2016-05-16

     

       97
       113
        
         libdbusmenu_qt5 = libsForQt5.libdbusmenu;  # added 2015-12-19

     

       114
       114
       +
         libcanberra_gtk2 = libcanberra-gtk2; # added 2018-02-25

     

       115
       115
       +
         libcanberra_gtk3 = libcanberra-gtk3; # added 2018-02-25

     

       98
       116
        
         libcap_manpages = libcap.doc; # added 2016-04-29

     

       99
       117
        
         libcap_pam = if stdenv.isLinux then libcap.pam else null; # added 2016-04-29

     

       100
       118
        
         libcap_progs = libcap.out; # added 2016-04-29

     

       119
       119
       +
         libgnome_keyring = libgnome-keyring; # added 2018-02-25

     

       120
       120
       +
         libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25

     

       101
       121
        
         libgumbo = gumbo; # added 2018-01-21

     

       102
       122
        
         libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28

     

       103
       123
        
         libmysql = mysql.connector-c; # added # 2017-12-28, this was a misnomer refering to libmysqlclient

     
···

       114
       134
        
         midoriWrapper = midori; # added 2015-01

     

       115
       135
        
         minc_tools = minc-tools; # 2017-12

     

       116
       136
        
         mlt-qt5 = libsForQt5.mlt;  # added 2015-12-19

     

       137
       137
       +
         mobile_broadband_provider_info = mobile-broadband-provider-info; # added 2018-02-25

     

       117
       138
        
         module_init_tools = kmod; # added 2016-04-22

     

       118
       139
        
         mssys = ms-sys; # added 2015-12-13

     

       119
       140
        
         multipath_tools = multipath-tools;  # added 2016-01-21

     

       120
       141
        
         mupen64plus1_5 = mupen64plus; # added 2016-02-12

     

       121
       142
        
         mysqlWorkbench = mysql-workbench; # added 2017-01-19

     

       122
       143
        
         ncat = nmap;  # added 2016-01-26

     

       144
       144
       +
         networkmanager_fortisslvpn = networkmanager-fortisslvpn; # added 2018-02-25

     

       145
       145
       +
         networkmanager_iodine = networkmanager-iodine; # added 2018-02-25

     

       146
       146
       +
         networkmanager_l2tp = networkmanager-l2tp; # added 2018-02-25

     

       147
       147
       +
         networkmanager_openconnect = networkmanager-openconnect; # added 2018-02-25

     

       148
       148
       +
         networkmanager_openvpn = networkmanager-openvpn; # added 2018-02-25

     

       149
       149
       +
         networkmanager_pptp = networkmanager-pptp; # added 2018-02-25

     

       150
       150
       +
         networkmanager_vpnc = networkmanager-vpnc; # added 2018-02-25

     

       123
       151
        
         nmap_graphical = nmap-graphical;  # added 2017-01-19

     

       124
       152
        
         nfsUtils = nfs-utils;  # added 2014-12-06

     

       125
       153
        
         opencl-icd = ocl-icd; # added 2017-01-20

     

       126
       154
        
         openssh_with_kerberos = openssh; # added 2018-01-28

     

       127
       155
        
         owncloudclient = owncloud-client;  # added 2016-08

     

       156
       156
       +
         p11_kit = p11-kit; # added 2018-02-25

     

       128
       157
        
         pgp-tools = signing-party; # added 2017-03-26

     

       129
       158
        
         pidgin-with-plugins = pidgin; # added 2016-06

     

       130
       159
        
         pidginlatexSF = pidgin-latex; # added 2014-11-02

     
···

       161
       190
        
         saneBackendsGit = sane-backends-git; # added 2016-01-02

     

       162
       191
        
         saneFrontends = sane-frontends; # added 2016-01-02

     

       163
       192
        
         scim = sc-im; # added 2016-01-22

     

       193
       193
       +
         shared_mime_info = shared-mime-info; # added 2018-02-25

     

       164
       194
        
         skrooge2 = skrooge; # added 2017-02-18

     

       165
       195
        
         skype = skypeforlinux; # added 2017-07-27

     

       166
       196
        
         spaceOrbit = space-orbit; # addewd 2016-05-23

     

       167
       197
        
         speedtest_cli = speedtest-cli;  # added 2015-02-17

     

       198
       198
       +
         spice_gtk = spice-gtk; # added 2018-02-25

     

       199
       199
       +
         spice_protocol = spice-protocol; # added 2018-02-25

     

       168
       200
        
         sqliteInteractive = sqlite-interactive;  # added 2014-12-06

     

       169
       201
        
         sshfs = sshfs-fuse; # added 2017-08-14

     

       170
       202
        
         sshfsFuse = sshfs-fuse; # added 2016-09

     

       171
       203
        
         surf-webkit2 = surf; # added 2017-04-02

     

       172
       204
        
         system_config_printer = system-config-printer;  # added 2016-01-03

     

       205
       205
       +
         telepathy_farstream = telepathy-farstream; # added 2018-02-25

     

       206
       206
       +
         telepathy_gabble = telepathy-gabble; # added 2018-02-25

     

       207
       207
       +
         telepathy_glib = telepathy-glib; # added 2018-02-25

     

       208
       208
       +
         telepathy_haze = telepathy-haze; # added 2018-02-25

     

       209
       209
       +
         telepathy_idle = telepathy-idle; # added 2018-02-25

     

       210
       210
       +
         telepathy_logger = telepathy-logger; # added 2018-02-25

     

       211
       211
       +
         telepathy_mission_control = telepathy-mission-control; # added 2018-02-25

     

       212
       212
       +
         telepathy_qt = telepathy-qt; # added 2018-02-25

     

       173
       213
        
         telepathy_qt5 = libsForQt5.telepathy;  # added 2015-12-19

     

       214
       214
       +
         telepathy_salut = telepathy-salut; # added 2018-02-25

     

       174
       215
        
         tftp_hpa = tftp-hpa; # added 2015-04-03

     

       175
       216
        
         transmission_gtk = transmission-gtk; # added 2018-01-06

     

       176
       217
        
         transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06

+53 -54

pkgs/top-level/all-packages.nix

···

       1627
       1627
        
         libpinyin = callPackage ../development/libraries/libpinyin { };

     

       1628
       1628
        
       

     

       1629
       1629
        
         libskk = callPackage ../development/libraries/libskk {

     

       1630
       1630
       -
           inherit (gnome3) gnome_common libgee;

     

       1630
       1630
       +
           inherit (gnome3) gnome-common libgee;

     

       1631
       1631
        
         };

     

       1632
       1632
        
       

     

       1633
       1633
        
         m17n_db = callPackage ../tools/inputmethods/m17n-db { };

     
···

       1852
       1852
        
           pythonPackages = python2Packages;

     

       1853
       1853
        
         };

     

       1854
       1854
        
       

     

       1855
       1855
       -
         desktop_file_utils = callPackage ../tools/misc/desktop-file-utils { };

     

       1855
       1855
       +
         desktop-file-utils = callPackage ../tools/misc/desktop-file-utils { };

     

       1856
       1856
        
       

     

       1857
       1857
        
         dfc  = callPackage ../tools/system/dfc { };

     

       1858
       1858
        
       

     
···

       2667
       2667
        
           inherit (gnome2) libsoup;

     

       2668
       2668
        
         };

     

       2669
       2669
        
       

     

       2670
       2670
       -
         gupnp_av = callPackage ../development/libraries/gupnp-av {};

     

       2670
       2670
       +
         gupnp-av = callPackage ../development/libraries/gupnp-av {};

     

       2671
       2671
        
       

     

       2672
       2672
       -
         gupnp_dlna = callPackage ../development/libraries/gupnp-dlna {};

     

       2672
       2672
       +
         gupnp-dlna = callPackage ../development/libraries/gupnp-dlna {};

     

       2673
       2673
        
       

     

       2674
       2674
       -
         gupnp_igd = callPackage ../development/libraries/gupnp-igd {};

     

       2674
       2674
       +
         gupnp-igd = callPackage ../development/libraries/gupnp-igd {};

     

       2675
       2675
        
       

     

       2676
       2676
        
         gupnp-tools = callPackage ../tools/networking/gupnp-tools {};

     

       2677
       2677
        
       

     
···

       3761
       3761
        
       

     

       3762
       3762
        
         networkmanager = callPackage ../tools/networking/network-manager { };

     

       3763
       3763
        
       

     

       3764
       3764
       -
         networkmanager_iodine = callPackage ../tools/networking/network-manager/iodine.nix { };

     

       3764
       3764
       +
         networkmanager-iodine = callPackage ../tools/networking/network-manager/iodine.nix { };

     

       3765
       3765
        
       

     

       3766
       3766
       -
         networkmanager_openvpn = callPackage ../tools/networking/network-manager/openvpn.nix { };

     

       3766
       3766
       +
         networkmanager-openvpn = callPackage ../tools/networking/network-manager/openvpn.nix { };

     

       3767
       3767
        
       

     

       3768
       3768
       -
         networkmanager_pptp = callPackage ../tools/networking/network-manager/pptp.nix { };

     

       3768
       3768
       +
         networkmanager-pptp = callPackage ../tools/networking/network-manager/pptp.nix { };

     

       3769
       3769
        
       

     

       3770
       3770
       -
         networkmanager_l2tp = callPackage ../tools/networking/network-manager/l2tp.nix { };

     

       3770
       3770
       +
         networkmanager-l2tp = callPackage ../tools/networking/network-manager/l2tp.nix { };

     

       3771
       3771
        
       

     

       3772
       3772
       -
         networkmanager_vpnc = callPackage ../tools/networking/network-manager/vpnc.nix { };

     

       3772
       3772
       +
         networkmanager-vpnc = callPackage ../tools/networking/network-manager/vpnc.nix { };

     

       3773
       3773
        
       

     

       3774
       3774
       -
         networkmanager_openconnect = callPackage ../tools/networking/network-manager/openconnect.nix { };

     

       3774
       3774
       +
         networkmanager-openconnect = callPackage ../tools/networking/network-manager/openconnect.nix { };

     

       3775
       3775
        
       

     

       3776
       3776
       -
         networkmanager_fortisslvpn = callPackage ../tools/networking/network-manager/fortisslvpn.nix { };

     

       3776
       3776
       +
         networkmanager-fortisslvpn = callPackage ../tools/networking/network-manager/fortisslvpn.nix { };

     

       3777
       3777
        
       

     

       3778
       3778
        
         networkmanager_strongswan = callPackage ../tools/networking/network-manager/strongswan.nix { };

     

       3779
       3779
        
       

     
···

       4474
       4474
        
       

     

       4475
       4475
        
         remmina = callPackage ../applications/networking/remote/remmina {

     

       4476
       4476
        
           adwaita-icon-theme = gnome3.adwaita-icon-theme;

     

       4477
       4477
       -
           gsettings_desktop_schemas = gnome3.gsettings_desktop_schemas;

     

       4477
       4477
       +
           gsettings-desktop-schemas = gnome3.gsettings-desktop-schemas;

     

       4478
       4478
        
         };

     

       4479
       4479
        
       

     

       4480
       4480
        
         rename = callPackage ../tools/misc/rename {

     
···

       7700
       7700
        
       

     

       7701
       7701
        
         global = callPackage ../development/tools/misc/global { };

     

       7702
       7702
        
       

     

       7703
       7703
       -
         gnome_doc_utils = callPackage ../development/tools/documentation/gnome-doc-utils {};

     

       7703
       7703
       +
         gnome-doc-utils = callPackage ../development/tools/documentation/gnome-doc-utils {};

     

       7704
       7704
        
       

     

       7705
       7705
        
         gnome-desktop-testing = callPackage ../development/tools/gnome-desktop-testing {};

     

       7706
       7706
        
       

     
···

       7736
       7736
        
       

     

       7737
       7737
        
         grail = callPackage ../development/libraries/grail { };

     

       7738
       7738
        
       

     

       7739
       7739
       -
         gtk_doc = callPackage ../development/tools/documentation/gtk-doc { };

     

       7739
       7739
       +
         gtk-doc = callPackage ../development/tools/documentation/gtk-doc { };

     

       7740
       7740
        
       

     

       7741
       7741
        
         gtkdialog = callPackage ../development/tools/misc/gtkdialog { };

     

       7742
       7742
        
       

     
···

       8279
       8279
        
       

     

       8280
       8280
        
         attr = callPackage ../development/libraries/attr { };

     

       8281
       8281
        
       

     

       8282
       8282
       -
         at_spi2_core = callPackage ../development/libraries/at-spi2-core { };

     

       8282
       8282
       +
         at-spi2-core = callPackage ../development/libraries/at-spi2-core { };

     

       8283
       8283
        
       

     

       8284
       8284
       -
         at_spi2_atk = callPackage ../development/libraries/at-spi2-atk { };

     

       8284
       8284
       +
         at-spi2-atk = callPackage ../development/libraries/at-spi2-atk { };

     

       8285
       8285
        
       

     

       8286
       8286
        
         aqbanking = callPackage ../development/libraries/aqbanking { };

     

       8287
       8287
        
       

     
···

       8421
       8421
        
         clutter-gst = callPackage ../development/libraries/clutter-gst {

     

       8422
       8422
        
         };

     

       8423
       8423
        
       

     

       8424
       8424
       -
         clutter_gtk = callPackage ../development/libraries/clutter-gtk { };

     

       8424
       8424
       +
         clutter-gtk = callPackage ../development/libraries/clutter-gtk { };

     

       8425
       8425
        
       

     

       8426
       8426
        
         cminpack = callPackage ../development/libraries/cminpack { };

     

       8427
       8427
        
       

     
···

       8497
       8497
        
       

     

       8498
       8498
        
         dbus = callPackage ../development/libraries/dbus { };

     

       8499
       8499
        
         dbus_cplusplus  = callPackage ../development/libraries/dbus-cplusplus { };

     

       8500
       8500
       -
         dbus_glib       = callPackage ../development/libraries/dbus-glib { };

     

       8500
       8500
       +
         dbus-glib       = callPackage ../development/libraries/dbus-glib { };

     

       8501
       8501
        
         dbus_java       = callPackage ../development/libraries/java/dbus-java { };

     

       8502
       8502
        
       

     

       8503
       8503
        
         dbus-sharp-1_0 = callPackage ../development/libraries/dbus-sharp/dbus-sharp-1.0.nix { };

     
···

       9052
       9052
        
         };

     

       9053
       9053
        
         glibmm = callPackage ../development/libraries/glibmm { };

     

       9054
       9054
        
       

     

       9055
       9055
       -
         glib_networking = callPackage ../development/libraries/glib-networking {};

     

       9055
       9055
       +
         glib-networking = callPackage ../development/libraries/glib-networking {};

     

       9056
       9056
        
       

     

       9057
       9057
        
         ace = callPackage ../development/libraries/ace { };

     

       9058
       9058
        
       

     
···

       9299
       9299
        
       

     

       9300
       9300
        
         jshon = callPackage ../development/tools/parsing/jshon { };

     

       9301
       9301
        
       

     

       9302
       9302
       -
         json_glib = callPackage ../development/libraries/json-glib { };

     

       9302
       9302
       +
         json-glib = callPackage ../development/libraries/json-glib { };

     

       9303
       9303
        
       

     

       9304
       9304
        
         json-c-0-11 = callPackage ../development/libraries/json-c/0.11.nix { }; # vulnerable

     

       9305
       9305
        
         json_c = callPackage ../development/libraries/json-c { };

     
···

       9450
       9450
        
         };

     

       9451
       9451
        
       

     

       9452
       9452
        
         libcanberra = callPackage ../development/libraries/libcanberra { };

     

       9453
       9453
       -
         libcanberra_gtk3 = pkgs.libcanberra.override { gtk = pkgs.gtk3; };

     

       9454
       9454
       -
         libcanberra_gtk2 = pkgs.libcanberra_gtk3.override { gtk = pkgs.gtk2; };

     

       9453
       9453
       +
         libcanberra-gtk3 = pkgs.libcanberra.override { gtk = pkgs.gtk3; };

     

       9454
       9454
       +
         libcanberra-gtk2 = pkgs.libcanberra-gtk3.override { gtk = pkgs.gtk2; };

     

       9455
       9455
        
       

     

       9456
       9456
        
         libcanberra_kde = if (config.kde_runtime.libcanberraWithoutGTK or true)

     

       9457
       9457
        
           then pkgs.libcanberra

     

       9458
       9458
       -
           else pkgs.libcanberra_gtk2;

     

       9458
       9458
       +
           else pkgs.libcanberra-gtk2;

     

       9459
       9459
        
       

     

       9460
       9460
        
         libcec = callPackage ../development/libraries/libcec { };

     

       9461
       9461
        
         libcec_platform = callPackage ../development/libraries/libcec/platform.nix { };

     
···

       9633
       9633
        
       

     

       9634
       9634
        
         libgig = callPackage ../development/libraries/libgig { };

     

       9635
       9635
        
       

     

       9636
       9636
       -
         libgnome_keyring = callPackage ../development/libraries/libgnome-keyring { };

     

       9637
       9637
       -
         libgnome_keyring3 = gnome3.libgnome_keyring;

     

       9636
       9636
       +
         libgnome-keyring = callPackage ../development/libraries/libgnome-keyring { };

     

       9637
       9637
       +
         libgnome-keyring3 = gnome3.libgnome-keyring;

     

       9638
       9638
        
       

     

       9639
       9639
        
         libglvnd = callPackage ../development/libraries/libglvnd { };

     

       9640
       9640
        
       

     
···

       10697
       10697
        
         osinfo-db = callPackage ../data/misc/osinfo-db { };

     

       10698
       10698
        
         osinfo-db-tools = callPackage ../tools/misc/osinfo-db-tools { };

     

       10699
       10699
        
       

     

       10700
       10700
       -
         p11_kit = callPackage ../development/libraries/p11-kit { };

     

       10700
       10700
       +
         p11-kit = callPackage ../development/libraries/p11-kit { };

     

       10701
       10701
        
       

     

       10702
       10702
        
         paperkey = callPackage ../tools/security/paperkey { };

     

       10703
       10703
        
       

     
···

       11293
       11293
        
           inherit (pythonPackages) pyparsing;

     

       11294
       11294
        
         };

     

       11295
       11295
        
       

     

       11296
       11296
       -
         spice_gtk = callPackage ../development/libraries/spice-gtk { };

     

       11296
       11296
       +
         spice-gtk = callPackage ../development/libraries/spice-gtk { };

     

       11297
       11297
        
       

     

       11298
       11298
       -
         spice_protocol = callPackage ../development/libraries/spice-protocol { };

     

       11298
       11298
       +
         spice-protocol = callPackage ../development/libraries/spice-protocol { };

     

       11299
       11299
        
       

     

       11300
       11300
        
         spice-up = callPackage ../applications/office/spice-up { };

     

       11301
       11301
        
       

     
···

       11395
       11395
        
       

     

       11396
       11396
        
         tectonic = callPackage ../tools/typesetting/tectonic { };

     

       11397
       11397
        
       

     

       11398
       11398
       -
         telepathy_glib = callPackage ../development/libraries/telepathy/glib { };

     

       11398
       11398
       +
         telepathy-glib = callPackage ../development/libraries/telepathy/glib { };

     

       11399
       11399
        
       

     

       11400
       11400
       -
         telepathy_farstream = callPackage ../development/libraries/telepathy/farstream {};

     

       11400
       11400
       +
         telepathy-farstream = callPackage ../development/libraries/telepathy/farstream {};

     

       11401
       11401
        
       

     

       11402
       11402
       -
         telepathy_qt = callPackage ../development/libraries/telepathy/qt { qtbase = qt4; };

     

       11402
       11402
       +
         telepathy-qt = callPackage ../development/libraries/telepathy/qt { qtbase = qt4; };

     

       11403
       11403
        
       

     

       11404
       11404
        
         tevent = callPackage ../development/libraries/tevent {

     

       11405
       11405
        
           python = python2;

     
···

       12687
       12687
        
       

     

       12688
       12688
        
         xorg = recurseIntoAttrs (lib.callPackagesWith pkgs ../servers/x11/xorg/default.nix {

     

       12689
       12689
        
           inherit clangStdenv fetchurl fetchgit fetchpatch stdenv intltool freetype fontconfig

     

       12690
       12690
       -
             libxslt expat libpng zlib perl mesa_drivers spice_protocol libunwind

     

       12690
       12690
       +
             libxslt expat libpng zlib perl mesa_drivers spice-protocol libunwind

     

       12691
       12691
        
             dbus libuuid openssl gperf m4 libevdev tradcpp libinput mcpp makeWrapper autoreconfHook

     

       12692
       12692
        
             autoconf automake libtool mtdev pixman

     

       12693
       12693
        
             cairo epoxy;

     
···

       14035
       14035
        
       

     

       14036
       14036
        
         gnome_user_docs = callPackage ../data/documentation/gnome-user-docs { };

     

       14037
       14037
        
       

     

       14038
       14038
       -
         inherit (gnome3) gsettings_desktop_schemas;

     

       14038
       14038
       +
         inherit (gnome3) gsettings-desktop-schemas;

     

       14039
       14039
        
       

     

       14040
       14040
        
         go-font = callPackage ../data/fonts/go-font { };

     

       14041
       14041
        
       

     
···

       14045
       14045
        
       

     

       14046
       14046
        
         helvetica-neue-lt-std = callPackage ../data/fonts/helvetica-neue-lt-std { };

     

       14047
       14047
        
       

     

       14048
       14048
       -
         hicolor_icon_theme = callPackage ../data/icons/hicolor-icon-theme { };

     

       14048
       14048
       +
         hicolor-icon-theme = callPackage ../data/icons/hicolor-icon-theme { };

     

       14049
       14049
        
       

     

       14050
       14050
        
         hanazono = callPackage ../data/fonts/hanazono { };

     

       14051
       14051
        
       

     
···

       14134
       14134
        
       

     

       14135
       14135
        
         media-player-info = callPackage ../data/misc/media-player-info {};

     

       14136
       14136
        
       

     

       14137
       14137
       -
         mobile_broadband_provider_info = callPackage ../data/misc/mobile-broadband-provider-info { };

     

       14137
       14137
       +
         mobile-broadband-provider-info = callPackage ../data/misc/mobile-broadband-provider-info { };

     

       14138
       14138
        
       

     

       14139
       14139
        
         monoid = callPackage ../data/fonts/monoid { };

     

       14140
       14140
        
       

     
···

       14215
       14215
        
       

     

       14216
       14216
        
         mime-types = callPackage ../data/misc/mime-types { };

     

       14217
       14217
        
       

     

       14218
       14218
       -
         shared_mime_info = callPackage ../data/misc/shared-mime-info { };

     

       14218
       14218
       +
         shared-mime-info = callPackage ../data/misc/shared-mime-info { };

     

       14219
       14219
        
       

     

       14220
       14220
        
         shared_desktop_ontologies = callPackage ../data/misc/shared-desktop-ontologies { };

     

       14221
       14221
        
       

     
···

       14765
       14765
        
         cinelerra = callPackage ../applications/video/cinelerra { };

     

       14766
       14766
        
       

     

       14767
       14767
        
         claws-mail = callPackage ../applications/networking/mailreaders/claws-mail {

     

       14768
       14768
       -
           inherit (gnome3) gsettings_desktop_schemas;

     

       14768
       14768
       +
           inherit (gnome3) gsettings-desktop-schemas;

     

       14769
       14769
        
           inherit (xorg) libSM;

     

       14770
       14770
        
           enableNetworkManager = config.networking.networkmanager.enable or false;

     

       14771
       14771
        
         };

     
···

       15270
       15270
        
         keepassxc = libsForQt5.callPackage ../applications/misc/keepassx/community.nix { };

     

       15271
       15271
        
       

     

       15272
       15272
        
         inherit (gnome3) evince;

     

       15273
       15273
       -
         evolution_data_server = gnome3.evolution_data_server;

     

       15273
       15273
       +
         evolution-data-server = gnome3.evolution-data-server;

     

       15274
       15274
        
       

     

       15275
       15275
        
         keepass = callPackage ../applications/misc/keepass {

     

       15276
       15276
        
           buildDotnetPackage = buildDotnetPackage.override { mono = mono54; };

     
···

       16249
       16249
        
       

     

       16250
       16250
        
       

     

       16251
       16251
        
         liferea = callPackage ../applications/networking/newsreaders/liferea {

     

       16252
       16252
       -
           inherit (gnome3) libpeas gsettings_desktop_schemas dconf;

     

       16252
       16252
       +
           inherit (gnome3) libpeas gsettings-desktop-schemas dconf;

     

       16253
       16253
        
         };

     

       16254
       16254
        
       

     

       16255
       16255
        
         lightworks = callPackage ../applications/video/lightworks {

     
···

       16788
       16788
        
         opera = callPackage ../applications/networking/browsers/opera {};

     

       16789
       16789
        
       

     

       16790
       16790
        
         orca = python3Packages.callPackage ../applications/misc/orca {

     

       16791
       16791
       -
           inherit (gnome3) yelp_tools;

     

       16791
       16791
       +
           inherit (gnome3) yelp-tools;

     

       16792
       16792
        
         };

     

       16793
       16793
        
       

     

       16794
       16794
        
         osm2xmap = callPackage ../applications/misc/osm2xmap {

     
···

       16944
       16944
        
         pinfo = callPackage ../applications/misc/pinfo { };

     

       16945
       16945
        
       

     

       16946
       16946
        
         pinpoint = callPackage ../applications/office/pinpoint {

     

       16947
       16947
       -
           inherit (gnome3) clutter clutter_gtk;

     

       16947
       16947
       +
           inherit (gnome3) clutter clutter-gtk;

     

       16948
       16948
        
         };

     

       16949
       16949
        
       

     

       16950
       16950
        
         pinta = callPackage ../applications/graphics/pinta {

     
···

       17591
       17591
        
       

     

       17592
       17592
        
         telegram-cli = callPackage ../applications/networking/instant-messengers/telegram/telegram-cli { };

     

       17593
       17593
        
       

     

       17594
       17594
       -
         telepathy_gabble = callPackage ../applications/networking/instant-messengers/telepathy/gabble { };

     

       17594
       17594
       +
         telepathy-gabble = callPackage ../applications/networking/instant-messengers/telepathy/gabble { };

     

       17595
       17595
        
       

     

       17596
       17596
       -
         telepathy_haze = callPackage ../applications/networking/instant-messengers/telepathy/haze {};

     

       17596
       17596
       +
         telepathy-haze = callPackage ../applications/networking/instant-messengers/telepathy/haze {};

     

       17597
       17597
        
       

     

       17598
       17598
       -
         telepathy_logger = callPackage ../applications/networking/instant-messengers/telepathy/logger {};

     

       17598
       17598
       +
         telepathy-logger = callPackage ../applications/networking/instant-messengers/telepathy/logger {};

     

       17599
       17599
        
       

     

       17600
       17600
       -
         telepathy_mission_control = callPackage ../applications/networking/instant-messengers/telepathy/mission-control { };

     

       17600
       17600
       +
         telepathy-mission-control = callPackage ../applications/networking/instant-messengers/telepathy/mission-control { };

     

       17601
       17601
        
       

     

       17602
       17602
       -
         telepathy_salut = callPackage ../applications/networking/instant-messengers/telepathy/salut {};

     

       17602
       17602
       +
         telepathy-salut = callPackage ../applications/networking/instant-messengers/telepathy/salut {};

     

       17603
       17603
        
       

     

       17604
       17604
       -
         telepathy_idle = callPackage ../applications/networking/instant-messengers/telepathy/idle {};

     

       17604
       17604
       +
         telepathy-idle = callPackage ../applications/networking/instant-messengers/telepathy/idle {};

     

       17605
       17605
        
       

     

       17606
       17606
        
         termdown = (newScope pythonPackages) ../applications/misc/termdown { };

     

       17607
       17607
        
       

     
···

       17858
       17858
        
         virtmanager = callPackage ../applications/virtualization/virt-manager {

     

       17859
       17859
        
           vte = gnome3.vte;

     

       17860
       17860
        
           dconf = gnome3.dconf;

     

       17861
       17861
       -
           spice_gtk = spice_gtk;

     

       17862
       17861
        
           system-libvirt = libvirt;

     

       17863
       17862
        
         };

     

       17864
       17863
        
       

     
···

       18352
       18351
        
       

     

       18353
       18352
        
         roxterm = callPackage ../applications/misc/roxterm {

     

       18354
       18353
        
           inherit (pythonPackages) lockfile;

     

       18355
       18355
       -
           inherit (gnome3) gsettings_desktop_schemas vte;

     

       18354
       18354
       +
           inherit (gnome3) gsettings-desktop-schemas vte;

     

       18356
       18355
        
         };

     

       18357
       18356
        
       

     

       18358
       18357
        
         xtrace = callPackage ../tools/X11/xtrace { };

     
···

       19179
       19178
        
         } // {

     

       19180
       19179
        
           inherit (pkgs)

     

       19181
       19180
        
             # GTK Libs

     

       19182
       19182
       -
             glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtkmm2 libcanberra_gtk2

     

       19181
       19181
       +
             glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtkmm2 libcanberra-gtk2

     

       19183
       19182
        
       

     

       19184
       19183
        
             # Included for backwards compatibility

     

       19185
       19185
       -
             libsoup libwnck gtk_doc gnome_doc_utils;

     

       19184
       19184
       +
             libsoup libwnck gtk-doc gnome-doc-utils;

     

       19186
       19185
        
       

     

       19187
       19186
        
           gtk = self.gtk2;

     

       19188
       19187
        
           gtkmm = self.gtkmm2;

     
···

       19248
       19247
        
       

     

       19249
       19248
        
         gtk-engine-murrine = callPackage ../misc/themes/gtk2/gtk-engine-murrine { };

     

       19250
       19249
        
       

     

       19251
       19251
       -
         gnome_themes_standard = gnome3.gnome_themes_standard;

     

       19250
       19250
       +
         gnome-themes-standard = gnome3.gnome-themes-standard;

     

       19252
       19251
        
       

     

       19253
       19252
        
         numix-gtk-theme = callPackage ../misc/themes/numix { };

     

       19254
       19253
        
       

     
···

       19274
       19273
        
             mkPlasma5 = import ../desktops/plasma-5;

     

       19275
       19274
        
             attrs = {

     

       19276
       19275
        
               inherit libsForQt5 lib fetchurl;

     

       19277
       19277
       -
               inherit (gnome3) gconf gsettings_desktop_schemas;

     

       19276
       19276
       +
               inherit (gnome3) gconf gsettings-desktop-schemas;

     

       19278
       19277
        
             };

     

       19279
       19278
        
           in

     

       19280
       19279
        
             recurseIntoAttrs (makeOverridable mkPlasma5 attrs);

+1 -1

pkgs/top-level/python-packages.nix

···

       11266
       11266
        
           '';

     

       11267
       11267
        
       

     

       11268
       11268
        
           nativeBuildInputs = [ pkgs.pkgconfig ];

     

       11269
       11269
       -
           buildInputs = with self; [ python pkgs.libnotify pygobject2 pygtk pkgs.glib pkgs.gtk2 pkgs.dbus_glib ];

     

       11269
       11269
       +
           buildInputs = with self; [ python pkgs.libnotify pygobject2 pygtk pkgs.glib pkgs.gtk2 pkgs.dbus-glib ];

     

       11270
       11270
        
       

     

       11271
       11271
        
           postInstall = "cd $out/lib/python*/site-packages && ln -s gtk-*/pynotify .";

     

       11272
       11272