diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-01-15 02:50:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-15 02:50:59 +0100 |
| commit | b40f0196f35a53d54b27dfdd023b1f79b4a075d7 (patch) | |
| tree | 51ae83d5f433ee23ca78b1fce5a737935559918f | |
| parent | fa8ae2120d161e26a96dda1d57669288c37d9ad2 (diff) | |
| download | nixpkgs-b40f0196f35a53d54b27dfdd023b1f79b4a075d7.tar nixpkgs-b40f0196f35a53d54b27dfdd023b1f79b4a075d7.tar.gz nixpkgs-b40f0196f35a53d54b27dfdd023b1f79b4a075d7.tar.bz2 nixpkgs-b40f0196f35a53d54b27dfdd023b1f79b4a075d7.tar.lz nixpkgs-b40f0196f35a53d54b27dfdd023b1f79b4a075d7.tar.xz nixpkgs-b40f0196f35a53d54b27dfdd023b1f79b4a075d7.tar.zst nixpkgs-b40f0196f35a53d54b27dfdd023b1f79b4a075d7.zip | |
megam: add darwin support (#209898)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
| -rw-r--r-- | pkgs/applications/science/misc/megam/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 10 insertions, 7 deletions
diff --git a/pkgs/applications/science/misc/megam/default.nix b/pkgs/applications/science/misc/megam/default.nix index 6c55027d3c6..044f9ae56d0 100644 --- a/pkgs/applications/science/misc/megam/default.nix +++ b/pkgs/applications/science/misc/megam/default.nix @@ -12,11 +12,16 @@ stdenv.mkDerivation { patches = [ ./ocaml-includes.patch ./ocaml-3.12.patch ]; - buildInputs = [ ocaml ncurses ]; + strictDeps = true; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ocaml ]; - makeFlags = [ "CAML_INCLUDES=${ocaml}/lib/ocaml/caml" ]; + buildInputs = [ ncurses ]; + + makeFlags = [ + "CAML_INCLUDES=${ocaml}/lib/ocaml/caml" + "WITHBIGARRAY=bigarray.cma" + ]; # see https://bugzilla.redhat.com/show_bug.cgi?id=435559 dontStrip = true; @@ -42,6 +47,6 @@ stdenv.mkDerivation { license = "non-commercial"; maintainers = [ ]; - platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice + platforms = lib.platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b1c922c4659..c9d714468bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36752,9 +36752,7 @@ with pkgs; wxGTK = wxGTK32; }; - megam = callPackage ../applications/science/misc/megam { - inherit (ocaml-ng.ocamlPackages_4_07) ocaml; - }; + megam = callPackage ../applications/science/misc/megam { }; netlogo = callPackage ../applications/science/misc/netlogo { }; |