Merge staging-next into staging

pkgs/development/compilers/glslang/default.nix

@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   # Fix the paths in .pc, even though it's unclear if these .pc are really useful.
   postFixup = ''
     substituteInPlace "$out"/lib/pkgconfig/SPIRV-Tools{,-shared}.pc \
-      --replace '=''${prefix}//' '='
+      --replace '=''${prefix}//' '=/'
   '';
 
   meta = with lib; {

pkgs/development/compilers/shaderc/default.nix

@@ -50,6 +50,13 @@ in stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DSHADERC_SKIP_TESTS=ON" ];
 
+  # Fix the paths in .pc, even though it's unclear if all these .pc are really useful.
+  postFixup = ''
+    substituteInPlace "$dev"/lib/pkgconfig/*.pc \
+      --replace '=''${prefix}//' '=/' \
+      --replace "$dev/$dev/" "$dev/"
+  '';
+
   meta = with lib; {
     inherit (src.meta) homepage;
     description = "A collection of tools, libraries and tests for shader compilation";

pkgs/development/python-modules/javaproperties/default.nix

@@ -1,4 +1,5 @@
 { lib, buildPythonPackage, fetchFromGitHub
+, setuptools
 , six
 , pytest
 , python-dateutil
@@ -16,6 +17,7 @@ buildPythonPackage rec {
     sha256 = "16rcdw5gd4a21v2xb1j166lc9z2dqcv68gqvk5mvpnm0x6nwadgp";
   };
 
+  nativeBuildInputs = [ setuptools ];
   propagatedBuildInputs = [ six ];
 
   checkInputs = [ python-dateutil pytest ];

pkgs/development/python-modules/pytz-deprecation-shim/default.nix

@@ -5,6 +5,7 @@
 , pythonOlder
 , backports-zoneinfo
 , python-dateutil
+, setuptools
 , tzdata
 , hypothesis
 , pytestCheckHook
@@ -23,6 +24,8 @@ buildPythonPackage rec {
     sha256 = "af097bae1b616dde5c5744441e2ddc69e74dfdcb0c263129610d85b87445a59d";
   };
 
+  nativeBuildInputs = [ setuptools ];
+
   propagatedBuildInputs = (lib.optionals (pythonAtLeast "3.6" && pythonOlder "3.9") [
     backports-zoneinfo
   ]) ++ (lib.optionals (pythonOlder "3.6") [

pkgs/tools/admin/gixy/default.nix

@@ -11,6 +11,9 @@ let
           rev = "pyparsing_${version}";
           sha256 = "14pfy80q2flgzjcx8jkracvnxxnr59kjzp3kdm5nh232gk1v6g6h";
         };
+        nativeBuildInputs = [
+          super.setuptools
+        ];
       });
     };
   };