public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Maximilian Bosch 2019-11-10 02:08:01 +01:00 committed by Jan Tojnar
parent 839c0ea7a5
commit 81ffabdf4f
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/gegl/4.0.nix
View File

@ -118,7 +118,7 @@ stdenv.mkDerivation rec {
# TODO: Fix missing math symbols in gegl seamless clone. # TODO: Fix missing math symbols in gegl seamless clone.
# It only appears when we use packaged poly2tri-c instead of vendored one. # It only appears when we use packaged poly2tri-c instead of vendored one.
NIX_CFLAGS_COMPILE = [ "-lm" ]; NIX_CFLAGS_COMPILE = "-lm";
postPatch = '' postPatch = ''
chmod +x tests/opencl/opencl_test.sh tests/buffer/buffer-tests-run.sh chmod +x tests/opencl/opencl_test.sh tests/buffer/buffer-tests-run.sh

2
pkgs/misc/emulators/retroarch/cores.nix
View File

@ -720,7 +720,7 @@ in with stdenv.lib.licenses;
license = gpl2; license = gpl2;
extraBuildInputs = [ cmake libGLU libGL ffmpeg python37 xorg.libX11 ]; extraBuildInputs = [ cmake libGLU libGL ffmpeg python37 xorg.libX11 ];
}).override { }).override {
cmakeFlags = "-DLIBRETRO=ON"; cmakeFlags = [ "-DLIBRETRO=ON" ];
makefile = "Makefile"; makefile = "Makefile";
buildPhase = '' buildPhase = ''
make \ make \

4
pkgs/misc/emulators/retroarch/default.nix
View File

@ -39,11 +39,11 @@ in stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig ] nativeBuildInputs = [ pkgconfig ]
++ optional withVulkan [ makeWrapper ]; ++ optionals withVulkan [ makeWrapper ];
buildInputs = [ ffmpeg freetype libxml2 libGLU libGL python3 SDL2 which ] buildInputs = [ ffmpeg freetype libxml2 libGLU libGL python3 SDL2 which ]
++ optional enableNvidiaCgToolkit nvidia_cg_toolkit ++ optional enableNvidiaCgToolkit nvidia_cg_toolkit
++ optional withVulkan [ vulkan-loader ] ++ optionals withVulkan [ vulkan-loader ]
++ optionals stdenv.isDarwin [ libobjc AppKit Foundation ] ++ optionals stdenv.isDarwin [ libobjc AppKit Foundation ]
++ optionals stdenv.isLinux [ alsaLib libdrm libpulseaudio libv4l libX11 ++ optionals stdenv.isLinux [ alsaLib libdrm libpulseaudio libv4l libX11
libXdmcp libXext libXxf86vm mesa udev ]; libXdmcp libXext libXxf86vm mesa udev ];