cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge #137500: sharutils: fix for -fno-common

Browse source 
... into staging
This commit is contained in:
Vladimír Čunát 2021-09-24 11:04:23 +02:00
commit 09d25d706f
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkgs/tools/archivers/sharutils/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, gettext, coreutils }:
{ lib, stdenv, fetchurl, fetchpatch, gettext, coreutils }:
stdenv.mkDerivation rec {
pname = "sharutils";
@ -30,6 +30,19 @@ stdenv.mkDerivation rec {
url = "https://sources.debian.org/data/main/s/sharutils/1:4.15.2-4/debian/patches/02-fix-ftbfs-with-glibc-2.28.patch";
sha256 = "15kpjqnfs98n6irmkh8pw7masr08xala7gx024agv7zv14722vkc";
})
# pending upstream build fix against -fno-common compilers like >=gcc-10
# Taken from https://lists.gnu.org/archive/html/bug-gnu-utils/2020-01/msg00002.html
(fetchpatch {
name = "sharutils-4.15.2-Fix-building-with-GCC-10.patch";
url = "https://lists.gnu.org/archive/html/bug-gnu-utils/2020-01/txtDL8i6V6mUU.txt";
sha256 = "0kfch1vm45lg237hr6fdv4b2lh5b1933k0fn8yj91gqm58svskvl";
})
(fetchpatch {
name = "sharutils-4.15.2-Do-not-include-lib-md5.c-into-src-shar.c.patch";
url = "https://lists.gnu.org/archive/html/bug-gnu-utils/2020-01/txt5Z_KZup0yN.txt";
sha256 = "0an8vfy3qj6sss9w0i4j8ilf7g5mbc7y13l644jy5bcm9przcjbd";
})
];
postPatch = let