diff options
| author | Jascha Geerds <jascha@jgeerds.name> | 2017-02-18 12:23:00 +0100 |
|---|---|---|
| committer | Jascha Geerds <jascha@jgeerds.name> | 2017-02-18 12:23:00 +0100 |
| commit | fb13588a8e81ea83083bde977878bb04c97b0ad3 (patch) | |
| tree | 820596afc9bf5527b5da7d4fbfb583f6abc87fc0 /pkgs/desktops/gnome-3 | |
| parent | db9509767434c29bd83adf455c4d7a98cb1ca8b0 (diff) | |
| download | nixlib-fb13588a8e81ea83083bde977878bb04c97b0ad3.tar nixlib-fb13588a8e81ea83083bde977878bb04c97b0ad3.tar.gz nixlib-fb13588a8e81ea83083bde977878bb04c97b0ad3.tar.bz2 nixlib-fb13588a8e81ea83083bde977878bb04c97b0ad3.tar.lz nixlib-fb13588a8e81ea83083bde977878bb04c97b0ad3.tar.xz nixlib-fb13588a8e81ea83083bde977878bb04c97b0ad3.tar.zst nixlib-fb13588a8e81ea83083bde977878bb04c97b0ad3.zip | |
gnome3.gnome_shell: Don't propagate python dependency (#21851)
Diffstat (limited to 'pkgs/desktops/gnome-3')
| -rw-r--r-- | pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix index dccdb8a5a5f8..8f77b7e5e3b1 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix @@ -7,7 +7,9 @@ # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup -stdenv.mkDerivation rec { +let + pythonEnv = python3Packages.python.withPackages ( ps: with ps; [ pygobject3 ] ); +in stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; # Needed to find /etc/NetworkManager/VPN @@ -23,9 +25,8 @@ stdenv.mkDerivation rec { defaultIconTheme sqlite gnome3.gnome-bluetooth libgweather # not declared at build time, but typelib is needed at runtime gnome3.gnome-clocks # schemas needed - at_spi2_core upower ibus gnome_desktop telepathy_logger gnome3.gnome_settings_daemon ]; - - propagatedBuildInputs = [ python3Packages.pygobject3 python3Packages.python gobjectIntrospection ]; + at_spi2_core upower ibus gnome_desktop telepathy_logger gnome3.gnome_settings_daemon + pythonEnv gobjectIntrospection ]; installFlags = [ "keysdir=$(out)/share/gnome-control-center/keybindings" ]; @@ -42,9 +43,6 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS" \ --suffix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - wrapProgram "$out/bin/gnome-shell-extension-tool" \ - --prefix PYTHONPATH : "${python3Packages.pygobject3}/${python3Packages.python.sitePackages}:$PYTHONPATH" - wrapProgram "$out/libexec/gnome-shell-calendar-server" \ --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" |