Merge branch 'staging-next' into staging

2021-01-19 13:50:04 +01:00
parent 2d91ad963f 1d26caa746
commit fc7bd322df
1696 changed files with 4737 additions and 3956 deletions
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, fetchpatch, buildPackages
-, pkgconfig, intltool, ninja, meson
+, pkg-config, intltool, ninja, meson
 , file, flex, bison, expat, libdrm, xorg, wayland, wayland-protocols, openssl
 , llvmPackages, libffi, libomxil-bellagio, libva-minimal
 , libelf, libvdpau, python3Packages
@@ -123,10 +123,10 @@ stdenv.mkDerivation {
    ++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal ]
    ++ lib.optional withValgrind valgrind-light;

-  depsBuildBuild = [ pkgconfig ];
+  depsBuildBuild = [ pkg-config ];

  nativeBuildInputs = [
-    pkgconfig meson ninja
+    pkg-config meson ninja
    intltool bison flex file
    python3Packages.python python3Packages.Mako
  ] ++ lib.optionals (elem "wayland" eglPlatforms) [