diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2019-11-10 02:08:01 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-31 01:13:55 +0100 |
| commit | 81ffabdf4f228732607796fc3c58148c8d62affe (patch) | |
| tree | fa849d11e5cb52c510e28c8ff2173e1a8188d08e | |
| parent | 839c0ea7a551b48db68a4f666b9b493bcc2a044b (diff) | |
| download | nixpkgs-81ffabdf4f228732607796fc3c58148c8d62affe.tar nixpkgs-81ffabdf4f228732607796fc3c58148c8d62affe.tar.gz nixpkgs-81ffabdf4f228732607796fc3c58148c8d62affe.tar.bz2 nixpkgs-81ffabdf4f228732607796fc3c58148c8d62affe.tar.lz nixpkgs-81ffabdf4f228732607796fc3c58148c8d62affe.tar.xz nixpkgs-81ffabdf4f228732607796fc3c58148c8d62affe.tar.zst nixpkgs-81ffabdf4f228732607796fc3c58148c8d62affe.zip | |
treewide: use flat lists for *Inputs, fix env usage
| -rw-r--r-- | pkgs/development/libraries/gegl/4.0.nix | 2 | ||||
| -rw-r--r-- | pkgs/misc/emulators/retroarch/cores.nix | 2 | ||||
| -rw-r--r-- | pkgs/misc/emulators/retroarch/default.nix | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix index 1bdf557f399..75897b036bf 100644 --- a/pkgs/development/libraries/gegl/4.0.nix +++ b/pkgs/development/libraries/gegl/4.0.nix @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { # TODO: Fix missing math symbols in gegl seamless clone. # It only appears when we use packaged poly2tri-c instead of vendored one. - NIX_CFLAGS_COMPILE = [ "-lm" ]; + NIX_CFLAGS_COMPILE = "-lm"; postPatch = '' chmod +x tests/opencl/opencl_test.sh tests/buffer/buffer-tests-run.sh diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index c8171f6c233..45ed31168f0 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -720,7 +720,7 @@ in with stdenv.lib.licenses; license = gpl2; extraBuildInputs = [ cmake libGLU libGL ffmpeg python37 xorg.libX11 ]; }).override { - cmakeFlags = "-DLIBRETRO=ON"; + cmakeFlags = [ "-DLIBRETRO=ON" ]; makefile = "Makefile"; buildPhase = '' make \ diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index 34e3961250c..0333e0fec2a 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -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 ]; |