diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2018-04-24 06:07:15 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-24 06:07:15 +0000 |
| commit | 473fe341443739612ad82b2bba8b761f1edcfcd6 (patch) | |
| tree | 773d76a65527459f8e701bdada2a380017b344e6 /pkgs/development | |
| parent | f2ad8b295c1c9443f6ba837686005de01d0e573f (diff) | |
| parent | 63b82757096e9b57bf5cffc5b0a7463d19d2f797 (diff) | |
| download | nixlib-473fe341443739612ad82b2bba8b761f1edcfcd6.tar nixlib-473fe341443739612ad82b2bba8b761f1edcfcd6.tar.gz nixlib-473fe341443739612ad82b2bba8b761f1edcfcd6.tar.bz2 nixlib-473fe341443739612ad82b2bba8b761f1edcfcd6.tar.lz nixlib-473fe341443739612ad82b2bba8b761f1edcfcd6.tar.xz nixlib-473fe341443739612ad82b2bba8b761f1edcfcd6.tar.zst nixlib-473fe341443739612ad82b2bba8b761f1edcfcd6.zip | |
Merge pull request #39391 from timokau/ecl-boehmgc
ecl: Use boehmgc
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/compilers/ecl/16.1.2.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/compilers/ecl/default.nix | 5 |
2 files changed, 12 insertions, 0 deletions
diff --git a/pkgs/development/compilers/ecl/16.1.2.nix b/pkgs/development/compilers/ecl/16.1.2.nix index b324ec490f1a..291b0ed013d6 100644 --- a/pkgs/development/compilers/ecl/16.1.2.nix +++ b/pkgs/development/compilers/ecl/16.1.2.nix @@ -4,7 +4,11 @@ , noUnicode ? false , gcc , threadSupport ? false +, useBoehmgc ? true, boehmgc }: + +assert useBoehmgc -> boehmgc != null; + let s = # Generated upstream information rec { @@ -19,6 +23,9 @@ let ]; propagatedBuildInputs = [ libffi gmp mpfr gcc + ] ++ stdenv.lib.optionals useBoehmgc [ + # replaces ecl's own gc which other packages can depend on, thus propagated + boehmgc ]; in stdenv.mkDerivation { diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix index b877ca58e95b..33ed690772ea 100644 --- a/pkgs/development/compilers/ecl/default.nix +++ b/pkgs/development/compilers/ecl/default.nix @@ -4,6 +4,7 @@ , noUnicode ? false , gcc , threadSupport ? true +, useBoehmgc ? false, boehmgc }: let s = # Generated upstream information @@ -20,6 +21,10 @@ let ]; propagatedBuildInputs = [ libffi gmp mpfr gcc + # replaces ecl's own gc which other packages can depend on, thus propagated + ] ++ stdenv.lib.optionals useBoehmgc [ + # replaces ecl's own gc which other packages can depend on, thus propagated + boehmgc ]; in stdenv.mkDerivation { |