diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-07-22 13:18:07 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-07-22 13:18:07 +0000 |
| commit | 0db478d40b9126efe5dfa9cd5689ad1262e67681 (patch) | |
| tree | 48439150c08c5d1b8728bf71187e22c1a6fb5200 /pkgs/tools/archivers | |
| parent | ea14f111ddaf0082fe99d323799dd99eca4bb1a2 (diff) | |
| parent | 8115040c08396d99bc2b781f1c639b505278c8dd (diff) | |
| download | nixlib-0db478d40b9126efe5dfa9cd5689ad1262e67681.tar nixlib-0db478d40b9126efe5dfa9cd5689ad1262e67681.tar.gz nixlib-0db478d40b9126efe5dfa9cd5689ad1262e67681.tar.bz2 nixlib-0db478d40b9126efe5dfa9cd5689ad1262e67681.tar.lz nixlib-0db478d40b9126efe5dfa9cd5689ad1262e67681.tar.xz nixlib-0db478d40b9126efe5dfa9cd5689ad1262e67681.tar.zst nixlib-0db478d40b9126efe5dfa9cd5689ad1262e67681.zip | |
* Sync with the trunk.
svn path=/nixpkgs/branches/x-updates/; revision=22707
Diffstat (limited to 'pkgs/tools/archivers')
| -rw-r--r-- | pkgs/tools/archivers/cpio/darwin-fix.patch | 15 | ||||
| -rw-r--r-- | pkgs/tools/archivers/cpio/default.nix | 8 |
2 files changed, 22 insertions, 1 deletions
diff --git a/pkgs/tools/archivers/cpio/darwin-fix.patch b/pkgs/tools/archivers/cpio/darwin-fix.patch new file mode 100644 index 000000000000..0e8ff168c526 --- /dev/null +++ b/pkgs/tools/archivers/cpio/darwin-fix.patch @@ -0,0 +1,15 @@ +Fix Darwin builds. + +From <http://git.savannah.gnu.org/cgit/cpio.git/commit/?id=3a7a1820d4cecbd77c7b74c785af5942510bf080>. +See also <http://lists.gnu.org/archive/html/bug-cpio/2010-07/msg00001.html>. + +diff --git a/src/filetypes.h b/src/filetypes.h +index f80faab..81f0c32 100644 +--- a/src/filetypes.h ++++ b/src/filetypes.h +@@ -81,5 +81,3 @@ + #ifndef S_ISLNK + #define lstat stat + #endif +-int lstat (); +-int stat (); diff --git a/pkgs/tools/archivers/cpio/default.nix b/pkgs/tools/archivers/cpio/default.nix index 25777e843111..4fa99a0ea42b 100644 --- a/pkgs/tools/archivers/cpio/default.nix +++ b/pkgs/tools/archivers/cpio/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl}: -stdenv.mkDerivation { +stdenv.mkDerivation ({ name = "cpio-2.11"; src = fetchurl { @@ -34,3 +34,9 @@ stdenv.mkDerivation { platforms = stdenv.lib.platforms.all; }; } + +// + +(if stdenv.isLinux + then {} + else { patches = [ ./darwin-fix.patch ]; })) |