diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-02-16 09:29:54 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-02-16 09:29:54 +0100 |
| commit | 6fe10d27799c284c72876f792c7b12d7fa54602b (patch) | |
| tree | b3594f3899a031eca0563cf36c4813f60b6c76e9 /pkgs/games | |
| parent | 5a322693f4de4763e951f5df3f0026e914957ae4 (diff) | |
| parent | 039f359a7d366e6d8594a4238aac6fcb4dbd7be8 (diff) | |
| download | nixlib-6fe10d27799c284c72876f792c7b12d7fa54602b.tar nixlib-6fe10d27799c284c72876f792c7b12d7fa54602b.tar.gz nixlib-6fe10d27799c284c72876f792c7b12d7fa54602b.tar.bz2 nixlib-6fe10d27799c284c72876f792c7b12d7fa54602b.tar.lz nixlib-6fe10d27799c284c72876f792c7b12d7fa54602b.tar.xz nixlib-6fe10d27799c284c72876f792c7b12d7fa54602b.tar.zst nixlib-6fe10d27799c284c72876f792c7b12d7fa54602b.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/residualvm/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/games/residualvm/default.nix b/pkgs/games/residualvm/default.nix index d0f1d500eaf5..f6969af30c2c 100644 --- a/pkgs/games/residualvm/default.nix +++ b/pkgs/games/residualvm/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsaLib -, openglSupport ? false, libGLU_combined ? null +, libGLSupported +, openglSupport ? libGLSupported, libGLU_combined ? null }: assert openglSupport -> libGLU_combined != null; |