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

gnome3.gnome-tweak-tool: Don't propagate python dependency (#21851)

This commit is contained in:
Jascha Geerds 2017-02-18 12:24:18 +01:00
parent fb13588a8e
commit c83dfedaa2
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix
View File

@ -4,7 +4,7 @@
, gnome3, librsvg, gdk_pixbuf, file, libnotify, gobjectIntrospection, wrapGAppsHook }: , gnome3, librsvg, gdk_pixbuf, file, libnotify, gobjectIntrospection, wrapGAppsHook }:
let let
python = python2Packages.python.withPackages ( ps: with ps; [ pygobject3 ] ); pythonEnv = python2Packages.python.withPackages ( ps: with ps; [ pygobject3 ] );
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src; inherit (import ./src.nix fetchurl) name src;
@ -12,15 +12,6 @@ in stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
# Make sure that Python 2 is first in $PATH because gnome3.gnome_shell
# propagates python3Packages.python. If we do not do this, autoconf will use
# Python 3 instead which gnome-tweak-tool does not support at this time. See:
# https://github.com/NixOS/nixpkgs/issues/21851
# https://github.com/NixOS/nixpkgs/pull/22370
preConfigure = ''
PATH="${python}/bin:$PATH"
'';
makeFlags = [ "DESTDIR=/" ]; makeFlags = [ "DESTDIR=/" ];
buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2
@ -28,11 +19,10 @@ in stdenv.mkDerivation rec {
gdk_pixbuf gnome3.defaultIconTheme librsvg gdk_pixbuf gnome3.defaultIconTheme librsvg
libnotify gnome3.gnome_shell libnotify gnome3.gnome_shell
libsoup gnome3.gnome_settings_daemon gnome3.nautilus libsoup gnome3.gnome_settings_daemon gnome3.nautilus
gnome3.gnome_desktop wrapGAppsHook ]; gnome3.gnome_desktop wrapGAppsHook
python2Packages.pygobject3.dev pythonEnv gobjectIntrospection ];
propagatedBuildInputs = [ python gobjectIntrospection ]; PYTHONPATH = "$out/${pythonEnv.python.sitePackages}";
PYTHONPATH = "$out/${python.python.sitePackages}";
wrapPrefixVariables = [ "PYTHONPATH" ]; wrapPrefixVariables = [ "PYTHONPATH" ];