diff options
| author | Vladimír Čunát <v@cunat.cz> | 2022-05-24 16:13:24 +0200 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-05-24 22:47:53 +0000 |
| commit | 81bb75b6efb9ed4001ca4ed36da043b4fe264c3d (patch) | |
| tree | 16ff05bb1ee5a916be00eec93d7f938610ebd462 | |
| parent | Merge pull request #174335 from NixOS/backport-171679-to-release-22.05 (diff) | |
| download | nixpkgs-81bb75b6efb9ed4001ca4ed36da043b4fe264c3d.tar.gz | |
e2fsprogs: apply patch unconditionally
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 :-)
(cherry picked from commit f0089877040aa2d97814b9a3f261737115769dd4)
| -rw-r--r-- | pkgs/tools/filesystems/e2fsprogs/default.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index 7273d805a320..0958bb2955b1 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -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" ]; |