construo: fix build after libGL transition
This commit is contained in:
parent
77b23a8e7c
commit
38bd1d7664
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, libX11, zlib, xproto, libGLU_combined ? null, freeglut ? null }:
|
||||
{ stdenv, fetchurl, libX11, zlib, xproto, libGL ? null, freeglut ? null }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "construo-${version}";
|
||||
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
buildInputs = [ libX11 zlib xproto ]
|
||||
++ stdenv.lib.optional (libGLU_combined != null) mesa
|
||||
++ stdenv.lib.optional (libGL != null) libGL
|
||||
++ stdenv.lib.optional (freeglut != null) freeglut;
|
||||
|
||||
preConfigure = ''
|
||||
|
|
|
@ -18543,12 +18543,13 @@ with pkgs;
|
|||
confd = callPackage ../tools/system/confd { };
|
||||
|
||||
construoBase = lowPrio (callPackage ../games/construo {
|
||||
mesa = null;
|
||||
libGL = null;
|
||||
freeglut = null;
|
||||
});
|
||||
|
||||
construo = construoBase.override {
|
||||
inherit mesa freeglut;
|
||||
inherit freeglut;
|
||||
libGL = libGLU_combined;
|
||||
};
|
||||
|
||||
crack_attack = callPackage ../games/crack-attack { };
|
||||
|
|
Loading…
Reference in a new issue