diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-15 17:43:23 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-28 10:15:49 +0100 |
| commit | 148e03b2f1cb48cd33f3fde078e2c28ebc3a9d65 (patch) | |
| tree | 439eccafb4a7d2eb25eb1c85823753228f6199fd /pkgs/development/compilers/mlton | |
| parent | dd915f82e7ca180ad9adfef024e408e666e12c9d (diff) | |
| download | nixlib-148e03b2f1cb48cd33f3fde078e2c28ebc3a9d65.tar nixlib-148e03b2f1cb48cd33f3fde078e2c28ebc3a9d65.tar.gz nixlib-148e03b2f1cb48cd33f3fde078e2c28ebc3a9d65.tar.bz2 nixlib-148e03b2f1cb48cd33f3fde078e2c28ebc3a9d65.tar.lz nixlib-148e03b2f1cb48cd33f3fde078e2c28ebc3a9d65.tar.xz nixlib-148e03b2f1cb48cd33f3fde078e2c28ebc3a9d65.tar.zst nixlib-148e03b2f1cb48cd33f3fde078e2c28ebc3a9d65.zip | |
gmp: split into multiple outputs
Diffstat (limited to 'pkgs/development/compilers/mlton')
| -rw-r--r-- | pkgs/development/compilers/mlton/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/compilers/mlton/default.nix b/pkgs/development/compilers/mlton/default.nix index 9ff762077389..c4890c1ca886 100644 --- a/pkgs/development/compilers/mlton/default.nix +++ b/pkgs/development/compilers/mlton/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { chmod u+x $(pwd)/../${usr_prefix}/bin/mlton # So the builder runs the binary compiler with gmp. - export LD_LIBRARY_PATH=${gmp}/lib:$LD_LIBRARY_PATH + export LD_LIBRARY_PATH=${gmp.out}/lib:$LD_LIBRARY_PATH '' + stdenv.lib.optionalString stdenv.isLinux '' # Patch ELF interpreter. @@ -92,10 +92,10 @@ stdenv.mkDerivation rec { substituteInPlace $(pwd)/install/${usr_prefix}/bin/mlton --replace '/${usr_prefix}/lib/mlton' $out/lib/mlton # Path to libgmp. - substituteInPlace $(pwd)/install/${usr_prefix}/bin/mlton --replace "-link-opt '-lm -lgmp'" "-link-opt '-lm -lgmp -L${gmp}/lib'" + substituteInPlace $(pwd)/install/${usr_prefix}/bin/mlton --replace "-link-opt '-lm -lgmp'" "-link-opt '-lm -lgmp -L${gmp.out}/lib'" # Path to gmp.h. - substituteInPlace $(pwd)/install/${usr_prefix}/bin/mlton --replace "-cc-opt '-O1 -fno-common'" "-cc-opt '-O1 -fno-common -I${gmp}/include'" + substituteInPlace $(pwd)/install/${usr_prefix}/bin/mlton --replace "-cc-opt '-O1 -fno-common'" "-cc-opt '-O1 -fno-common -I${gmp.dev}/include'" # Path to the same cc used in the build; needed at runtime. substituteInPlace $(pwd)/install/${usr_prefix}/bin/mlton --replace "gcc='gcc'" "gcc='"$(type -p cc)"'" |