nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
fork

Configure Feed

Select the types of activity you want to include in your feed.

smlnj: fix x86_64-darwin build

+11 -7
+8 -6
pkgs/development/compilers/smlnj/default.nix
··· 1 - { lib, stdenv, fetchurl }: 1 + { lib, stdenv, fetchurl, Libsystem }: 2 2 let 3 3 version = "110.95"; 4 4 baseurl = "http://smlnj.cs.uchicago.edu/dist/working/${version}"; 5 5 6 - isArch64 = stdenv.system == "x86_64-linux"; 7 - 8 - arch = if isArch64 6 + arch = if stdenv.is64bit 9 7 then "64" 10 8 else "32"; 11 9 ··· 12 14 boot64 = { url = "${baseurl}/boot.amd64-unix.tgz"; 13 15 sha256 = "1zn96a83kb6bn6228yfjsvb58m2qxw9k4j3qz0p9c8za479w4ch6"; }; 14 16 15 - bootBinary = if isArch64 17 + bootBinary = if stdenv.is64bit 16 18 then boot64 17 19 else boot32; 18 20 ··· 51 53 sed -i '/PATH=/d' config/_arch-n-opsys base/runtime/config/gen-posix-names.sh 52 54 echo SRCARCHIVEURL="file:/$TMP" > config/srcarchiveurl 53 55 patch --verbose config/_heap2exec ${./heap2exec.diff} 56 + '' + lib.optionalString stdenv.isDarwin '' 57 + # Locate standard headers like <unistd.h> 58 + substituteInPlace base/runtime/config/gen-posix-names.sh \ 59 + --replace "\$SDK_PATH/usr" "${Libsystem}" 54 60 ''; 55 61 56 62 unpackPhase = '' ··· 85 83 description = "Standard ML of New Jersey, a compiler"; 86 84 homepage = "http://smlnj.org"; 87 85 license = licenses.bsd3; 88 - platforms = [ "x86_64-linux" "i686-linux" ]; 86 + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; 89 87 maintainers = with maintainers; [ thoughtpolice ]; 90 88 }; 91 89 }
+3 -1
pkgs/top-level/all-packages.nix
··· 12056 12056 shmig = callPackage ../development/tools/database/shmig { }; 12057 12057 12058 12058 smlnjBootstrap = callPackage ../development/compilers/smlnj/bootstrap.nix { }; 12059 - smlnj = callPackage ../development/compilers/smlnj { }; 12059 + smlnj = callPackage ../development/compilers/smlnj { 12060 + inherit (darwin) Libsystem; 12061 + }; 12060 12062 12061 12063 smlpkg = callPackage ../tools/package-management/smlpkg { }; 12062 12064