BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

e2fsprogs: apply patch unconditionally

Browse source 
Commit 49d0a5afd mistakenly inverted when to apply the patch.
Maybe it's not needed anymore, as pkgsMusl.e2fsprogs succeeded for me
even without it, but it looks harmless and better not have it inversed.
This way we also don't cause a mass rebuild :-)
This commit is contained in:
Vladimír Čunát 2022-05-24 16:13:24 +02:00
parent 1cb669339f
commit f008987704
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/tools/filesystems/e2fsprogs/default.nix
View file

@ -22,15 +22,13 @@ stdenv.mkDerivation rec {
buildInputs = [ libuuid gettext ]
++ lib.optionals stdenv.isLinux [ fuse ];
# Only use glibc's __GNUC_PREREQ(X,Y) (checks if compiler is gcc version >= X.Y) when using glibc
patches = [
(fetchpatch {
name = "CVE-2022-1304.patch";
url = "https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/patch/?id=ab51d587bb9b229b1fade1afd02e1574c1ba5c76";
sha256 = "sha256-YEEow34/81NBOc6F6FS6i505FCQ7GHeIz0a0qWNs7Fg=";
})
] ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [
(fetchpatch {
(fetchpatch { # avoid using missing __GNUC_PREREQ(X,Y)
url = "https://raw.githubusercontent.com/void-linux/void-packages/9583597eb3e6e6b33f61dbc615d511ce030bc443/srcpkgs/e2fsprogs/patches/fix-glibcism.patch";
sha256 = "1gfcsr0i3q8q2f0lqza8na0iy4l4p3cbii51ds6zmj0y4hz2dwhb";
excludes = [ "lib/ext2fs/hashmap.h" ];