diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-03 07:42:50 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-03 07:42:50 +0200 |
commit | 53328909da75752522c55f8d94c6553d740f9729 (patch) | |
tree | ddbf6026aab3331c9bab6de36a3f49e1d02493a1 /pkgs/desktops/gnome-3/apps/cheese/default.nix | |
parent | 49f281d287d7f31079994b06235efa508585001e (diff) | |
parent | cd9846239a8ef48a0630d80b0c5ebcead09b4219 (diff) | |
download | nixlib-53328909da75752522c55f8d94c6553d740f9729.tar nixlib-53328909da75752522c55f8d94c6553d740f9729.tar.gz nixlib-53328909da75752522c55f8d94c6553d740f9729.tar.bz2 nixlib-53328909da75752522c55f8d94c6553d740f9729.tar.lz nixlib-53328909da75752522c55f8d94c6553d740f9729.tar.xz nixlib-53328909da75752522c55f8d94c6553d740f9729.tar.zst nixlib-53328909da75752522c55f8d94c6553d740f9729.zip |
Merge staging-next into master, closes #65497
Diffstat (limited to 'pkgs/desktops/gnome-3/apps/cheese/default.nix')
-rw-r--r-- | pkgs/desktops/gnome-3/apps/cheese/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome-3/apps/cheese/default.nix index 4e5595385b48..f21e81237b26 100644 --- a/pkgs/desktops/gnome-3/apps/cheese/default.nix +++ b/pkgs/desktops/gnome-3/apps/cheese/default.nix @@ -2,7 +2,7 @@ , pkgconfig, gtk3, glib, clutter-gtk, clutter-gst, udev, gst_all_1, itstool , libgudev, autoreconfHook, vala, docbook_xml_dtd_43, docbook_xsl, appstream-glib , libxslt, yelp-tools, gnome-common, gtk-doc -, adwaita-icon-theme, librsvg, totem, gdk_pixbuf, gnome3, gnome-desktop, libxml2 }: +, adwaita-icon-theme, librsvg, totem, gdk-pixbuf, gnome3, gnome-desktop, libxml2 }: stdenv.mkDerivation rec { name = "cheese-${version}"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { autoreconfHook gtk-doc yelp-tools gnome-common ]; buildInputs = [ gtk3 glib gnome-video-effects - gdk_pixbuf adwaita-icon-theme librsvg udev gst_all_1.gstreamer + gdk-pixbuf adwaita-icon-theme librsvg udev gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome-desktop gst_all_1.gst-plugins-bad clutter-gtk clutter-gst libcanberra-gtk3 libgudev ]; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { # vp8enc preset --prefix GST_PRESET_PATH : "${gst_all_1.gst-plugins-good}/share/gstreamer-1.0/presets" # Thumbnailers - --prefix XDG_DATA_DIRS : "${gdk_pixbuf}/share" + --prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share" --prefix XDG_DATA_DIRS : "${totem}/share" ) ''; |