diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-06 20:31:39 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-13 20:18:51 +0200 |
| commit | cba6641623e8a22e37ed3538c73fd6b45dbaed60 (patch) | |
| tree | ff025b207df05b62773918e7b2621c2e641a35c8 /pkgs/applications/window-managers/qtile | |
| parent | 339926031e6043aecd6afe178d03cbf934d0d168 (diff) | |
cairo, pango: fix some string references
Diffstat (limited to 'pkgs/applications/window-managers/qtile')
| -rw-r--r-- | pkgs/applications/window-managers/qtile/default.nix | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index 236baa131c94..3a26666a529b 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildPythonPackage, python27Packages, pkgs }: +{ stdenv, lib, fetchFromGitHub, buildPythonPackage, python27Packages, pkgs }: buildPythonPackage rec { name = "qtile-${version}"; @@ -20,20 +20,18 @@ buildPythonPackage rec { buildInputs = [ pkgs.pkgconfig pkgs.glib pkgs.xorg.libxcb pkgs.cairo pkgs.pango python27Packages.xcffib ]; cairocffi-xcffib = python27Packages.cairocffi.override { - LD_LIBRARY_PATH = "${pkgs.xorg.libxcb}/lib:${pkgs.cairo}/lib"; + inherit LD_LIBRARY_PATH; pythonPath = [ python27Packages.xcffib ]; }; pythonPath = with python27Packages; [ xcffib cairocffi-xcffib trollius readline ]; - LD_LIBRARY_PATH = "${pkgs.xorg.libxcb}/lib:${pkgs.cairo}/lib"; + LD_LIBRARY_PATH = "${lib.makeLibraryPath [ pkgs.xorg.libxcb pkgs.cairo ]}"; postInstall = '' wrapProgram $out/bin/qtile \ - --prefix LD_LIBRARY_PATH : ${pkgs.xorg.libxcb}/lib \ - --prefix LD_LIBRARY_PATH : ${pkgs.glib}/lib \ - --prefix LD_LIBRARY_PATH : ${pkgs.cairo}/lib \ - --prefix LD_LIBRARY_PATH : ${pkgs.pango}/lib + --prefix LD_LIBRARY_PATH : \ + "${LD_LIBRARY_PATH}:${lib.makeLibraryPath [ pkgs.glib pkgs.pango ]}" ''; meta = with stdenv.lib; { |