diff options
| author | Jason "Don" O'Conal <lovek323@gmail.com> | 2014-05-15 08:30:25 +1000 |
|---|---|---|
| committer | Jason "Don" O'Conal <lovek323@gmail.com> | 2014-06-02 08:10:38 +1000 |
| commit | 9b080f87e417a388bca8fc9826765491ec1c826c (patch) | |
| tree | 24ef3d24ea00cf8f6087e6e938f7abe2d423f826 /pkgs/applications/networking/irc | |
| parent | 4debe3c9276d03a0edc16aa41095053af955cd33 (diff) | |
| download | nixlib-9b080f87e417a388bca8fc9826765491ec1c826c.tar nixlib-9b080f87e417a388bca8fc9826765491ec1c826c.tar.gz nixlib-9b080f87e417a388bca8fc9826765491ec1c826c.tar.bz2 nixlib-9b080f87e417a388bca8fc9826765491ec1c826c.tar.lz nixlib-9b080f87e417a388bca8fc9826765491ec1c826c.tar.xz nixlib-9b080f87e417a388bca8fc9826765491ec1c826c.tar.zst nixlib-9b080f87e417a388bca8fc9826765491ec1c826c.zip | |
weechat: fix pythonpath
Diffstat (limited to 'pkgs/applications/networking/irc')
| -rw-r--r-- | pkgs/applications/networking/irc/weechat/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/networking/irc/weechat/devel.nix | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 5e5cf8d9002f..954651d79e95 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -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 = { diff --git a/pkgs/applications/networking/irc/weechat/devel.nix b/pkgs/applications/networking/irc/weechat/devel.nix index b858203b0f8c..25cc8dd76603 100644 --- a/pkgs/applications/networking/irc/weechat/devel.nix +++ b/pkgs/applications/networking/irc/weechat/devel.nix @@ -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 = { |