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

Merge pull request #8935 from acowley/smlnj-darwin

Browse Source 
smlnj: build on darwin
This commit is contained in:
Eric Seidel 2015-07-28 17:39:44 -07:00
commit eca6aa0e8d
2 changed files with 14 additions and 4 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,4 +1,4 @@
{ stdenv, fetchurl }: { stdenv, fetchurl, darwin }:
let let
version = "110.78"; version = "110.78";
baseurl = "http://smlnj.cs.uchicago.edu/dist/working/${version}"; baseurl = "http://smlnj.cs.uchicago.edu/dist/working/${version}";
@ -34,7 +34,15 @@ in stdenv.mkDerivation {
patchPhase = '' patchPhase = ''
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
''; '' + stdenv.lib.optionalString stdenv.isDarwin (with darwin; ''
sed -i '/^[[:space:]]*\*x86-darwin\*)$/,/^[[:space:]]*\*) ;;/ c\
\ \*x86-darwin\*)\
\ INCLFILE=${osx_sdk}/Developer/SDKs/${osx_sdk.name}/usr/include/unistd.h\
\ ;;\
\ \*) ;;
' base/runtime/config/gen-posix-names.sh
sed -i 's|^AS =\([[:space:]]*\)/usr/bin/as|AS =\1as|' base/runtime/objs/mk.x86-darwin
'');
unpackPhase = '' unpackPhase = ''
for s in $sources; do for s in $sources; do
@ -64,7 +72,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 = [ "i686-linux" ]; platforms = [ "i686-linux" ] ++ platforms.darwin;
maintainers = with maintainers; [ thoughtpolice ]; maintainers = with maintainers; [ thoughtpolice ];
}; };
} }

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

@ -4723,7 +4723,9 @@ let
sdcc = callPackage ../development/compilers/sdcc { }; sdcc = callPackage ../development/compilers/sdcc { };
smlnjBootstrap = callPackage ../development/compilers/smlnj/bootstrap.nix { }; smlnjBootstrap = callPackage ../development/compilers/smlnj/bootstrap.nix { };
smlnj = callPackage_i686 ../development/compilers/smlnj { }; smlnj = if stdenv.isDarwin
then callPackage ../development/compilers/smlnj { }
else callPackage_i686 ../development/compilers/smlnj { };
sqldeveloper = callPackage ../development/tools/database/sqldeveloper { }; sqldeveloper = callPackage ../development/tools/database/sqldeveloper { };