From a6fc7b289104015b99eff8f744112a86ae2e5f68 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Mon, 14 Mar 2022 12:45:04 -0700 Subject: evince: pass -Dmultimedia=disabled if !supportMultimedia The evince derivation has an option supportMultimedia?true, which if set to false will exclude gstreamer from the nativeBuildInputs. Unfortunately this is not enough; the build will fail with: Run-time dependency gstreamer-base-1.0 found: NO (tried pkgconfig) meson.build:236:0: ERROR: Dependency "gstreamer-base-1.0" not found, tried pkgconfig Let's pass "-Dmultimedia=disabled" to meson in this case so that the build succeeds. Checked with nixpkgs-hammer, which did not report any new warnings introduced by this commit. --- pkgs/desktops/gnome/core/evince/default.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs/desktops') diff --git a/pkgs/desktops/gnome/core/evince/default.nix b/pkgs/desktops/gnome/core/evince/default.nix index 28406e41284..4e6f036f196 100644 --- a/pkgs/desktops/gnome/core/evince/default.nix +++ b/pkgs/desktops/gnome/core/evince/default.nix @@ -130,6 +130,8 @@ stdenv.mkDerivation rec { "-Dps=enabled" ] ++ lib.optionals (!withLibsecret) [ "-Dkeyring=disabled" + ] ++ lib.optionals (!supportMultimedia) [ + "-Dmultimedia=disabled" ]; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; -- cgit 1.4.1