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

cairo, pango: fix some string references

Browse Source
This commit is contained in:
Vladimír Čunát
2015-10-13 20:18:51 +02:00
parent 339926031e
commit cba6641623
14 changed files with 32 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/window-managers/awesome/default.nix
+1 -1
View File
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
#cmakeFlags = "-DGENERATE_MANPAGES=ON";
LD_LIBRARY_PATH = "${stdenv.lib.makeLibraryPath [ cairo pango gobjectIntrospection ]}";
GI_TYPELIB_PATH = "${pango}/lib/girepository-1.0";
GI_TYPELIB_PATH = "${pango.out}/lib/girepository-1.0";
LUA_CPATH = "${lgi}/lib/lua/${lua.luaversion}/?.so";
LUA_PATH = "${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua";
pkgs/applications/window-managers/qtile/default.nix
+5 -7
View File
@@ -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; {