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

construo: fix build after libGL transition

Browse Source
This commit is contained in:
Alexander V. Nikolaev 2018-02-24 16:11:51 +02:00
parent 77b23a8e7c
commit 38bd1d7664
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 { stdenv.mkDerivation rec {
name = "construo-${version}"; name = "construo-${version}";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ libX11 zlib xproto ] buildInputs = [ libX11 zlib xproto ]
++ stdenv.lib.optional (libGLU_combined != null) mesa ++ stdenv.lib.optional (libGL != null) libGL
++ stdenv.lib.optional (freeglut != null) freeglut; ++ stdenv.lib.optional (freeglut != null) freeglut;
preConfigure = '' preConfigure = ''

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

@ -18543,12 +18543,13 @@ with pkgs;
confd = callPackage ../tools/system/confd { }; confd = callPackage ../tools/system/confd { };
construoBase = lowPrio (callPackage ../games/construo { construoBase = lowPrio (callPackage ../games/construo {
mesa = null; libGL = null;
freeglut = null; freeglut = null;
}); });
construo = construoBase.override { construo = construoBase.override {
inherit mesa freeglut; inherit freeglut;
libGL = libGLU_combined;
}; };
crack_attack = callPackage ../games/crack-attack { }; crack_attack = callPackage ../games/crack-attack { };