From afd2bbf22c36da54feaef33331eb3073ef69d150 Mon Sep 17 00:00:00 2001 From: Vincenzo Mantova <1962985+xworld21@users.noreply.github.com> Date: Sun, 14 May 2023 19:01:10 +0100 Subject: [PATCH 1/3] clisp: remove broken status on Darwin --- pkgs/development/interpreters/clisp/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix index 58dd5b4570dd..4ece12a84a11 100644 --- a/pkgs/development/interpreters/clisp/default.nix +++ b/pkgs/development/interpreters/clisp/default.nix @@ -101,8 +101,7 @@ stdenv.mkDerivation rec { homepage = "http://clisp.cons.org"; maintainers = lib.teams.lisp.members; platforms = lib.platforms.unix; - # problems on Darwin: https://github.com/NixOS/nixpkgs/issues/20062 - broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64; + broken = stdenv.hostPlatform.isAarch64; license = lib.licenses.gpl2; }; } From 9d4e72cd73ee83c1a63beb71fecb5787d4450d3b Mon Sep 17 00:00:00 2001 From: Vincenzo Mantova <1962985+xworld21@users.noreply.github.com> Date: Sun, 14 May 2023 19:12:26 +0100 Subject: [PATCH 2/3] clisp-tip: mark Darwin as broken instead of restricting platforms --- pkgs/development/interpreters/clisp/hg.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/clisp/hg.nix b/pkgs/development/interpreters/clisp/hg.nix index 91602ad93786..c22560446344 100644 --- a/pkgs/development/interpreters/clisp/hg.nix +++ b/pkgs/development/interpreters/clisp/hg.nix @@ -93,6 +93,7 @@ stdenv.mkDerivation rec { homepage = "http://clisp.cons.org"; maintainers = lib.teams.lisp.members; # problems on Darwin: https://github.com/NixOS/nixpkgs/issues/20062 - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; + broken = stdenv.hostPlatform.isDarwin; }; } From 207731e3e35bc0f62b3d1a270acc023566c612e1 Mon Sep 17 00:00:00 2001 From: Vincenzo Mantova <1962985+xworld21@users.noreply.github.com> Date: Sun, 14 May 2023 19:58:38 +0100 Subject: [PATCH 3/3] clisp: enable ffcall on Darwin --- pkgs/development/interpreters/clisp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix index 4ece12a84a11..ed31f58fd227 100644 --- a/pkgs/development/interpreters/clisp/default.nix +++ b/pkgs/development/interpreters/clisp/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { inherit libsigsegv gettext coreutils; - ffcallAvailable = stdenv.isLinux && (libffcall != null); + ffcallAvailable = libffcall != null; buildInputs = [libsigsegv] ++ lib.optional (gettext != null) gettext