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

weechat: fix pythonpath

Browse Source
This commit is contained in:
Jason "Don" O'Conal 2014-05-15 08:30:25 +10:00
parent 4debe3c927
commit 9b080f87e4
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/networking/irc/weechat/default.nix
View File

@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
'' + '' '' + ''
wrapProgram "$out/bin/weechat" \ wrapProgram "$out/bin/weechat" \
--prefix PYTHONPATH : "$PYTHONPATH" \ --prefix PYTHONPATH : "$PYTHONPATH" \
--prefix PYTHONPATH : "$out/lib/${python.libPrefix}/site-packages" --prefix PYTHONPATH : "$NIX_PYTHONPATH"
''; '';
meta = { meta = {

14
pkgs/applications/networking/irc/weechat/devel.nix
View File

@ -3,14 +3,14 @@
, pythonPackages, cacert, cmake, makeWrapper }: , pythonPackages, cacert, cmake, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
rev = "85b8e0d82bf99ca2c55a87482ee40b3043df14db"; rev = "70d2b0ad8eb7854932d24c007a05b8627f751205";
version = "0.4.4-rev${rev}"; version = "1.0-rev${rev}";
name = "weechat-${version}"; name = "weechat-${version}";
src = fetchgit { src = fetchgit {
inherit rev; inherit rev;
url = "git://github.com/weechat/weechat.git"; url = "git://github.com/weechat/weechat.git";
sha256 = "0kzsar7gmw2sgkdzcspg65prii8skpaqxvdyvas2a29dr07j2gnl"; sha256 = "1k7kcrq46anq87r14sq3vrhij8acn6id7zxyhn0qnjj2wqgrjp5i";
}; };
buildInputs = buildInputs =
@ -22,13 +22,13 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}"; NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}";
postInstall = '' postInstall = ''
NIX_PYTHONPATH="$out/lib/${python.libPrefix}/site-packages" NIX_PYTHON_PATH="$out/lib/${python.libPrefix}/site-packages"
'' + stdenv.lib.optionalString stdenv.isDarwin '' '' + stdenv.lib.optionalString stdenv.isDarwin ''
NIX_PYTHONPATH+="${pythonPackages.pync}/lib/${python.libPrefix}/site-packages" NIX_PYTHON_PATH+="${pythonPackages.pync}/lib/${python.libPrefix}/site-packages"
'' + '' '' + ''
wrapProgram "$out/bin/weechat" \ wrapProgram "$out/bin/weechat" \
--prefix PYTHONPATH : "$PYTHONPATH" \ --prefix PYTHONPATH : "$PYTHONPATH" \
--prefix PYTHONPATH : "$out/lib/${python.libPrefix}/site-packages" --prefix PYTHONPATH : "$NIX_PYTHONPATH"
''; '';
meta = { meta = {