Added par2, unzip/rar as dependencies so they are not picked up from PATH
svn path=/nixpkgs/trunk/; revision=18303
This commit is contained in:
parent
96b4174b5a
commit
3259101fc0
|
@ -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)
|
# 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
|
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
|
chmod +x $out/bin/sabnzbd
|
||||||
|
|
||||||
for i in $(cd $out/bin && ls); do
|
for i in $(cd $out/bin && ls); do
|
||||||
wrapProgram $out/bin/$i \
|
wrapProgram $out/bin/$i --prefix PYTHONPATH : "$(toPythonPath $python):$(toPythonPath $out):$(toPythonPath $cheetahTemplate)" \
|
||||||
--prefix PYTHONPATH : "$(toPythonPath $python):$(toPythonPath $out):$(toPythonPath $cheetahTemplate)"
|
--prefix PATH : "$par2cmdline/bin:$unzip/bin:$unrar/bin"
|
||||||
done
|
done
|
||||||
|
|
||||||
echo $out
|
echo $out
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{stdenv, fetchurl, python, cheetahTemplate, makeWrapper}:
|
{stdenv, fetchurl, python, cheetahTemplate, makeWrapper, par2cmdline, unzip, unrar}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "sabnzbd-0.4.12";
|
name = "sabnzbd-0.4.12";
|
||||||
|
@ -9,7 +9,7 @@ stdenv.mkDerivation {
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [makeWrapper python cheetahTemplate];
|
buildInputs = [makeWrapper python cheetahTemplate];
|
||||||
inherit stdenv python cheetahTemplate;
|
inherit stdenv python cheetahTemplate par2cmdline unzip unrar;
|
||||||
|
|
||||||
builder = ./builder.sh;
|
builder = ./builder.sh;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue