Skip to content

Commit 5fb8b0a

Browse files
authored
libmcrypt: fix build with gcc14; stegseek: mark broken on darwin, only test on x86_64-linux (#372261)
2 parents 8e97141 + 3022e62 commit 5fb8b0a

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

pkgs/by-name/li/libmcrypt/package.nix

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,10 @@ stdenv.mkDerivation rec {
2525
"ac_cv_func_realloc_0_nonnull=yes"
2626
];
2727

28-
env = lib.optionalAttrs stdenv.cc.isClang {
29-
NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration -Wno-implicit-int";
30-
};
28+
env.NIX_CFLAGS_COMPILE = toString [
29+
"-Wno-implicit-function-declaration"
30+
"-Wno-implicit-int"
31+
];
3132

3233
meta = {
3334
description = "Replacement for the old crypt() package and crypt(1) command, with extensions";

pkgs/by-name/st/stegseek/package.nix

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,11 @@ stdenv.mkDerivation rec {
3131
zlib
3232
];
3333

34-
doCheck = true;
34+
# tests get stuck on aarch64-linux
35+
doCheck = stdenv.isx86_64 && stdenv.isLinux;
3536

3637
meta = with lib; {
38+
broken = stdenv.isDarwin;
3739
description = "Tool to crack steganography";
3840
longDescription = ''
3941
Stegseek is a lightning fast steghide cracker that can be

0 commit comments

Comments
 (0)