Merge pull request #97576 from gebner/mlton-which

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

View file

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

View file

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