diff options
| author | Alexander V. Nikolaev <avn@avnik.info> | 2018-02-24 16:11:51 +0200 |
|---|---|---|
| committer | Alexander V. Nikolaev <avn@avnik.info> | 2018-02-24 17:06:49 +0200 |
| commit | 38bd1d7664f7829d6f9cf40cd80806f5ec2fc7da (patch) | |
| tree | 1d5a1250cdd308b70741ca30247f225181db6db3 /pkgs | |
| parent | 77b23a8e7c3c221cf56cdfe359fa98c23b7ebe00 (diff) | |
| download | nixlib-38bd1d7664f7829d6f9cf40cd80806f5ec2fc7da.tar nixlib-38bd1d7664f7829d6f9cf40cd80806f5ec2fc7da.tar.gz nixlib-38bd1d7664f7829d6f9cf40cd80806f5ec2fc7da.tar.bz2 nixlib-38bd1d7664f7829d6f9cf40cd80806f5ec2fc7da.tar.lz nixlib-38bd1d7664f7829d6f9cf40cd80806f5ec2fc7da.tar.xz nixlib-38bd1d7664f7829d6f9cf40cd80806f5ec2fc7da.tar.zst nixlib-38bd1d7664f7829d6f9cf40cd80806f5ec2fc7da.zip | |
construo: fix build after libGL transition
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/games/construo/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/games/construo/default.nix b/pkgs/games/construo/default.nix index cfcf057dd1ab..7db641367311 100644 --- a/pkgs/games/construo/default.nix +++ b/pkgs/games/construo/default.nix @@ -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 = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d3bcc3b23fa..f740c390f04a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |