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: f130ecdd3048
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 28b7d016ca66
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Jul 17, 2017

  1. gst_all_1.gst-plugins-bad: allow building gtksink plugin 

    Corebird requires gtksink gstreamer plugin to play videos. [1] The plugin,
however, is only built when GTK is available.

This patch adds gtk3 as an optional dependency to gst_all_1.gst-plugins-bad
package, allowing the build of gtksink.

[1]: baedert/corebird#431
    @jtojnar
    jtojnar committed Jul 17, 2017
    Copy the full SHA
    0edae74 View commit details

  2. corebird: fix video playback 

    Corebird requires gst-plugins-bad compiled with GTK support to play
videos.

This commit enables the GTK support.
    @jtojnar
    jtojnar committed Jul 17, 2017
    Copy the full SHA
    e564f16 View commit details

  3. Merge pull request #27005 from jtojnar/fix/corebird-gst 

    gst_all_1.gst-plugins-bad: build gtksink plugin
    @FRidh
    FRidh authored Jul 17, 2017
    Copy the full SHA
    28b7d01 View commit details
Showing with 6 additions and 2 deletions.
  1. +1 −1 pkgs/applications/networking/corebird/default.nix
  2. +5 −1 pkgs/development/libraries/gstreamer/bad/default.nix
2 changes: 1 addition & 1 deletion pkgs/applications/networking/corebird/default.nix
View file
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {

buildInputs = [
gtk3 json_glib sqlite libsoup gettext vala_0_32 gnome3.rest gnome3.dconf gnome3.gspell glib_networking
] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav ]);
] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good (gst-plugins-bad.override { gtkSupport = true; }) gst-libav ]);

meta = {
description = "Native Gtk+ Twitter client for the Linux desktop";
6 changes: 5 additions & 1 deletion pkgs/development/libraries/gstreamer/bad/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{ stdenv, fetchurl, pkgconfig, python, gst-plugins-base, orc
, faacSupport ? false, faac ? null
, gtkSupport ? false, gtk3 ? null
, faad2, libass, libkate, libmms
, libmodplug, mpeg2dec, mpg123
, openjpeg, libopus, librsvg
@@ -10,6 +11,7 @@
}:

assert faacSupport -> faac != null;
assert gtkSupport -> gtk3 != null;

let
inherit (stdenv.lib) optional optionalString;
@@ -41,7 +43,7 @@ stdenv.mkDerivation rec {

buildInputs = [
gst-plugins-base orc
faad2 libass libkate libmms
faad2 gtk3 libass libkate libmms
libmodplug mpeg2dec mpg123
openjpeg libopus librsvg
fluidsynth libvdpau
@@ -50,6 +52,8 @@ stdenv.mkDerivation rec {
]
++ libintlOrEmpty
++ optional faacSupport faac
# for gtksink
++ optional gtkSupport gtk3
++ optional stdenv.isLinux wayland
# wildmidi requires apple's OpenAL
# TODO: package apple's OpenAL, fix wildmidi, include on Darwin