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/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -1,7 +1,7 @@
 { stdenv
 , fetchurl

-, pkgconfig
+, pkg-config
 , cmake

 , zlib
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
    moveToOutput include/tiffiop.h $dev_private
  '';

-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];

  propagatedBuildInputs = [ zlib libjpeg xz ]; #TODO: opengl support (bogus configure detection)