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: abd20ff63079
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 945aabceb486
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 18, 2019

  1. squash! gnome3.totem: 3.30.0 -> 3.32.0

    @jtojnar
    jtojnar committed Mar 18, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    jtojnar Jan Tojnar
    GPG key ID: 7FAB2A15F7A607A4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    945aabc View commit details
Showing with 2 additions and 4 deletions.
  1. +2 −4 pkgs/desktops/gnome-3/core/totem/default.nix
6 changes: 2 additions & 4 deletions pkgs/desktops/gnome-3/core/totem/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, meson, ninja, intltool, gst_all_1
{ 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
@@ -16,9 +16,7 @@ stdenv.mkDerivation rec {

doCheck = true;

NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";

nativeBuildInputs = [ meson ninja vala pkgconfig intltool 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