cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #208985 from wegank/junkie-darwin

Browse source 
junkie: unbreak on aarch64-darwin
This commit is contained in:
Thiago Kenji Okada 2023-01-08 12:02:42 +00:00 committed by GitHub
commit 3db5c89b98
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/tools/networking/junkie/default.nix
View file

@ -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;
}; };
} }