summary refs log tree commit diff
path: root/pkgs/development/tools/misc
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2016-09-25 23:00:08 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2016-09-25 23:00:08 +0200
commit0bd31510f0cbaca5d34d7624585585fad55e5560 (patch)
treefe0c952c9235b0a8b7aa1abeae256df8ffef2050 /pkgs/development/tools/misc
parentf2e0a3c43ab9fa539ed5dc14d8bf38b4f2cc4bf8 (diff)
downloadnixlib-0bd31510f0cbaca5d34d7624585585fad55e5560.tar
nixlib-0bd31510f0cbaca5d34d7624585585fad55e5560.tar.gz
nixlib-0bd31510f0cbaca5d34d7624585585fad55e5560.tar.bz2
nixlib-0bd31510f0cbaca5d34d7624585585fad55e5560.tar.lz
nixlib-0bd31510f0cbaca5d34d7624585585fad55e5560.tar.xz
nixlib-0bd31510f0cbaca5d34d7624585585fad55e5560.tar.zst
nixlib-0bd31510f0cbaca5d34d7624585585fad55e5560.zip
dfeet: do not use top-level python packages
and use mkPythonDerivation.
Diffstat (limited to 'pkgs/development/tools/misc')
-rw-r--r--pkgs/development/tools/misc/d-feet/default.nix15
1 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix
index 783607860dec..2ada782563e5 100644
--- a/pkgs/development/tools/misc/d-feet/default.nix
+++ b/pkgs/development/tools/misc/d-feet/default.nix
@@ -1,28 +1,27 @@
 { stdenv, pkgconfig, fetchurl, itstool, intltool, libxml2, glib, gtk3
-, pep8, python, makeWrapper, gnome3, pygobject3, libwnck3 }:
+, pythonPackages, makeWrapper, gnome3, libwnck3 }:
 
 let
   version = "${major}.11";
   major = "0.3";
-in
-
-stdenv.mkDerivation rec {
+in pythonPackages.mkPythonDerivation rec {
   name = "d-feet-${version}";
+  namePrefix = "";
 
   src = fetchurl {
     url = "mirror://gnome/sources/d-feet/${major}/d-feet-${version}.tar.xz";
     sha256 = "a3dc940c66f84b996c328531e3034d475ec690d7ff639445ff7ca746aa8cb9c2";
   };
 
-  buildInputs = [
-    pkgconfig libxml2 itstool intltool glib gtk3 pep8 python
-    gnome3.defaultIconTheme makeWrapper pygobject3 libwnck3
+  buildInputs = [ pkgconfig libxml2 itstool intltool glib gtk3
+    gnome3.defaultIconTheme makeWrapper libwnck3
   ];
 
+  propagatedBuildInputs = with pythonPackages; [ pygobject3 pep8 ];
+
   preFixup =
     ''
       wrapProgram $out/bin/d-feet \
-        --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})" \
         --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
         --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share"
     '';