From 1f18816d1288d7191ac51454212df4f25ab3cb8e Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Mon, 31 Mar 2025 23:21:08 +0900 Subject: [PATCH 1/2] chawan: fix build on darwin --- pkgs/by-name/ch/chawan/package.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ch/chawan/package.nix b/pkgs/by-name/ch/chawan/package.nix index d58ac515b596..662a283fe0ac 100644 --- a/pkgs/by-name/ch/chawan/package.nix +++ b/pkgs/by-name/ch/chawan/package.nix @@ -46,12 +46,15 @@ stdenv.mkDerivation { pkg-config ]; - buildInputs = [ - curlMinimal - libseccomp - ncurses - zlib - ]; + buildInputs = + [ + curlMinimal + ncurses + zlib + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + libseccomp + ]; buildFlags = [ "all" @@ -83,6 +86,5 @@ stdenv.mkDerivation { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ jtbx ]; mainProgram = "cha"; - broken = stdenv.hostPlatform.isDarwin; # pending PR #292043 }; } From a526613b64bbbe5de0e3403d3b9c83e4921ad1d8 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Sun, 6 Apr 2025 10:08:17 +0900 Subject: [PATCH 2/2] chawan: remove unused libseccomp in all platforms We can remove the dependency since https://git.sr.ht/~bptato/chawan/commit/5c24b64fe5b242bdba68fe3d48489bed26b48eae. Co-authored-by: bptato --- pkgs/by-name/ch/chawan/package.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ch/chawan/package.nix b/pkgs/by-name/ch/chawan/package.nix index 662a283fe0ac..cdb802b357af 100644 --- a/pkgs/by-name/ch/chawan/package.nix +++ b/pkgs/by-name/ch/chawan/package.nix @@ -11,7 +11,6 @@ pkg-config, zlib, unstableGitUpdater, - libseccomp, replaceVars, }: @@ -46,15 +45,11 @@ stdenv.mkDerivation { pkg-config ]; - buildInputs = - [ - curlMinimal - ncurses - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - libseccomp - ]; + buildInputs = [ + curlMinimal + ncurses + zlib + ]; buildFlags = [ "all"