diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-07-29 18:55:16 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-07-29 18:55:16 +0000 |
| commit | 907bb1aac65dd3acbdd2b6be831a82d051b8c5c2 (patch) | |
| tree | db10eb10d726b31601d4eaec77e74c1dcb779941 /pkgs/games/construo | |
| parent | ad1c77118f74d84ea2026da237fd50cca4ee9180 (diff) | |
* ltrace: updated to 0.5.3.
* libdbi / libdbi-drivers: updated to 0.8.3, and make it compile with
SQLite.
* qemu-image: fix the URL.
* gdmap: make it build again (requires an older GTK+).
* rlwrap: updated to 0.37.
* smbfs-fuse -> fusesmb to match the upstream name.
* x11vnc: updated to 0.9.10.
* clearlyU: fix the URL.
* Various packages: follow the coding conventions.
svn path=/nixpkgs/trunk/; revision=22814
Diffstat (limited to 'pkgs/games/construo')
| -rw-r--r-- | pkgs/games/construo/default.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/games/construo/default.nix b/pkgs/games/construo/default.nix index 2b32020d8e9d..0de0732b3747 100644 --- a/pkgs/games/construo/default.nix +++ b/pkgs/games/construo/default.nix @@ -1,4 +1,5 @@ -args : with args; +{ stdenv, fetchurl, builderDefs, libX11, zlib, xproto, mesa ? null, freeglut ? null }: + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { @@ -6,10 +7,7 @@ args : with args; sha256 = "0c661rjasax4ykw77dgqj39jhb4qi48m0bhhdy42vd5a4rfdrcck"; }; - buildInputs = [libX11 zlib xproto] - ++ (if args ? mesa then [args.mesa args.freeglut] else []) - ; - configureFlags = [""]; + buildInputs = [libX11 zlib xproto mesa freeglut]; preConfigure = builderDefs.stringsWithDeps.fullDepEntry ('' sed -e 's/math[.]h/cmath/' -i vector.cxx sed -e 's/games/bin/' -i Makefile.in |