diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2018-03-22 20:10:49 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2018-03-23 13:18:39 +0100 |
commit | 060e6aab523b70d1a12d0675ad06fb4a487ab3d0 (patch) | |
tree | 234463f5bcb795b6403b40d75943590427e1029b /pkgs | |
parent | 3b3e059dac6a3fa98ba518fba1852f9cad80b530 (diff) | |
download | nixlib-060e6aab523b70d1a12d0675ad06fb4a487ab3d0.tar nixlib-060e6aab523b70d1a12d0675ad06fb4a487ab3d0.tar.gz nixlib-060e6aab523b70d1a12d0675ad06fb4a487ab3d0.tar.bz2 nixlib-060e6aab523b70d1a12d0675ad06fb4a487ab3d0.tar.lz nixlib-060e6aab523b70d1a12d0675ad06fb4a487ab3d0.tar.xz nixlib-060e6aab523b70d1a12d0675ad06fb4a487ab3d0.tar.zst nixlib-060e6aab523b70d1a12d0675ad06fb4a487ab3d0.zip |
gnome3.totem: clean up
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/desktops/gnome-3/core/totem/default.nix | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix index a9d8b2ad11cb..49bd43e61950 100644 --- a/pkgs/desktops/gnome-3/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/core/totem/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, meson, ninja, intltool, gst_all_1, clutter , clutter-gtk, clutter-gst, python3Packages, shared-mime-info , pkgconfig, gtk3, glib, gobjectIntrospection -, bash, wrapGAppsHook, itstool, libxml2, dbus-glib, vala, gnome3, librsvg -, gdk_pixbuf, file, tracker, nautilus }: +, bash, wrapGAppsHook, itstool, libxml2, vala, gnome3, librsvg +, gdk_pixbuf, tracker, nautilus }: stdenv.mkDerivation rec { name = "totem-${version}"; @@ -13,10 +13,6 @@ stdenv.mkDerivation rec { sha256 = "e32fb9a68097045e75c87ad1b8177f5c01aea2a13dcb3b2e71a0f9570fe9ee13"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "totem"; attrPath = "gnome3.totem"; }; - }; - doCheck = true; # https://bugs.launchpad.net/ubuntu/+source/totem/+bug/1712021 @@ -26,14 +22,14 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; - - nativeBuildInputs = [ meson ninja vala pkgconfig intltool python3Packages.python itstool file wrapGAppsHook ]; - buildInputs = [ gtk3 glib gnome3.grilo clutter-gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins - gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad - gst_all_1.gst-plugins-ugly gst_all_1.gst-libav gnome3.libpeas shared-mime-info dbus-glib - gdk_pixbuf libxml2 gnome3.defaultIconTheme gnome3.gnome-desktop - gnome3.gsettings-desktop-schemas tracker nautilus ]; + nativeBuildInputs = [ meson ninja vala pkgconfig intltool python3Packages.python itstool wrapGAppsHook ]; + buildInputs = [ + gtk3 glib gnome3.grilo clutter-gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins + gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly gst_all_1.gst-libav gnome3.libpeas shared-mime-info + gdk_pixbuf libxml2 gnome3.defaultIconTheme gnome3.gnome-desktop + gnome3.gsettings-desktop-schemas tracker nautilus + ]; propagatedBuildInputs = [ gobjectIntrospection python3Packages.pylint python3Packages.pygobject2 ]; @@ -50,11 +46,17 @@ stdenv.mkDerivation rec { patchShebangs . ''; - mesonFlags = [ "-Dwith-nautilusdir=lib/nautilus/extensions-3.0" ]; + mesonFlags = [ "-Dwith-nautilusdir=${placeholder "out"}/lib/nautilus/extensions-3.0" ]; - GI_TYPELIB_PATH = "$out/lib/girepository-1.0"; wrapPrefixVariables = [ "PYTHONPATH" ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = "totem"; + attrPath = "gnome3.totem"; + }; + }; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Videos; description = "Movie player for the GNOME desktop based on GStreamer"; |