BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #22937 from jgeerds/gnome

Browse source 
gnome-shell, gnome-tweak-tool: Don't propagate python
This commit is contained in:
Jascha Geerds 2017-02-22 22:06:21 +01:00 committed by GitHub
commit 77670c04c7
2 changed files with 9 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix
View file

@ -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"

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 }:
let
python = python2Packages.python.withPackages ( ps: with ps; [ pygobject3 ] );
pythonEnv = python2Packages.python.withPackages ( ps: with ps; [ pygobject3 ] );
in stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
@ -12,15 +12,6 @@ in stdenv.mkDerivation rec {
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=/" ];
buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2
@ -28,11 +19,10 @@ in stdenv.mkDerivation rec {
gdk_pixbuf gnome3.defaultIconTheme librsvg
libnotify gnome3.gnome_shell
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/${python.python.sitePackages}";
PYTHONPATH = "$out/${pythonEnv.python.sitePackages}";
wrapPrefixVariables = [ "PYTHONPATH" ];