From 2abc0277f01dd09dfcf250cd371256df249dba7a Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 7 Nov 2022 01:32:05 +0200 Subject: [PATCH 1/2] glib-networking: fix cross and enable strictDeps --- pkgs/development/libraries/glib-networking/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 60d812b16dcd..a9a214c542c3 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/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) From 22ec8cd807e867d7678f41e9e6e705c0775b1da5 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 7 Nov 2022 22:26:21 +0200 Subject: [PATCH 2/2] ffmpeg: fix cross pkg-config will be the next pkg-config so its targetPrefix will be wrong --- pkgs/development/libraries/ffmpeg/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 5d9b41848cae..01995e9237b1 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/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"