Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8e7fca3a5ce2
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4fdf368360a6
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Nov 9, 2020

  1. gnome3.totem: clean up 

    * format with nixpkgs-fmt
* reorder attributes to more cannonical order
* narrow patchShebangs attributes
* add hooks to checkPhase
* correct license
    @jtojnar
    jtojnar committed Nov 9, 2020
    Copy the full SHA
    b888481 View commit details

  2. gnome3.totem: disable tests 

    They do not work with GStreamer 1.18.
https://gitlab.gnome.org/GNOME/totem/-/issues/450
    @jtojnar
    jtojnar committed Nov 9, 2020
    Copy the full SHA
    4fdf368 View commit details
Showing with 83 additions and 18 deletions.
  1. +83 −18 pkgs/desktops/gnome-3/core/totem/default.nix
101 changes: 83 additions & 18 deletions pkgs/desktops/gnome-3/core/totem/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,34 @@
{ stdenv, fetchurl, meson, ninja, gettext, gst_all_1
, clutter-gtk, clutter-gst, python3Packages, shared-mime-info
, pkgconfig, gtk3, glib, gobject-introspection, totem-pl-parser
, wrapGAppsHook, itstool, libxml2, vala, gnome3, grilo, grilo-plugins
, libpeas, adwaita-icon-theme, gnome-desktop, gsettings-desktop-schemas
, gdk-pixbuf, tracker, nautilus, xvfb_run }:
{ stdenv
, fetchurl
, meson
, ninja
, gettext
, gst_all_1
, clutter-gtk
, clutter-gst
, python3Packages
, shared-mime-info
, pkgconfig
, gtk3
, glib
, gobject-introspection
, totem-pl-parser
, wrapGAppsHook
, itstool
, libxml2
, vala
, gnome3
, grilo
, grilo-plugins
, libpeas
, adwaita-icon-theme
, gnome-desktop
, gsettings-desktop-schemas
, gdk-pixbuf
, tracker
, nautilus
, xvfb_run
}:

stdenv.mkDerivation rec {
pname = "totem";
@@ -14,33 +39,73 @@ stdenv.mkDerivation rec {
sha256 = "0bs33ijvxbr2prb9yj4dxglsszslsn9k258n311sld84masz4ad8";
};

doCheck = true;
nativeBuildInputs = [
meson
ninja
vala
pkgconfig
gettext
python3Packages.python
itstool
gobject-introspection
wrapGAppsHook
];

nativeBuildInputs = [ meson ninja vala pkgconfig gettext python3Packages.python itstool gobject-introspection wrapGAppsHook ];
buildInputs = [
gtk3 glib grilo clutter-gtk clutter-gst totem-pl-parser 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 libpeas shared-mime-info
gdk-pixbuf libxml2 adwaita-icon-theme gnome-desktop
gsettings-desktop-schemas tracker nautilus
python3Packages.pygobject3 python3Packages.dbus-python # for plug-ins
gtk3
glib
grilo
clutter-gtk
clutter-gst
totem-pl-parser
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
libpeas
shared-mime-info
gdk-pixbuf
libxml2
adwaita-icon-theme
gnome-desktop
gsettings-desktop-schemas
tracker
nautilus
# for plug-ins
python3Packages.pygobject3
python3Packages.dbus-python
];

checkInputs = [
xvfb_run
];

mesonFlags = [
# TODO: https://github.com/NixOS/nixpkgs/issues/36468
"-Dc_args=-I${glib.dev}/include/gio-unix-2.0"
];

# Tests do not work with GStreamer 1.18.
# https://gitlab.gnome.org/GNOME/totem/-/issues/450
doCheck = false;

postPatch = ''
chmod +x meson_compile_python.py meson_post_install.py # patchShebangs requires executable file
patchShebangs .
patchShebangs \
./meson_compile_python.py \
./meson_post_install.py
'';

checkInputs = [ xvfb_run ];

checkPhase = ''
runHook preCheck
xvfb-run -s '-screen 0 800x600x24' \
ninja test
runHook postCheck
'';

wrapPrefixVariables = [ "PYTHONPATH" ];
@@ -56,7 +121,7 @@ stdenv.mkDerivation rec {
homepage = "https://wiki.gnome.org/Apps/Videos";
description = "Movie player for the GNOME desktop based on GStreamer";
maintainers = teams.gnome.members;
license = licenses.gpl2;
license = licenses.gpl2Plus; # with exception to allow use of non-GPL compatible plug-ins
platforms = platforms.linux;
};
}