diff options
| author | Damien Cassou <damien@cassou.me> | 2016-07-12 16:50:56 +0200 |
|---|---|---|
| committer | Damien Cassou <damien@cassou.me> | 2016-07-12 16:50:56 +0200 |
| commit | a347b944d986b05d6f0b67541904ef5f0a143661 (patch) | |
| tree | 812ed2904c8027b491f328856e90cbb4e3d18bc0 /pkgs/desktops/gnome-3/3.20/misc | |
| parent | 81810c664bc449d388eaa26b563a01b51406be90 (diff) | |
| download | nixlib-a347b944d986b05d6f0b67541904ef5f0a143661.tar nixlib-a347b944d986b05d6f0b67541904ef5f0a143661.tar.gz nixlib-a347b944d986b05d6f0b67541904ef5f0a143661.tar.bz2 nixlib-a347b944d986b05d6f0b67541904ef5f0a143661.tar.lz nixlib-a347b944d986b05d6f0b67541904ef5f0a143661.tar.xz nixlib-a347b944d986b05d6f0b67541904ef5f0a143661.tar.zst nixlib-a347b944d986b05d6f0b67541904ef5f0a143661.zip | |
gnome-tweak-tools: fix missing gi module
I changed from python3Packages to python2Packages because I couldn't make it work with python3Packages. This seems similar to: https://github.com/NixOS/nixpkgs/pull/16747#discussion_r69937281
Diffstat (limited to 'pkgs/desktops/gnome-3/3.20/misc')
| -rw-r--r-- | pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/default.nix | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/default.nix index 986d4058af92..e6c4b8c82027 100644 --- a/pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/default.nix +++ b/pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/default.nix @@ -1,9 +1,11 @@ -{ stdenv, intltool, fetchurl, python, pygobject3, atk +{ stdenv, intltool, fetchurl, atk , pkgconfig, gtk3, glib, libsoup -, bash, makeWrapper, itstool, libxml2, python3Packages -, gnome3, librsvg, gdk_pixbuf, file, libnotify }: +, bash, makeWrapper, itstool, libxml2, python2Packages +, gnome3, librsvg, gdk_pixbuf, file, libnotify, gobjectIntrospection, wrapGAppsHook }: -stdenv.mkDerivation rec { +let + python = python2Packages.python.withPackages ( ps: with ps; [ pygobject3 ] ); +in stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; doCheck = true; @@ -15,17 +17,15 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 gnome3.gsettings_desktop_schemas makeWrapper file gdk_pixbuf gnome3.defaultIconTheme librsvg - python pygobject3 libnotify gnome3.gnome_shell + libnotify gnome3.gnome_shell libsoup gnome3.gnome_settings_daemon gnome3.nautilus - gnome3.gnome_desktop ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-tweak-tool" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --suffix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix PYTHONPATH : "$PYTHONPATH:$(toPythonPath $out)" - ''; + gnome3.gnome_desktop wrapGAppsHook ]; + + propagatedBuildInputs = [ python gobjectIntrospection ]; + + PYTHONPATH = "$out/${python.python.sitePackages}"; + + wrapPrefixVariables = [ "PYTHONPATH" ]; patches = [ ./find_gsettings.patch |