diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2011-01-18 17:36:25 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2011-01-18 17:36:25 +0000 |
| commit | b3583dc847ca2707143838fdc2b838c71769900a (patch) | |
| tree | 24d5d4707398e72652336b081ef90f01ddb18834 /pkgs | |
| parent | 0db18b0d5f3d05154b9de1a39d5e033f21bdf839 (diff) | |
| download | nixlib-b3583dc847ca2707143838fdc2b838c71769900a.tar nixlib-b3583dc847ca2707143838fdc2b838c71769900a.tar.gz nixlib-b3583dc847ca2707143838fdc2b838c71769900a.tar.bz2 nixlib-b3583dc847ca2707143838fdc2b838c71769900a.tar.lz nixlib-b3583dc847ca2707143838fdc2b838c71769900a.tar.xz nixlib-b3583dc847ca2707143838fdc2b838c71769900a.tar.zst nixlib-b3583dc847ca2707143838fdc2b838c71769900a.zip | |
Build ECL with DFFI
svn path=/nixpkgs/trunk/; revision=25610
Diffstat (limited to 'pkgs')
| -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 {}; |