jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
gst_all_1.gst-plugins-bad: build gtksink plugin
This commit is contained in:
Frederik Rietdijk 2017-07-17 17:50:27 +02:00 committed by GitHub
commit 28b7d016ca
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/networking/corebird/default.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gtk3 json_glib sqlite libsoup gettext vala_0_32 gnome3.rest gnome3.dconf gnome3.gspell glib_networking 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 = { meta = {
description = "Native Gtk+ Twitter client for the Linux desktop"; description = "Native Gtk+ Twitter client for the Linux desktop";

6
pkgs/development/libraries/gstreamer/bad/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchurl, pkgconfig, python, gst-plugins-base, orc { stdenv, fetchurl, pkgconfig, python, gst-plugins-base, orc
, faacSupport ? false, faac ? null , faacSupport ? false, faac ? null
, gtkSupport ? false, gtk3 ? null
, faad2, libass, libkate, libmms , faad2, libass, libkate, libmms
, libmodplug, mpeg2dec, mpg123 , libmodplug, mpeg2dec, mpg123
, openjpeg, libopus, librsvg , openjpeg, libopus, librsvg
@ -10,6 +11,7 @@
}: }:
assert faacSupport -> faac != null; assert faacSupport -> faac != null;
assert gtkSupport -> gtk3 != null;
let let
inherit (stdenv.lib) optional optionalString; inherit (stdenv.lib) optional optionalString;
@ -41,7 +43,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gst-plugins-base orc gst-plugins-base orc
faad2 libass libkate libmms faad2 gtk3 libass libkate libmms
libmodplug mpeg2dec mpg123 libmodplug mpeg2dec mpg123
openjpeg libopus librsvg openjpeg libopus librsvg
fluidsynth libvdpau fluidsynth libvdpau
@ -50,6 +52,8 @@ stdenv.mkDerivation rec {
] ]
++ libintlOrEmpty ++ libintlOrEmpty
++ optional faacSupport faac ++ optional faacSupport faac
# for gtksink
++ optional gtkSupport gtk3
++ optional stdenv.isLinux wayland ++ optional stdenv.isLinux wayland
# wildmidi requires apple's OpenAL # wildmidi requires apple's OpenAL
# TODO: package apple's OpenAL, fix wildmidi, include on Darwin # TODO: package apple's OpenAL, fix wildmidi, include on Darwin