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

gst_all_1: fix botched merge

Browse Source 
23741692 merged staging incorrectly
This commit is contained in:
Jan Tojnar 2018-04-26 20:01:10 +02:00
parent f925480215
commit 6c5d860c8b
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,13 +13,7 @@
assert faacSupport -> faac != null; assert faacSupport -> faac != null;
let let
inherit (stdenv.lib) optional optionalString; inherit (stdenv.lib) optional;
# OpenJPEG version is hardcoded in package source
openJpegVersion = with stdenv;
lib.concatStringsSep "." (lib.lists.take 2
(lib.splitString "." (lib.getVersion openjpeg)));
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gst-plugins-bad-1.14.0"; name = "gst-plugins-bad-1.14.0";
@ -76,6 +70,4 @@ stdenv.mkDerivation rec {
++ optional (!stdenv.isDarwin) wildmidi ++ optional (!stdenv.isDarwin) wildmidi
# TODO: mjpegtools uint64_t is not compatible with guint64 on Darwin # TODO: mjpegtools uint64_t is not compatible with guint64 on Darwin
++ optional (!stdenv.isDarwin) mjpegtools; ++ optional (!stdenv.isDarwin) mjpegtools;
enableParallelBuilding = true;
} }

3
pkgs/development/libraries/gstreamer/good/default.nix
View File

@ -12,7 +12,7 @@
assert gtkSupport -> gtk3 != null; assert gtkSupport -> gtk3 != null;
let let
inherit (stdenv.lib) optionals optionalString; inherit (stdenv.lib) optional optionals optionalString;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gst-plugins-good-1.14.0"; name = "gst-plugins-good-1.14.0";
@ -50,6 +50,7 @@ stdenv.mkDerivation rec {
libsoup libshout lame mpg123 twolame libintl libsoup libshout lame mpg123 twolame libintl
ncurses ncurses
] ]
++ optional gtkSupport gtk3 # for gtksink
++ optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ] ++ optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]
++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 ]; ++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 ];