diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-24 10:13:31 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-24 10:13:31 +0100 |
| commit | 1d18c5a0fe6d55fa1663e945cd47bc9e8e764f3f (patch) | |
| tree | 313bc0caa017c3e41a961bf63c7b70aac8bc6334 /pkgs/games/construo | |
| parent | 525c54c7ef4ac6bc86e1a9f84cff72af43884d2a (diff) | |
| parent | ab0a828662c4c6a8535b630081a67c20286099ab (diff) | |
| download | nixpkgs-1d18c5a0fe6d55fa1663e945cd47bc9e8e764f3f.tar nixpkgs-1d18c5a0fe6d55fa1663e945cd47bc9e8e764f3f.tar.gz nixpkgs-1d18c5a0fe6d55fa1663e945cd47bc9e8e764f3f.tar.bz2 nixpkgs-1d18c5a0fe6d55fa1663e945cd47bc9e8e764f3f.tar.lz nixpkgs-1d18c5a0fe6d55fa1663e945cd47bc9e8e764f3f.tar.xz nixpkgs-1d18c5a0fe6d55fa1663e945cd47bc9e8e764f3f.tar.zst nixpkgs-1d18c5a0fe6d55fa1663e945cd47bc9e8e764f3f.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/games/construo')
| -rw-r--r-- | pkgs/games/construo/default.nix | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/pkgs/games/construo/default.nix b/pkgs/games/construo/default.nix index bbd11a26046..5c74b596279 100644 --- a/pkgs/games/construo/default.nix +++ b/pkgs/games/construo/default.nix @@ -1,4 +1,12 @@ -{ stdenv, fetchurl, libX11, zlib, xorgproto, libGL, libGLU, freeglut ? null }: +{ stdenv +, fetchurl +, libX11 +, zlib +, xorgproto +, libGL ? null +, libGLU ? null +, freeglut ? null +}: stdenv.mkDerivation rec { pname = "construo"; @@ -9,7 +17,9 @@ stdenv.mkDerivation rec { sha256 = "1wmj527hbj1qv44cdsj6ahfjrnrjwg2dp8gdick8nd07vm062qxa"; }; - buildInputs = [ libX11 zlib xorgproto libGL libGLU ] + buildInputs = [ libX11 zlib xorgproto ] + ++ stdenv.lib.optional (libGL != null) libGL + ++ stdenv.lib.optional (libGLU != null) libGLU ++ stdenv.lib.optional (freeglut != null) freeglut; preConfigure = '' |