diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-12-27 17:33:37 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-12-27 17:33:37 +0000 |
| commit | 1d9dcbba2268d9fc482746a5329b24ed9e7a59de (patch) | |
| tree | 4edba03d1d542b78bfe1eb10137231cc4e94f61a /pkgs/stdenv/generic | |
| parent | 8988c16eeaf43fdcbbcba66ef2f67154eab6b3d5 (diff) | |
| download | nixlib-1d9dcbba2268d9fc482746a5329b24ed9e7a59de.tar nixlib-1d9dcbba2268d9fc482746a5329b24ed9e7a59de.tar.gz nixlib-1d9dcbba2268d9fc482746a5329b24ed9e7a59de.tar.bz2 nixlib-1d9dcbba2268d9fc482746a5329b24ed9e7a59de.tar.lz nixlib-1d9dcbba2268d9fc482746a5329b24ed9e7a59de.tar.xz nixlib-1d9dcbba2268d9fc482746a5329b24ed9e7a59de.tar.zst nixlib-1d9dcbba2268d9fc482746a5329b24ed9e7a59de.zip | |
* Allow the patch flags to be overriden through $patchFlags.
svn path=/nixpkgs/trunk/; revision=7493
Diffstat (limited to 'pkgs/stdenv/generic')
| -rw-r--r-- | pkgs/stdenv/generic/setup-new2.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/stdenv/generic/setup-new2.sh b/pkgs/stdenv/generic/setup-new2.sh index 869f51e4f3db..3110637d2628 100644 --- a/pkgs/stdenv/generic/setup-new2.sh +++ b/pkgs/stdenv/generic/setup-new2.sh @@ -474,6 +474,10 @@ patchW() { return fi + if test -z "$patchFlags"; then + patchFlags="-p1" + fi + for i in $patches; do header "applying patch $i" 3 local uncompress=cat @@ -485,7 +489,7 @@ patchW() { uncompress=bunzip2 ;; esac - $uncompress < $i | patch -p1 || fail + $uncompress < $i | patch $patchFlags || fail stopNest done } |