movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-12 04:35:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

* Remove calls to fail().

Browse source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=11690
This commit is contained in:
Eelco Dolstra 2008-04-23 07:34:20 +00:00
parent 16f2d8b2d5
commit 09ab596e0f
13 changed files with 44 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/networking/p2p/valknut/builder.sh
View file

@ -1,7 +1,7 @@
addInputsHook=addBzip2 addInputsHook=addBzip2
addBzip2() { addBzip2() {
bzip2=$(type -tP bzip2) bzip2=$(type -tP bzip2)
test -n $bzip2 || fail test -n $bzip2
buildInputs="$(dirname $(dirname $bzip2)) $buildInputs" buildInputs="$(dirname $(dirname $bzip2)) $buildInputs"
} }

4
pkgs/applications/video/mythtv/builder.sh
View file

@ -11,8 +11,8 @@ echo $LD_LIBRARY_PATH
buildPhase=myBuilder buildPhase=myBuilder
myBuilder() { myBuilder() {
qmake mythtv.pro || fail qmake mythtv.pro
make || fail make
} }

4
pkgs/development/compilers/abc/builder-binjar.sh
View file

@ -1,4 +1,4 @@
source $stdenv/setup source $stdenv/setup
ensureDir $out/jars || fail ensureDir $out/jars
cp $src $out/jars/$jarname.jar || fail cp $src $out/jars/$jarname.jar

6
pkgs/development/compilers/abc/builder.sh
View file

@ -1,12 +1,12 @@
source $stdenv/setup source $stdenv/setup
tar zxvf $src || fail tar zxvf $src
cd abc-* || fail cd abc-*
for p in $patches; do for p in $patches; do
echo "applying patch $p" echo "applying patch $p"
patch -p1 < $p || fail patch -p1 < $p
done done
cat > ant.settings <<EOF cat > ant.settings <<EOF

10
pkgs/development/compilers/abc/jasmin/builder.sh
View file

@ -1,7 +1,7 @@
source $stdenv/setup source $stdenv/setup
tar zxvf $src || fail tar zxvf $src
cd jasmin-* || fail cd jasmin-*
sed -e 's/<javac/<javac source="1.4"/' build.xml > build-tmp.xml sed -e 's/<javac/<javac source="1.4"/' build.xml > build-tmp.xml
mv build-tmp.xml build.xml mv build-tmp.xml build.xml
@ -18,7 +18,7 @@ jasmin.version=foo
build.compiler=javac1.4 build.compiler=javac1.4
EOF EOF
ant jasmin-jar || fail ant jasmin-jar
ensureDir $out/jars/ || fail ensureDir $out/jars/
mv lib/jasminclasses-foo.jar $out/jars/jasmin.jar || fail mv lib/jasminclasses-foo.jar $out/jars/jasmin.jar

14
pkgs/development/compilers/abc/polyglot/builder.sh
View file

@ -1,11 +1,11 @@
source $stdenv/setup source $stdenv/setup
tar zxvf $src || fail tar zxvf $src
cd polyglot-* || fail cd polyglot-*
ant polyglot-jar || fail ant polyglot-jar
ant cup || fail ant cup
ensureDir $out/jars/ || fail ensureDir $out/jars/
mv lib/java_cup.jar $out/jars/ || fail mv lib/java_cup.jar $out/jars/
mv lib/polyglot*.jar $out/jars/ || fail mv lib/polyglot*.jar $out/jars/

10
pkgs/development/compilers/abc/soot/builder.sh
View file

@ -1,7 +1,7 @@
source $stdenv/setup source $stdenv/setup
tar zxvf $src || fail tar zxvf $src
cd soot-* || fail cd soot-*
export NIX_ANT_OPTS="$ANT_OPTS -Xmx200m" export NIX_ANT_OPTS="$ANT_OPTS -Xmx200m"
@ -13,7 +13,7 @@ release.loc=lib
javaapi.url=http://java.sun.com/j2se/1.4.2/docs/api/ javaapi.url=http://java.sun.com/j2se/1.4.2/docs/api/
EOF EOF
ant classesjar || fail ant classesjar
ensureDir $out/jars/ || fail ensureDir $out/jars/
mv lib/sootclasses-foo.jar $out/jars/soot.jar || fail mv lib/sootclasses-foo.jar $out/jars/soot.jar

2
pkgs/development/compilers/jdk/dlj-bundle-builder.sh
View file

@ -5,7 +5,7 @@ unzip ${src} || true
# set the dynamic linker of unpack200, necessary for construct script # set the dynamic linker of unpack200, necessary for construct script
echo "patching unpack200" echo "patching unpack200"
patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" --set-rpath "" */bin/unpack200 || fail patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" --set-rpath "" */bin/unpack200
echo "constructing JDK and JRE installations" echo "constructing JDK and JRE installations"
if test -z "$installjdk"; then if test -z "$installjdk"; then

4
pkgs/development/compilers/qcmm/builder.sh
View file

@ -19,13 +19,11 @@ installPhase() {
find $out/man -type f -exec gzip -9 {} \; find $out/man -type f -exec gzip -9 {} \;
find $out -name \*.a -exec echo stripping {} \; \ find $out -name \*.a -exec echo stripping {} \; \
-exec strip -S {} \; || fail -exec strip -S {} \;
patchELF $out patchELF $out
} }
buildPhase=buildPhase
installPhase=installPhase
checkPhase="mk $MKFLAGS test.opt" checkPhase="mk $MKFLAGS test.opt"
genericBuild genericBuild

4
pkgs/development/libraries/openssl/default.nix
View file

@ -1,4 +1,6 @@
{stdenv, fetchurl, perl}: stdenv.mkDerivation { {stdenv, fetchurl, perl}:
stdenv.mkDerivation {
name = "openssl-0.9.8g"; name = "openssl-0.9.8g";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {

8
pkgs/development/tools/build-managers/scons/builder.sh
View file

@ -1,13 +1,11 @@
source $stdenv/setup source $stdenv/setup
buildPhase=myBuildPhase buildPhase() {
myBuildPhase() {
true true
} }
installPhase=myInstallPhase installPhase() {
myInstallPhase() { python setup.py install --prefix=$out
python setup.py install --prefix=$out || fail
} }
genericBuild genericBuild

20
pkgs/tools/backup/rdiff-backup/default.nix
View file

@ -7,18 +7,18 @@ stdenv.mkDerivation {
sha256 = "0sh2kz90z47yfa9786dyn3q9ba1xcmjvd65rykvm7mg5apnrg27h"; sha256 = "0sh2kz90z47yfa9786dyn3q9ba1xcmjvd65rykvm7mg5apnrg27h";
}; };
phases="installPhase"; phases = "installPhase";
installPhase="python setup.py install --prefix=\$out || fail installPhase = ''
sed -i \$out/bin/rdiff-backup -e \\ python setup.py install --prefix=$out
\"/import sys/ asys.path += [ \\\"\$out/lib/python2.4/site-packages/\\\" ]\" sed -i $out/bin/rdiff-backup -e \
"/import sys/ asys.path += [ \"$out/lib/python2.4/site-packages/\" ]"
"; '';
buildInputs = [python librsync gnused ]; buildInputs = [python librsync gnused ];
meta = { meta = {
description = "backup system trying to combine best a mirror and an incremental backup system"; description = "backup system trying to combine best a mirror and an incremental backup system";
homepage = http://rdiff-backup.nongnu.org/; homepage = http://rdiff-backup.nongnu.org/;
license = "GPL-2"; license = "GPL-2";
}; };
} }

2
pkgs/tools/graphics/transfig/builder.sh
View file

@ -4,7 +4,7 @@ patchPhase=patchPhase
patchPhase() { patchPhase() {
for i in $patches; do for i in $patches; do
header "applying patch $i" 3 header "applying patch $i" 3
patch -p0 < $i || fail patch -p0 < $i
stopNest stopNest
done done