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

dfeet: do not use top-level python packages

Browse Source 
and use mkPythonDerivation.
This commit is contained in:
Frederik Rietdijk 2016-09-25 23:00:08 +02:00
parent f2e0a3c43a
commit 0bd31510f0
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/development/tools/misc/d-feet/default.nix
View File

@ -1,28 +1,27 @@
{ stdenv, pkgconfig, fetchurl, itstool, intltool, libxml2, glib, gtk3 { stdenv, pkgconfig, fetchurl, itstool, intltool, libxml2, glib, gtk3
, pep8, python, makeWrapper, gnome3, pygobject3, libwnck3 }: , pythonPackages, makeWrapper, gnome3, libwnck3 }:
let let
version = "${major}.11"; version = "${major}.11";
major = "0.3"; major = "0.3";
in in pythonPackages.mkPythonDerivation rec {
stdenv.mkDerivation rec {
name = "d-feet-${version}"; name = "d-feet-${version}";
namePrefix = "";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/d-feet/${major}/d-feet-${version}.tar.xz"; url = "mirror://gnome/sources/d-feet/${major}/d-feet-${version}.tar.xz";
sha256 = "a3dc940c66f84b996c328531e3034d475ec690d7ff639445ff7ca746aa8cb9c2"; sha256 = "a3dc940c66f84b996c328531e3034d475ec690d7ff639445ff7ca746aa8cb9c2";
}; };
buildInputs = [ buildInputs = [ pkgconfig libxml2 itstool intltool glib gtk3
pkgconfig libxml2 itstool intltool glib gtk3 pep8 python gnome3.defaultIconTheme makeWrapper libwnck3
gnome3.defaultIconTheme makeWrapper pygobject3 libwnck3
]; ];
propagatedBuildInputs = with pythonPackages; [ pygobject3 pep8 ];
preFixup = preFixup =
'' ''
wrapProgram $out/bin/d-feet \ wrapProgram $out/bin/d-feet \
--prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share" --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share"
''; '';

4
pkgs/top-level/all-packages.nix
View File

@ -6536,9 +6536,7 @@ in
dejagnu = callPackage ../development/tools/misc/dejagnu { }; dejagnu = callPackage ../development/tools/misc/dejagnu { };
dfeet = callPackage ../development/tools/misc/d-feet { dfeet = callPackage ../development/tools/misc/d-feet { };
inherit (pythonPackages) pep8;
};
dfu-programmer = callPackage ../development/tools/misc/dfu-programmer { }; dfu-programmer = callPackage ../development/tools/misc/dfu-programmer { };