public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

construo: fix build

Browse Source
This commit is contained in:
Michael Raskin 2019-11-22 17:19:06 +01:00
parent 936c7c5e2b
commit 1ca8255fb2
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/games/construo/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libX11, zlib, xorgproto, libGL ? null, freeglut ? null }: { stdenv, fetchurl, libX11, zlib, xorgproto, libGL ? null, libGLU ? null, freeglut ? null }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "construo"; pname = "construo";
@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libX11 zlib xorgproto ] buildInputs = [ libX11 zlib xorgproto ]
++ stdenv.lib.optional (libGL != null) libGL ++ stdenv.lib.optional (libGL != null) libGL
++ stdenv.lib.optional (libGLU != null) libGLU
++ stdenv.lib.optional (freeglut != null) freeglut; ++ stdenv.lib.optional (freeglut != null) freeglut;
preConfigure = '' preConfigure = ''

4
pkgs/top-level/all-packages.nix
View File

@ -22542,12 +22542,12 @@ in
construoBase = lowPrio (callPackage ../games/construo { construoBase = lowPrio (callPackage ../games/construo {
libGL = null; libGL = null;
libGLU = null;
freeglut = null; freeglut = null;
}); });
construo = construoBase.override { construo = construoBase.override {
inherit freeglut; inherit freeglut libGL libGLU;
libGL = libGLU_combined;
}; };
crack_attack = callPackage ../games/crack-attack { }; crack_attack = callPackage ../games/crack-attack { };