Author: ludo Date: Thu Jul 22 12:20:11 2010 New Revision: 22705 URL: https://svn.nixos.org/websvn/nix/?rev=22705&sc=1
Log: GNU cpio: Add fix for Darwin. Added: nixpkgs/trunk/pkgs/tools/archivers/cpio/darwin-fix.patch Modified: nixpkgs/trunk/pkgs/tools/archivers/cpio/default.nix Added: nixpkgs/trunk/pkgs/tools/archivers/cpio/darwin-fix.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ nixpkgs/trunk/pkgs/tools/archivers/cpio/darwin-fix.patch Thu Jul 22 12:20:11 2010 (r22705) @@ -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 (); Modified: nixpkgs/trunk/pkgs/tools/archivers/cpio/default.nix ============================================================================== --- nixpkgs/trunk/pkgs/tools/archivers/cpio/default.nix Thu Jul 22 12:16:34 2010 (r22704) +++ nixpkgs/trunk/pkgs/tools/archivers/cpio/default.nix Thu Jul 22 12:20:11 2010 (r22705) @@ -1,6 +1,6 @@ {stdenv, fetchurl}: -stdenv.mkDerivation { +stdenv.mkDerivation ({ name = "cpio-2.11"; src = fetchurl { @@ -34,3 +34,9 @@ platforms = stdenv.lib.platforms.all; }; } + +// + +(if stdenv.isLinux + then {} + else { patches = [ ./darwin-fix.patch ]; })) _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
