Merge pull request #39391 from timokau/ecl-boehmgc

ecl: Use boehmgc
This commit is contained in:
Michael Raskin 2018-04-24 06:07:15 +00:00 committed by GitHub
commit 473fe34144
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 0 deletions

View File

@ -4,7 +4,11 @@
, noUnicode ? false , noUnicode ? false
, gcc , gcc
, threadSupport ? false , threadSupport ? false
, useBoehmgc ? true, boehmgc
}: }:
assert useBoehmgc -> boehmgc != null;
let let
s = # Generated upstream information s = # Generated upstream information
rec { rec {
@ -19,6 +23,9 @@ let
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
libffi gmp mpfr gcc libffi gmp mpfr gcc
] ++ stdenv.lib.optionals useBoehmgc [
# replaces ecl's own gc which other packages can depend on, thus propagated
boehmgc
]; ];
in in
stdenv.mkDerivation { stdenv.mkDerivation {

View File

@ -4,6 +4,7 @@
, noUnicode ? false , noUnicode ? false
, gcc , gcc
, threadSupport ? true , threadSupport ? true
, useBoehmgc ? false, boehmgc
}: }:
let let
s = # Generated upstream information s = # Generated upstream information
@ -20,6 +21,10 @@ let
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
libffi gmp mpfr gcc 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 in
stdenv.mkDerivation { stdenv.mkDerivation {