diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2018-04-26 20:01:10 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2018-04-26 20:40:35 +0200 |
commit | 6c5d860c8b3e0995d01505da86559ebde731a9df (patch) | |
tree | e4851dfd657dde66fac177246b05a04ef7dd84cc | |
parent | f925480215a14420d893021dc2c6f2b78a66f137 (diff) | |
download | nixlib-6c5d860c8b3e0995d01505da86559ebde731a9df.tar nixlib-6c5d860c8b3e0995d01505da86559ebde731a9df.tar.gz nixlib-6c5d860c8b3e0995d01505da86559ebde731a9df.tar.bz2 nixlib-6c5d860c8b3e0995d01505da86559ebde731a9df.tar.lz nixlib-6c5d860c8b3e0995d01505da86559ebde731a9df.tar.xz nixlib-6c5d860c8b3e0995d01505da86559ebde731a9df.tar.zst nixlib-6c5d860c8b3e0995d01505da86559ebde731a9df.zip |
gst_all_1: fix botched merge
23741692 merged staging incorrectly
-rw-r--r-- | pkgs/development/libraries/gstreamer/bad/default.nix | 10 | ||||
-rw-r--r-- | pkgs/development/libraries/gstreamer/good/default.nix | 3 |
2 files changed, 3 insertions, 10 deletions
diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 8ebd70921135..de1a3700cc2b 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -13,13 +13,7 @@ assert faacSupport -> faac != null; let - inherit (stdenv.lib) optional optionalString; - - # OpenJPEG version is hardcoded in package source - openJpegVersion = with stdenv; - lib.concatStringsSep "." (lib.lists.take 2 - (lib.splitString "." (lib.getVersion openjpeg))); - + inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { name = "gst-plugins-bad-1.14.0"; @@ -76,6 +70,4 @@ stdenv.mkDerivation rec { ++ optional (!stdenv.isDarwin) wildmidi # TODO: mjpegtools uint64_t is not compatible with guint64 on Darwin ++ optional (!stdenv.isDarwin) mjpegtools; - - enableParallelBuilding = true; } diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 21376ce79c1c..11e0894df3c3 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -12,7 +12,7 @@ assert gtkSupport -> gtk3 != null; let - inherit (stdenv.lib) optionals optionalString; + inherit (stdenv.lib) optional optionals optionalString; in stdenv.mkDerivation rec { name = "gst-plugins-good-1.14.0"; @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { libsoup libshout lame mpg123 twolame libintl ncurses ] + ++ optional gtkSupport gtk3 # for gtksink ++ optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ] ++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 ]; |