diff options
author | Wouter den Breejen <uu@denbreejen.net> | 2009-11-08 23:37:49 +0000 |
---|---|---|
committer | Wouter den Breejen <uu@denbreejen.net> | 2009-11-08 23:37:49 +0000 |
commit | 3259101fc0fafa85e6cf5da1c172f19ef63ffe99 (patch) | |
tree | 393d2cf7116bd9f017f66b5d0acf145cc7fc4a65 /pkgs/servers | |
parent | 96b4174b5af7b32b1fa45284615732e40f924001 (diff) | |
download | nixlib-3259101fc0fafa85e6cf5da1c172f19ef63ffe99.tar nixlib-3259101fc0fafa85e6cf5da1c172f19ef63ffe99.tar.gz nixlib-3259101fc0fafa85e6cf5da1c172f19ef63ffe99.tar.bz2 nixlib-3259101fc0fafa85e6cf5da1c172f19ef63ffe99.tar.lz nixlib-3259101fc0fafa85e6cf5da1c172f19ef63ffe99.tar.xz nixlib-3259101fc0fafa85e6cf5da1c172f19ef63ffe99.tar.zst nixlib-3259101fc0fafa85e6cf5da1c172f19ef63ffe99.zip |
Added par2, unzip/rar as dependencies so they are not picked up from PATH
svn path=/nixpkgs/trunk/; revision=18303
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/sabnzbd/builder.sh | 6 | ||||
-rw-r--r-- | pkgs/servers/sabnzbd/default.nix | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/servers/sabnzbd/builder.sh b/pkgs/servers/sabnzbd/builder.sh index fb6f48d8b4cb..c263500cde45 100644 --- a/pkgs/servers/sabnzbd/builder.sh +++ b/pkgs/servers/sabnzbd/builder.sh @@ -5,12 +5,12 @@ mv SABnzbd-* $out # Create a start script and let wrapProgram with toPythonPath wrap it so that python is started with cheetahTemplate in its importpath (classpath) mkdir $out/bin -echo "$python/bin/python $out/SABnzbd.py" > $out/bin/sabnzbd +echo "$python/bin/python $out/SABnzbd.py \$*" > $out/bin/sabnzbd chmod +x $out/bin/sabnzbd for i in $(cd $out/bin && ls); do - wrapProgram $out/bin/$i \ - --prefix PYTHONPATH : "$(toPythonPath $python):$(toPythonPath $out):$(toPythonPath $cheetahTemplate)" + wrapProgram $out/bin/$i --prefix PYTHONPATH : "$(toPythonPath $python):$(toPythonPath $out):$(toPythonPath $cheetahTemplate)" \ + --prefix PATH : "$par2cmdline/bin:$unzip/bin:$unrar/bin" done echo $out diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix index 9c2d947a4615..50e07f273291 100644 --- a/pkgs/servers/sabnzbd/default.nix +++ b/pkgs/servers/sabnzbd/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, python, cheetahTemplate, makeWrapper}: +{stdenv, fetchurl, python, cheetahTemplate, makeWrapper, par2cmdline, unzip, unrar}: stdenv.mkDerivation { name = "sabnzbd-0.4.12"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; buildInputs = [makeWrapper python cheetahTemplate]; - inherit stdenv python cheetahTemplate; + inherit stdenv python cheetahTemplate par2cmdline unzip unrar; builder = ./builder.sh; |