diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-05-04 12:43:31 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-05-04 12:43:31 +0000 |
commit | b1e93d013c25ec25d777a179cab39e92c8ebfa10 (patch) | |
tree | d44d2fc623191c3529955fb88d7528ed933f75a1 | |
parent | 288193156965592bdefea06983dfba197c9c02b1 (diff) |
* Get rid of those annoying "not an attrSet" trace messages.
svn path=/nixpkgs/trunk/; revision=27141
-rw-r--r-- | pkgs/development/compilers/ecl/default.nix | 4 | ||||
-rw-r--r-- | pkgs/games/construo/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/http/redstore/default.nix | 37 | ||||
-rw-r--r-- | pkgs/servers/http/redstore/src-for-default.nix | 9 | ||||
-rw-r--r-- | pkgs/servers/http/redstore/src-info-for-default.nix | 6 |
5 files changed, 16 insertions, 44 deletions
diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix index e4bf0ef371c0..c08fc3ee5852 100644 --- a/pkgs/development/compilers/ecl/default.nix +++ b/pkgs/development/compilers/ecl/default.nix @@ -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; diff --git a/pkgs/games/construo/default.nix b/pkgs/games/construo/default.nix index 0de0732b3747..4de74bde5a11 100644 --- a/pkgs/games/construo/default.nix +++ b/pkgs/games/construo/default.nix @@ -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 diff --git a/pkgs/servers/http/redstore/default.nix b/pkgs/servers/http/redstore/default.nix index 87a89072ec69..aa7e5e63cda5 100644 --- a/pkgs/servers/http/redstore/default.nix +++ b/pkgs/servers/http/redstore/default.nix @@ -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 - +} diff --git a/pkgs/servers/http/redstore/src-for-default.nix b/pkgs/servers/http/redstore/src-for-default.nix deleted file mode 100644 index 963abcb7dbb3..000000000000 --- a/pkgs/servers/http/redstore/src-for-default.nix +++ /dev/null @@ -1,9 +0,0 @@ -rec { - version="0.4"; - name="redstore-0.4"; - hash="1fs54v0d0kkqaz9ajacabb8wifrglvg6kkhd5b0mxmnng352wpp7"; - url="http://redstore.googlecode.com/files/redstore-${version}.tar.gz"; - advertisedUrl="http://redstore.googlecode.com/files/redstore-0.4.tar.gz"; - - -} diff --git a/pkgs/servers/http/redstore/src-info-for-default.nix b/pkgs/servers/http/redstore/src-info-for-default.nix deleted file mode 100644 index fe1082a587e7..000000000000 --- a/pkgs/servers/http/redstore/src-info-for-default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - downloadPage = "http://code.google.com/p/redstore/downloads/list"; - baseName = "redstore"; - choiceCommand = '' head -n 1 | - sed -re "s@[&].*@@; s@.*[?]name=(.*)@http://$(sed -re "s@.*/p/([^/]+)/.*@\\1@" <<< "$(getAttr downloadPage)").googlecode.com/files/\\1@" ''; -} |