Skip to content

Commit b4b4605

Browse files
strace: fix strace 6.17
1 parent e778416 commit b4b4605

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

modules/strace.nix

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,15 @@ in
1414
environment.systemPackages = [
1515
(pkgs.strace.overrideAttrs ({ patches ? [ ], version, ... }: {
1616
patches = patches ++ [
17-
(pkgs.fetchpatch {
18-
url = "https://github.com/xfgusta/strace-with-colors/raw/v${version}-1/strace-with-colors.patch";
17+
(let
18+
patchVersion = if lib.versionAtLeast version "6.16" then "6.16" else "6.3";
19+
in pkgs.fetchpatch {
20+
url = "https://github.com/xfgusta/strace-with-colors/raw/v${patchVersion}-1/strace-with-colors.patch";
1921
name = "strace-with-colors-${version}.patch";
2022
hash = {
2123
"6.16" = "sha256-Uw4lOKuEwT6kTwLZYuTqlq64wBHDt5kL5JwV7hdiBNg=";
2224
"6.3" = "sha256-gcQldGsRgvGnrDX0zqcLTpEpchNEbCUFdKyii0wetEI=";
23-
}.${version} or (throw "nixos-modules.strace: does not know a patch for strace version ${version}");
25+
}.${patchVersion} or (throw "nixos-modules.strace: does not know a patch for strace version ${version}");
2426
})
2527
];
2628
}))

0 commit comments

Comments
 (0)