diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2021-09-12 08:11:59 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2021-09-12 08:12:18 +0100 |
| commit | f55fb21340b7fce2077656674e22145bf40bc3cf (patch) | |
| tree | 4e706f8c8f01b5393f36c7cc78672cf54595dfe8 /pkgs/tools/archivers | |
| parent | d370d9ee99c1ae8e7c5e71d2722309eb645fc3df (diff) | |
| download | nixpkgs-f55fb21340b7fce2077656674e22145bf40bc3cf.tar nixpkgs-f55fb21340b7fce2077656674e22145bf40bc3cf.tar.gz nixpkgs-f55fb21340b7fce2077656674e22145bf40bc3cf.tar.bz2 nixpkgs-f55fb21340b7fce2077656674e22145bf40bc3cf.tar.lz nixpkgs-f55fb21340b7fce2077656674e22145bf40bc3cf.tar.xz nixpkgs-f55fb21340b7fce2077656674e22145bf40bc3cf.tar.zst nixpkgs-f55fb21340b7fce2077656674e22145bf40bc3cf.zip | |
cpio: pull upstream fix for -fno-common compiler
Fixes build failure against upstream gcc (defaults -fno-common).
Diffstat (limited to 'pkgs/tools/archivers')
| -rw-r--r-- | pkgs/tools/archivers/cpio/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/tools/archivers/cpio/default.nix b/pkgs/tools/archivers/cpio/default.nix index c172edd1fd9..adf73732f6d 100644 --- a/pkgs/tools/archivers/cpio/default.nix +++ b/pkgs/tools/archivers/cpio/default.nix @@ -17,6 +17,12 @@ in stdenv.mkDerivation { url = "https://git.savannah.gnu.org/cgit/cpio.git/patch/?id=dd96882877721703e19272fe25034560b794061b"; sha256 = "0vmr0qjwj2ldnzsvccl105ckwgx3ssvn9mp3f27ss0kiyigrzz32"; }) + (fetchpatch { + # upstream build fix against -fno-common compilers like >=gcc-10 + name = "fno-common-fix.patch"; + url = "https://git.savannah.gnu.org/cgit/cpio.git/patch/?id=641d3f489cf6238bb916368d4ba0d9325a235afb"; + sha256 = "1ffawzxjw72kzpdwffi2y7pvibrmwf4jzrxdq9f4a75q6crl66iq"; + }) ]; preConfigure = if stdenv.isCygwin then '' |