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

Do not use top-level buildPythonPackage or buildPythonApplication

Browse Source 
but instead use the one in pythonPackages.
This commit is contained in:
Frederik Rietdijk
2016-09-26 11:10:51 +02:00
parent 2f4da5bd83
commit 3ba16c8234
22 changed files with 68 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/window-managers/qtile/default.nix
+6 -6
View File
@@ -1,11 +1,11 @@
{ stdenv, fetchFromGitHub, buildPythonApplication, python27Packages, pkgs }:
{ stdenv, fetchFromGitHub, python27Packages, glib, cairo, pango, pkgconfig, libxcb, xcbutilcursor }:
let cairocffi-xcffib = python27Packages.cairocffi.override {
pythonPath = [ python27Packages.xcffib ];
};
in
buildPythonApplication rec {
python27Packages.buildPythonApplication rec {
name = "qtile-${version}";
version = "0.10.4";
@@ -24,12 +24,12 @@ buildPythonApplication rec {
postPatch = ''
substituteInPlace libqtile/manager.py --subst-var-by out $out
substituteInPlace libqtile/pangocffi.py --subst-var-by glib ${pkgs.glib.out}
substituteInPlace libqtile/pangocffi.py --subst-var-by pango ${pkgs.pango.out}
substituteInPlace libqtile/xcursors.py --subst-var-by xcb-cursor ${pkgs.xorg.xcbutilcursor.out}
substituteInPlace libqtile/pangocffi.py --subst-var-by glib ${glib.out}
substituteInPlace libqtile/pangocffi.py --subst-var-by pango ${pango.out}
substituteInPlace libqtile/xcursors.py --subst-var-by xcb-cursor ${xcbutilcursor.out}
'';
buildInputs = [ pkgs.pkgconfig pkgs.glib pkgs.xorg.libxcb pkgs.cairo pkgs.pango python27Packages.xcffib ];
buildInputs = [ pkgconfig glib libxcb cairo pango python27Packages.xcffib ];
pythonPath = with python27Packages; [ xcffib cairocffi-xcffib trollius readline];