summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2009-02-12 19:04:44 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2009-02-12 19:04:44 +0000
commit7bf6d9cbdf98902c0f5dbb724e36a924e53d3b37 (patch)
tree087047fad17814a6d6f68c200e43dfd01d341461 /pkgs/tools
parent8e6f58086d0f735faa0d04780e558e2b3e03dce6 (diff)
downloadnixpkgs-7bf6d9cbdf98902c0f5dbb724e36a924e53d3b37.tar
nixpkgs-7bf6d9cbdf98902c0f5dbb724e36a924e53d3b37.tar.gz
nixpkgs-7bf6d9cbdf98902c0f5dbb724e36a924e53d3b37.tar.bz2
nixpkgs-7bf6d9cbdf98902c0f5dbb724e36a924e53d3b37.tar.lz
nixpkgs-7bf6d9cbdf98902c0f5dbb724e36a924e53d3b37.tar.xz
nixpkgs-7bf6d9cbdf98902c0f5dbb724e36a924e53d3b37.tar.zst
nixpkgs-7bf6d9cbdf98902c0f5dbb724e36a924e53d3b37.zip
* cpio: apply a patch from Gentoo to make it build on GCC 4.3.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14046
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/archivers/cpio/default.nix14
1 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/tools/archivers/cpio/default.nix b/pkgs/tools/archivers/cpio/default.nix
index cb9ee9e7f06..cc00857f33d 100644
--- a/pkgs/tools/archivers/cpio/default.nix
+++ b/pkgs/tools/archivers/cpio/default.nix
@@ -2,8 +2,22 @@
 
 stdenv.mkDerivation {
   name = "cpio-2.9";
+  
   src = fetchurl {
     url = mirror://gnu/cpio/cpio-2.9.tar.bz2;
     sha256 = "01s7f9hg8kgpis96j99hgkiqgdy53pm7qi7bhm3fzx58jfk5z6mv";
   };
+
+  patches = [
+    # Make it compile on GCC 4.3.
+    (fetchurl {
+      url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/app-arch/cpio/files/cpio-2.9-gnu-inline.patch?rev=1.1";
+      sha256 = "1167hrq64h9lh3qhgasm2rivfzkkgx6fik92b017qfa0q61ff8c3";
+    })
+  ];
+
+  meta = {
+    homepage = http://www.gnu.org/software/cpio/;
+    description = "A program to create or extract from cpio archives";
+  };
 }