mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 22:50:49 +00:00
Code Issues 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" \
--prefix PYTHONPATH : "$PYTHONPATH" \
--prefix PYTHONPATH : "$out/lib/${python.libPrefix}/site-packages"
--prefix PYTHONPATH : "$NIX_PYTHONPATH"
'';
meta = {

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

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