summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2008-04-23 07:34:20 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2008-04-23 07:34:20 +0000
commit09ab596e0f54ff1068856bab8d28bc4b8be26e09 (patch)
tree33094d24d6f7f4d8be915760321e849afdcf3b9c /pkgs/tools
parent16f2d8b2d527bd493982c47fef06a74e3fff0752 (diff)
downloadnixlib-09ab596e0f54ff1068856bab8d28bc4b8be26e09.tar
nixlib-09ab596e0f54ff1068856bab8d28bc4b8be26e09.tar.gz
nixlib-09ab596e0f54ff1068856bab8d28bc4b8be26e09.tar.bz2
nixlib-09ab596e0f54ff1068856bab8d28bc4b8be26e09.tar.lz
nixlib-09ab596e0f54ff1068856bab8d28bc4b8be26e09.tar.xz
nixlib-09ab596e0f54ff1068856bab8d28bc4b8be26e09.tar.zst
nixlib-09ab596e0f54ff1068856bab8d28bc4b8be26e09.zip
* Remove calls to fail().
svn path=/nixpkgs/branches/stdenv-updates/; revision=11690
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/backup/rdiff-backup/default.nix20
-rw-r--r--pkgs/tools/graphics/transfig/builder.sh2
2 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/tools/backup/rdiff-backup/default.nix
index 8cd660adc8c6..0c4f4b494fb0 100644
--- a/pkgs/tools/backup/rdiff-backup/default.nix
+++ b/pkgs/tools/backup/rdiff-backup/default.nix
@@ -7,18 +7,18 @@ stdenv.mkDerivation {
     sha256 = "0sh2kz90z47yfa9786dyn3q9ba1xcmjvd65rykvm7mg5apnrg27h";
   };
 
-  phases="installPhase";
-  installPhase="python setup.py install --prefix=\$out || fail
-  sed -i \$out/bin/rdiff-backup -e \\
-    \"/import sys/ asys.path += [ \\\"\$out/lib/python2.4/site-packages/\\\" ]\"
-    
-  ";
+  phases = "installPhase";
+  installPhase = ''
+    python setup.py install --prefix=$out
+    sed -i $out/bin/rdiff-backup -e \
+      "/import sys/ asys.path += [ \"$out/lib/python2.4/site-packages/\" ]"
+  '';
 
   buildInputs = [python librsync gnused ];
 
   meta = {
-      description = "backup system trying to combine best a mirror and an incremental backup system";
-      homepage = http://rdiff-backup.nongnu.org/;
-      license = "GPL-2";
-    };
+    description = "backup system trying to combine best a mirror and an incremental backup system";
+    homepage = http://rdiff-backup.nongnu.org/;
+    license = "GPL-2";
+  };
 }
diff --git a/pkgs/tools/graphics/transfig/builder.sh b/pkgs/tools/graphics/transfig/builder.sh
index 8a91d78a089b..d00aa90c61f0 100644
--- a/pkgs/tools/graphics/transfig/builder.sh
+++ b/pkgs/tools/graphics/transfig/builder.sh
@@ -4,7 +4,7 @@ patchPhase=patchPhase
 patchPhase() {
     for i in $patches; do
         header "applying patch $i" 3
-        patch -p0 < $i || fail
+        patch -p0 < $i
         stopNest
     done