From cd9779b9cbd9651ea282b7922962807574334d13 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 30 Jan 2022 16:15:46 +0800 Subject: [PATCH] pantheon.elementary-camera: remove unneeded inputs Clutter support is removed in 6.0 in favor of native Gtk element from GStreamer --- .../apps/elementary-camera/default.nix | 42 ++++++++++--------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix index 7135795914d..94bbc69047d 100644 --- a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix @@ -3,25 +3,24 @@ , fetchFromGitHub , fetchpatch , nix-update-script -, pkg-config -, meson -, ninja -, vala +, appstream , desktop-file-utils -, python3 , gettext , libxml2 -, gtk3 +, meson +, ninja +, pkg-config +, python3 +, vala +, wrapGAppsHook +, elementary-icon-theme +, glib , granite -, libgee -, libhandy , gst_all_1 +, gtk3 , libcanberra -, clutter-gtk -, clutter-gst -, elementary-icon-theme -, appstream -, wrapGAppsHook +, libgee +, libhandy }: stdenv.mkDerivation rec { @@ -58,19 +57,22 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - clutter-gst - clutter-gtk elementary-icon-theme + glib granite - gst_all_1.gst-plugins-bad - gst_all_1.gst-plugins-base - (gst_all_1.gst-plugins-good.override { gtkSupport = true; }) - gst_all_1.gstreamer gtk3 libcanberra libgee libhandy - ]; + ] ++ (with gst_all_1; [ + gst-plugins-bad + gst-plugins-base + # gtkSupport needed for gtksink + # https://github.com/elementary/camera/issues/181 + (gst-plugins-good.override { gtkSupport = true; }) + gst-plugins-ugly + gstreamer + ]); postPatch = '' chmod +x meson/post_install.py