diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2021-08-01 07:55:59 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-01 07:55:59 +0100 |
commit | 630031607986c47a145775d3973f3724fa04bf3d (patch) | |
tree | cef84df4eb5d5a90a2ed960fcb43f2f6c9f43d82 /pkgs/development | |
parent | 7f1f43f32ba9c981f6e5205e4b52d79dbfea5c29 (diff) | |
parent | 75b4fccfa4dde18a2761f5e3eb2b7a19baa32faf (diff) | |
download | nixpkgs-630031607986c47a145775d3973f3724fa04bf3d.tar nixpkgs-630031607986c47a145775d3973f3724fa04bf3d.tar.gz nixpkgs-630031607986c47a145775d3973f3724fa04bf3d.tar.bz2 nixpkgs-630031607986c47a145775d3973f3724fa04bf3d.tar.lz nixpkgs-630031607986c47a145775d3973f3724fa04bf3d.tar.xz nixpkgs-630031607986c47a145775d3973f3724fa04bf3d.tar.zst nixpkgs-630031607986c47a145775d3973f3724fa04bf3d.zip |
Merge pull request #132269 from collares/ecl-boehmgc
ecl: make sure boehmgc is available to gcc/linker
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/compilers/ecl/default.nix | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix index 083998049c1..d75418b41ef 100644 --- a/pkgs/development/compilers/ecl/default.nix +++ b/pkgs/development/compilers/ecl/default.nix @@ -47,20 +47,24 @@ stdenv.mkDerivation { (if threadSupport then "--enable-threads" else "--disable-threads") "--with-gmp-prefix=${gmp.dev}" "--with-libffi-prefix=${libffi.dev}" - ] - ++ - (lib.optional (! noUnicode) - "--enable-unicode") - ; + ] + ++ + (lib.optional useBoehmgc + "--with-libgc-prefix=${boehmgc.dev}") + ++ + (lib.optional (! noUnicode) + "--enable-unicode") + ; hardeningDisable = [ "format" ]; - postInstall = '' + postInstall = let + ldArgs = lib.strings.concatMapStringsSep " " + (l: ''--prefix NIX_LDFLAGS ' ' "-L${l.lib or l.out or l}/lib"'') + ([ gmp libffi ] ++ lib.optional useBoehmgc boehmgc); + in '' sed -e 's/@[-a-zA-Z_]*@//g' -i $out/bin/ecl-config - wrapProgram "$out/bin/ecl" \ - --prefix PATH ':' "${gcc}/bin" \ - --prefix NIX_LDFLAGS ' ' "-L${gmp.lib or gmp.out or gmp}/lib" \ - --prefix NIX_LDFLAGS ' ' "-L${libffi.lib or libffi.out or libffi}/lib" + wrapProgram "$out/bin/ecl" --prefix PATH ':' "${gcc}/bin" ${ldArgs} ''; meta = { |