construo: fix build after libGL transition

+5 -4
+2 -2
pkgs/games/construo/default.nix
··· 1 - { stdenv, fetchurl, libX11, zlib, xproto, libGLU_combined ? null, freeglut ? null }: 1 + { stdenv, fetchurl, libX11, zlib, xproto, libGL ? null, freeglut ? null }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 name = "construo-${version}"; ··· 10 10 }; 11 11 12 12 buildInputs = [ libX11 zlib xproto ] 13 - ++ stdenv.lib.optional (libGLU_combined != null) mesa 13 + ++ stdenv.lib.optional (libGL != null) libGL 14 14 ++ stdenv.lib.optional (freeglut != null) freeglut; 15 15 16 16 preConfigure = ''
+3 -2
pkgs/top-level/all-packages.nix
··· 18543 18543 confd = callPackage ../tools/system/confd { }; 18544 18544 18545 18545 construoBase = lowPrio (callPackage ../games/construo { 18546 - mesa = null; 18546 + libGL = null; 18547 18547 freeglut = null; 18548 18548 }); 18549 18549 18550 18550 construo = construoBase.override { 18551 - inherit mesa freeglut; 18551 + inherit freeglut; 18552 + libGL = libGLU_combined; 18552 18553 }; 18553 18554 18554 18555 crack_attack = callPackage ../games/crack-attack { };