diff options
| -rw-r--r-- | pkgs/development/compilers/ecl/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix index be5f83941aad..e4bf0ef371c0 100644 --- a/pkgs/development/compilers/ecl/default.nix +++ b/pkgs/development/compilers/ecl/default.nix @@ -1,11 +1,15 @@ -a : +{builderDefsPackage + , gmp, mpfr, libffi + , ...} @ x: +builderDefsPackage (a : let s = import ./src-for-default.nix; - buildInputs = with a; [ - ]; + helperArgNames = []; propagatedBuildInputs = with a; [ gmp mpfr ]; + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); in rec { src = a.fetchUrlFromSrcInfo s; @@ -35,4 +39,4 @@ rec { platforms = with a.lib.platforms; linux; }; -} +}) x diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3b9529b5fabd..888f5fae0dc1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1542,9 +1542,7 @@ let }; }; - ecl = builderDefsPackage ../development/compilers/ecl { - inherit gmp mpfr; - }; + ecl = callPackage ../development/compilers/ecl { }; eql = callPackage ../development/compilers/eql {}; |