Author: eelco
Date: Wed May 4 12:43:31 2011
New Revision: 27141
URL: https://svn.nixos.org/websvn/nix/?rev=27141&sc=1
Log:
* Get rid of those annoying "not an attrSet" trace messages.
Deleted:
nixpkgs/trunk/pkgs/servers/http/redstore/src-for-default.nix
nixpkgs/trunk/pkgs/servers/http/redstore/src-info-for-default.nix
Modified:
nixpkgs/trunk/pkgs/development/compilers/ecl/default.nix
nixpkgs/trunk/pkgs/games/construo/default.nix
nixpkgs/trunk/pkgs/servers/http/redstore/default.nix
Modified: nixpkgs/trunk/pkgs/development/compilers/ecl/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/compilers/ecl/default.nix Wed May 4
12:34:26 2011 (r27140)
+++ nixpkgs/trunk/pkgs/development/compilers/ecl/default.nix Wed May 4
12:43:31 2011 (r27141)
@@ -4,12 +4,10 @@
builderDefsPackage (a :
let
s = import ./src-for-default.nix;
- helperArgNames = [];
propagatedBuildInputs = with a; [
gmp mpfr
];
- buildInputs = map (n: builtins.getAttr n x)
- (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+ buildInputs = [ gmp libffi mpfr ];
in
rec {
src = a.fetchUrlFromSrcInfo s;
Modified: nixpkgs/trunk/pkgs/games/construo/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/games/construo/default.nix Wed May 4 12:34:26
2011 (r27140)
+++ nixpkgs/trunk/pkgs/games/construo/default.nix Wed May 4 12:43:31
2011 (r27141)
@@ -7,7 +7,9 @@
sha256 =
"0c661rjasax4ykw77dgqj39jhb4qi48m0bhhdy42vd5a4rfdrcck";
};
- buildInputs = [libX11 zlib xproto mesa freeglut];
+ buildInputs = [ libX11 zlib xproto ]
+ ++ stdenv.lib.optional (mesa != null) mesa
+ ++ stdenv.lib.optional (freeglut != null) freeglut;
preConfigure = builderDefs.stringsWithDeps.fullDepEntry (''
sed -e 's/math[.]h/cmath/' -i vector.cxx
sed -e 's/games/bin/' -i Makefile.in
Modified: nixpkgs/trunk/pkgs/servers/http/redstore/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/servers/http/redstore/default.nix Wed May 4
12:34:26 2011 (r27140)
+++ nixpkgs/trunk/pkgs/servers/http/redstore/default.nix Wed May 4
12:43:31 2011 (r27141)
@@ -1,32 +1,19 @@
-x@{builderDefsPackage
- , redland, pkgconfig, gmp
- , ...}:
-builderDefsPackage
-(a :
-let
- s = import ./src-for-default.nix;
- helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
- [];
- buildInputs = map (n: builtins.getAttr n x)
- (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-in
-rec {
- src = a.fetchUrlFromSrcInfo s;
+{ stdenv, fetchurl, redland, pkgconfig, gmp }:
- inherit (s) name;
- inherit buildInputs;
+stdenv.mkDerivation rec {
+ name = "redstore-0.4";
- /* doConfigure should be removed if not needed */
- phaseNames = ["doConfigure" "doMakeInstall"];
+ src = fetchurl {
+ url = "http://redstore.googlecode.com/files/${name}.tar.gz";;
+ sha256 = "1fs54v0d0kkqaz9ajacabb8wifrglvg6kkhd5b0mxmnng352wpp7";
+ };
+
+ buildInputs = [ gmp pkgconfig redland ];
meta = {
description = "An HTTP interface to Redland RDF store";
- maintainers = with a.lib.maintainers;
- [
- raskin
- ];
- platforms = with a.lib.platforms;
+ maintainers = [ stdenv.lib.maintainers.raskin ];
+ platforms = with stdenv.lib.platforms;
linux ++ freebsd ++ gnu;
};
-}) x
-
+}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
