diff options
| author | 7c6f434c <7c6f434c@mail.ru> | 2023-05-15 07:10:37 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-15 07:10:37 +0000 |
| commit | ca9c4da5d208d41e2e79b711768507a33a7b1b69 (patch) | |
| tree | 3067a5ebf41275f60f549730012db7ffed6ad00b | |
| parent | 308ee09f2f5e5a74e5bf5b47324249352738207c (diff) | |
| parent | 207731e3e35bc0f62b3d1a270acc023566c612e1 (diff) | |
Merge pull request #231896 from xworld21/clisp-darwin
clisp: remove broken status on Darwin
| -rw-r--r-- | pkgs/development/interpreters/clisp/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/interpreters/clisp/hg.nix | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix index 58dd5b4570ddb..ed31f58fd2277 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 @@ -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; }; } diff --git a/pkgs/development/interpreters/clisp/hg.nix b/pkgs/development/interpreters/clisp/hg.nix index 91602ad93786a..c225604463445 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; }; } |