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

Merge pull request #97576 from gebner/mlton-which

Browse Source 
mlton: fix build
This commit is contained in:
WORLDofPEACE 2020-09-09 14:42:42 -04:00 committed by GitHub
commit 63e1162357
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/compilers/mlton/default.nix
View File

@ -1,26 +1,21 @@
{ stdenv, fetchurl, fetchgit, patchelf, gmp }:
{ callPackage }:
rec {
mlton20130715 = import ./20130715.nix {
inherit stdenv fetchurl patchelf gmp;
};
mlton20130715 = callPackage ./20130715.nix {};
mlton20180207Binary = import ./20180207-binary.nix {
inherit stdenv fetchurl patchelf gmp;
};
mlton20180207Binary = callPackage ./20180207-binary.nix {};
mlton20180207 = import ./from-git-source.nix {
mlton20180207 = callPackage ./from-git-source.nix {
mltonBootstrap = mlton20180207Binary;
version = "20180207";
rev = "on-20180207-release";
sha256 = "00rdd2di5x1dzac64il9z05m3fdzicjd3226wwjyynv631jj3q2a";
inherit stdenv fetchgit gmp;
};
mltonHEAD = import ./from-git-source.nix {
mltonHEAD = callPackage ./from-git-source.nix {
mltonBootstrap = mlton20180207Binary;
version = "HEAD";
rev = "e149c9917cfbfe6aba5c986a958ed76d5cc6cfde";
sha256 = "0a0j1i0f0fxw2my1309srq5j3vz0kawrrln01gxms2m5hy5dl50d";
inherit stdenv fetchgit gmp;
};
}

3
pkgs/development/compilers/mlton/from-git-source.nix
View File

@ -6,6 +6,7 @@
, sha256
, stdenv
, version
, which
}:
stdenv.mkDerivation {
@ -16,6 +17,8 @@ stdenv.mkDerivation {
inherit url rev sha256;
};
nativeBuildInputs = [ which ];
buildInputs = [mltonBootstrap gmp];
preBuild = ''