treewide: use flat lists for *Inputs, fix env usage

2019-12-31 01:13:55 +01:00
parent 839c0ea7a5
commit 81ffabdf4f
3 changed files with 4 additions and 4 deletions
@@ -39,11 +39,11 @@ in stdenv.mkDerivation rec {
  };

  nativeBuildInputs = [ pkgconfig ]
-                      ++ optional withVulkan [ makeWrapper ];
+                      ++ optionals withVulkan [ makeWrapper ];

  buildInputs = [ ffmpeg freetype libxml2 libGLU libGL python3 SDL2 which ]
                ++ optional enableNvidiaCgToolkit nvidia_cg_toolkit
-                ++ optional withVulkan [ vulkan-loader ]
+                ++ optionals withVulkan [ vulkan-loader ]
                ++ optionals stdenv.isDarwin [ libobjc AppKit Foundation ]
                ++ optionals stdenv.isLinux [ alsaLib libdrm libpulseaudio libv4l libX11
                                              libXdmcp libXext libXxf86vm mesa udev ];