tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
construo: fix build after libGL transition
Alexander V. Nikolaev
8 years ago
38bd1d76
77b23a8e
+5
-4
2 changed files
expand all
collapse all
unified
split
pkgs
games
construo
default.nix
top-level
all-packages.nix
+2
-2
pkgs/games/construo/default.nix
···
1
-
{ stdenv, fetchurl, libX11, zlib, xproto, libGLU_combined ? null, freeglut ? null }:
2
3
stdenv.mkDerivation rec {
4
name = "construo-${version}";
···
10
};
11
12
buildInputs = [ libX11 zlib xproto ]
13
-
++ stdenv.lib.optional (libGLU_combined != null) mesa
14
++ stdenv.lib.optional (freeglut != null) freeglut;
15
16
preConfigure = ''
···
1
+
{ stdenv, fetchurl, libX11, zlib, xproto, libGL ? null, freeglut ? null }:
2
3
stdenv.mkDerivation rec {
4
name = "construo-${version}";
···
10
};
11
12
buildInputs = [ libX11 zlib xproto ]
13
+
++ stdenv.lib.optional (libGL != null) libGL
14
++ stdenv.lib.optional (freeglut != null) freeglut;
15
16
preConfigure = ''
+3
-2
pkgs/top-level/all-packages.nix
···
18543
confd = callPackage ../tools/system/confd { };
18544
18545
construoBase = lowPrio (callPackage ../games/construo {
18546
-
mesa = null;
18547
freeglut = null;
18548
});
18549
18550
construo = construoBase.override {
18551
-
inherit mesa freeglut;
0
18552
};
18553
18554
crack_attack = callPackage ../games/crack-attack { };
···
18543
confd = callPackage ../tools/system/confd { };
18544
18545
construoBase = lowPrio (callPackage ../games/construo {
18546
+
libGL = null;
18547
freeglut = null;
18548
});
18549
18550
construo = construoBase.override {
18551
+
inherit freeglut;
18552
+
libGL = libGLU_combined;
18553
};
18554
18555
crack_attack = callPackage ../games/crack-attack { };