junkie: unbreak on aarch64-darwin
This commit is contained in:
parent
83481b8708
commit
8084188a43
|
@ -1,4 +1,4 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, libpcap, guile, openssl }:
|
{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, libpcap, guile, openssl }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "junkie";
|
pname = "junkie";
|
||||||
|
@ -10,6 +10,7 @@ stdenv.mkDerivation rec {
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "0kfdjgch667gfb3qpiadd2dj3fxc7r19nr620gffb1ahca02wq31";
|
sha256 = "0kfdjgch667gfb3qpiadd2dj3fxc7r19nr620gffb1ahca02wq31";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
# Pull upstream patch for -fno-common toolchains:
|
# Pull upstream patch for -fno-common toolchains:
|
||||||
(fetchpatch {
|
(fetchpatch {
|
||||||
|
@ -18,8 +19,14 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "1qg01jinqn5wr2mz77rzaidnrli35di0k7lnx6kfm7dh7v8kxbrr";
|
sha256 = "1qg01jinqn5wr2mz77rzaidnrli35di0k7lnx6kfm7dh7v8kxbrr";
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
|
# IP_DONTFRAG is defined on macOS from Big Sur
|
||||||
|
postPatch = lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") ''
|
||||||
|
sed -i '10i#undef IP_DONTFRAG' include/junkie/proto/ip.h
|
||||||
|
'';
|
||||||
|
|
||||||
buildInputs = [ libpcap guile openssl ];
|
buildInputs = [ libpcap guile openssl ];
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"GUILELIBDIR=\${out}/share/guile/site"
|
"GUILELIBDIR=\${out}/share/guile/site"
|
||||||
"GUILECACHEDIR=\${out}/lib/guile/ccache"
|
"GUILECACHEDIR=\${out}/lib/guile/ccache"
|
||||||
|
@ -40,7 +47,5 @@ stdenv.mkDerivation rec {
|
||||||
- a nettop tool;
|
- a nettop tool;
|
||||||
- a tool listing TLS certificates...
|
- a tool listing TLS certificates...
|
||||||
'';
|
'';
|
||||||
# never built on aarch64-darwin since first introduction in nixpkgs
|
|
||||||
broken = stdenv.isDarwin && stdenv.isAarch64;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue