JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #137491: cpio: upstream fix for -fno-common

Browse Source 
... into staging
This commit is contained in:
Vladimír Čunát 2021-09-24 09:06:26 +02:00
commit 19b69b60c5
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/archivers/cpio/default.nix
View File

@ -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 ''