Skip to content

Commit 37bc2d1

Browse files
committed
nix/e2fsprogs: add not fortified version and use it from unblob
To work around an upstream bug[^1]. The modified package is renamed to not cause cascading rebuilds of dependent packages and to not override the original package in user environments when unblob is used as an overlay. [^1]: tytso/e2fsprogs#152
1 parent c19a615 commit 37bc2d1

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

nix/unblob/default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
, treelib
2727
# Runtime dependencies (extractors)
2828
, pkgs
29-
, e2fsprogs
29+
, e2fsprogs-nofortify
3030
, lziprecover
3131
, lzop
3232
, p7zip
@@ -42,7 +42,7 @@ let
4242

4343
# These dependencies are only added to PATH
4444
runtimeDeps = [
45-
e2fsprogs
45+
e2fsprogs-nofortify
4646
lziprecover
4747
lzop
4848
p7zip

overlay.nix

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@ inputs: final: prev:
44
inherit (final.python3.pkgs) unblob;
55
_sources = final.callPackage ./nix/_sources/generated.nix { };
66

7+
# https://github.com/tytso/e2fsprogs/issues/152
8+
e2fsprogs-nofortify = prev.e2fsprogs.overrideAttrs
9+
(super: {
10+
pname = "e2fsprogs-nofortify";
11+
hardeningDisable = (super.hardeningDisable or [ ]) ++ [ "fortify3" ];
12+
});
13+
714
# Lief 12.3 incompatibility with Cmake 3.26
815
lief = prev.lief.overrideAttrs (super: {
916
postPatch = ''

0 commit comments

Comments
 (0)