Author: raskin
Date: Tue Jan 18 17:36:25 2011
New Revision: 25610
URL: https://svn.nixos.org/websvn/nix/?rev=25610&sc=1
Log:
Build ECL with DFFI
Modified:
nixpkgs/trunk/pkgs/development/compilers/ecl/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/development/compilers/ecl/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/compilers/ecl/default.nix Tue Jan 18
16:27:39 2011 (r25609)
+++ nixpkgs/trunk/pkgs/development/compilers/ecl/default.nix Tue Jan 18
17:36:25 2011 (r25610)
@@ -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 @@
platforms = with a.lib.platforms;
linux;
};
-}
+}) x
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Jan 18 16:27:39
2011 (r25609)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Jan 18 17:36:25
2011 (r25610)
@@ -1542,9 +1542,7 @@
};
};
- ecl = builderDefsPackage ../development/compilers/ecl {
- inherit gmp mpfr;
- };
+ ecl = callPackage ../development/compilers/ecl { };
eql = callPackage ../development/compilers/eql {};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
