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

Merge branch 'staging-next' into staging

Browse Source
This commit is contained in:
Jan Tojnar
2021-01-19 13:50:04 +01:00
parent 2d91ad963f 1d26caa746
commit fc7bd322df
1696 changed files with 4737 additions and 3956 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/SDL2/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, config, fetchurl, pkgconfig
{ stdenv, config, fetchurl, pkg-config
, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
, openglSupport ? libGLSupported, libGL
, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib
@@ -47,9 +47,9 @@ stdenv.mkDerivation rec {
--replace 'WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`' 'WAYLAND_SCANNER=`pkg-config --variable=wayland_scanner wayland-scanner`'
'';
depsBuildBuild = [ pkgconfig ];
depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [ pkgconfig ] ++ optionals waylandSupport [ wayland ];
nativeBuildInputs = [ pkg-config ] ++ optionals waylandSupport [ wayland ];
propagatedBuildInputs = dlopenPropagatedBuildInputs;