Merge pull request #200078 from Artturin/crossfixes3

Crossfixes

pkgs/development/libraries/ffmpeg/generic.nix

@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
   configureFlags = filter (v: v != null) ([
       "--arch=${stdenv.hostPlatform.parsed.cpu.name}"
       "--target_os=${stdenv.hostPlatform.parsed.kernel.name}"
-      "--pkg-config=${pkg-config.targetPrefix}pkg-config"
+      "--pkg-config=${buildPackages.pkg-config.targetPrefix}pkg-config"
     # License
       "--enable-gpl"
       "--enable-version3"

pkgs/development/libraries/glib-networking/default.nix

@@ -14,6 +14,7 @@
 , libproxy
 , gnome
 , gsettings-desktop-schemas
+, bash
 }:
 
 stdenv.mkDerivation rec {
@@ -36,12 +37,15 @@ stdenv.mkDerivation rec {
     ./installed-tests-path.patch
   ];
 
+  strictDeps = true;
+
   nativeBuildInputs = [
     meson
     ninja
     pkg-config
     gettext
     makeWrapper
+    glib # for gio-querymodules
   ];
 
   buildInputs = [
@@ -50,6 +54,7 @@ stdenv.mkDerivation rec {
     p11-kit
     libproxy
     gsettings-desktop-schemas
+    bash # installed-tests shebangs
   ];
 
   doCheck = false; # tests need to access the certificates (among other things)