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" ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7d9f7219bd57..250325f96c1f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6536,9 +6536,7 @@ in dejagnu = callPackage ../development/tools/misc/dejagnu { }; - dfeet = callPackage ../development/tools/misc/d-feet { - inherit (pythonPackages) pep8; - }; + dfeet = callPackage ../development/tools/misc/d-feet { }; dfu-programmer = callPackage ../development/tools/misc/dfu-programmer { };