diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-08-01 12:01:51 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-01 12:01:51 +0000 |
| commit | 30cf79fa629dbe1e7ae6b0c0901ff437d1e96446 (patch) | |
| tree | 1052da2dcdd01f3bb314ca99798b69ebd8fe39cd /pkgs/development/compilers/ecl/default.nix | |
| parent | c4b3ddbb5a2457096856937fa78e217b7663f9c0 (diff) | |
| parent | adcbf069c59ef2813631f93fba121c45636398ae (diff) | |
| download | nixpkgs-30cf79fa629dbe1e7ae6b0c0901ff437d1e96446.tar nixpkgs-30cf79fa629dbe1e7ae6b0c0901ff437d1e96446.tar.gz nixpkgs-30cf79fa629dbe1e7ae6b0c0901ff437d1e96446.tar.bz2 nixpkgs-30cf79fa629dbe1e7ae6b0c0901ff437d1e96446.tar.lz nixpkgs-30cf79fa629dbe1e7ae6b0c0901ff437d1e96446.tar.xz nixpkgs-30cf79fa629dbe1e7ae6b0c0901ff437d1e96446.tar.zst nixpkgs-30cf79fa629dbe1e7ae6b0c0901ff437d1e96446.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/compilers/ecl/default.nix')
| -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 = { |