JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

smlnj: fix x86_64-darwin build

Browse Source
This commit is contained in:
Simon Chatterjee 2021-06-26 14:52:53 +01:00
parent 867c0f8540
commit 9fdc5e10ee
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/compilers/smlnj/default.nix
View File

@ -1,11 +1,9 @@
{ lib, stdenv, fetchurl }: { lib, stdenv, fetchurl, Libsystem }:
let let
version = "110.95"; version = "110.95";
baseurl = "http://smlnj.cs.uchicago.edu/dist/working/${version}"; baseurl = "http://smlnj.cs.uchicago.edu/dist/working/${version}";
isArch64 = stdenv.system == "x86_64-linux"; arch = if stdenv.is64bit
arch = if isArch64
then "64" then "64"
else "32"; else "32";
@ -14,7 +12,7 @@ let
boot64 = { url = "${baseurl}/boot.amd64-unix.tgz"; boot64 = { url = "${baseurl}/boot.amd64-unix.tgz";
sha256 = "1zn96a83kb6bn6228yfjsvb58m2qxw9k4j3qz0p9c8za479w4ch6"; }; sha256 = "1zn96a83kb6bn6228yfjsvb58m2qxw9k4j3qz0p9c8za479w4ch6"; };
bootBinary = if isArch64 bootBinary = if stdenv.is64bit
then boot64 then boot64
else boot32; else boot32;
@ -53,6 +51,10 @@ in stdenv.mkDerivation {
sed -i '/PATH=/d' config/_arch-n-opsys base/runtime/config/gen-posix-names.sh sed -i '/PATH=/d' config/_arch-n-opsys base/runtime/config/gen-posix-names.sh
echo SRCARCHIVEURL="file:/$TMP" > config/srcarchiveurl echo SRCARCHIVEURL="file:/$TMP" > config/srcarchiveurl
patch --verbose config/_heap2exec ${./heap2exec.diff} patch --verbose config/_heap2exec ${./heap2exec.diff}
'' + lib.optionalString stdenv.isDarwin ''
# Locate standard headers like <unistd.h>
substituteInPlace base/runtime/config/gen-posix-names.sh \
--replace "\$SDK_PATH/usr" "${Libsystem}"
''; '';
unpackPhase = '' unpackPhase = ''
@ -83,7 +85,7 @@ in stdenv.mkDerivation {
description = "Standard ML of New Jersey, a compiler"; description = "Standard ML of New Jersey, a compiler";
homepage = "http://smlnj.org"; homepage = "http://smlnj.org";
license = licenses.bsd3; license = licenses.bsd3;
platforms = [ "x86_64-linux" "i686-linux" ]; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
maintainers = with maintainers; [ thoughtpolice ]; maintainers = with maintainers; [ thoughtpolice ];
}; };
} }

4
pkgs/top-level/all-packages.nix
View File

@ -12056,7 +12056,9 @@ in
shmig = callPackage ../development/tools/database/shmig { }; shmig = callPackage ../development/tools/database/shmig { };
smlnjBootstrap = callPackage ../development/compilers/smlnj/bootstrap.nix { }; smlnjBootstrap = callPackage ../development/compilers/smlnj/bootstrap.nix { };
smlnj = callPackage ../development/compilers/smlnj { }; smlnj = callPackage ../development/compilers/smlnj {
inherit (darwin) Libsystem;
};
smlpkg = callPackage ../tools/package-management/smlpkg { }; smlpkg = callPackage ../tools/package-management/smlpkg { };