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 /pkgs/games/construo | |
parent | 288193156965592bdefea06983dfba197c9c02b1 (diff) | |
download | nixpkgs-b1e93d013c25ec25d777a179cab39e92c8ebfa10.tar nixpkgs-b1e93d013c25ec25d777a179cab39e92c8ebfa10.tar.gz nixpkgs-b1e93d013c25ec25d777a179cab39e92c8ebfa10.tar.bz2 nixpkgs-b1e93d013c25ec25d777a179cab39e92c8ebfa10.tar.lz nixpkgs-b1e93d013c25ec25d777a179cab39e92c8ebfa10.tar.xz nixpkgs-b1e93d013c25ec25d777a179cab39e92c8ebfa10.tar.zst nixpkgs-b1e93d013c25ec25d777a179cab39e92c8ebfa10.zip |
* Get rid of those annoying "not an attrSet" trace messages.
svn path=/nixpkgs/trunk/; revision=27141
Diffstat (limited to 'pkgs/games/construo')
-rw-r--r-- | pkgs/games/construo/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/games/construo/default.nix b/pkgs/games/construo/default.nix index 0de0732b374..4de74bde5a1 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 |