pyrox.dev
lol
Merge #137500: sharutils: fix for -fno-common
... into staging
+14
-1
pkgs/tools/archivers/sharutils/default.nix
+14
-1
pkgs/tools/archivers/sharutils/default.nix
···
1
-
{ lib, stdenv, fetchurl, gettext, coreutils }:
1
+
{ lib, stdenv, fetchurl, fetchpatch, gettext, coreutils }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "sharutils";
···
29
29
(fetchurl {
30
30
url = "https://sources.debian.org/data/main/s/sharutils/1:4.15.2-4/debian/patches/02-fix-ftbfs-with-glibc-2.28.patch";
31
31
sha256 = "15kpjqnfs98n6irmkh8pw7masr08xala7gx024agv7zv14722vkc";
32
+
})
33
+
34
+
# pending upstream build fix against -fno-common compilers like >=gcc-10
35
+
# Taken from https://lists.gnu.org/archive/html/bug-gnu-utils/2020-01/msg00002.html
36
+
(fetchpatch {
37
+
name = "sharutils-4.15.2-Fix-building-with-GCC-10.patch";
38
+
url = "https://lists.gnu.org/archive/html/bug-gnu-utils/2020-01/txtDL8i6V6mUU.txt";
39
+
sha256 = "0kfch1vm45lg237hr6fdv4b2lh5b1933k0fn8yj91gqm58svskvl";
40
+
})
41
+
(fetchpatch {
42
+
name = "sharutils-4.15.2-Do-not-include-lib-md5.c-into-src-shar.c.patch";
43
+
url = "https://lists.gnu.org/archive/html/bug-gnu-utils/2020-01/txt5Z_KZup0yN.txt";
44
+
sha256 = "0an8vfy3qj6sss9w0i4j8ilf7g5mbc7y13l644jy5bcm9przcjbd";
32
45
})
33
46
];
34
47