diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-05-05 23:53:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-05 23:53:04 +0200 |
| commit | 3be89545798ca12a8bf7f1312cb2fcd3399fdf69 (patch) | |
| tree | e6765d4529ac8d2f27477c124cdee290ef92af46 /pkgs/development | |
| parent | 8cf420e62feb9bbd53a91e89a3a579becb41816a (diff) | |
| parent | 841a5553cb411577b5421701b41530e0981d5d82 (diff) | |
| download | nixlib-3be89545798ca12a8bf7f1312cb2fcd3399fdf69.tar nixlib-3be89545798ca12a8bf7f1312cb2fcd3399fdf69.tar.gz nixlib-3be89545798ca12a8bf7f1312cb2fcd3399fdf69.tar.bz2 nixlib-3be89545798ca12a8bf7f1312cb2fcd3399fdf69.tar.lz nixlib-3be89545798ca12a8bf7f1312cb2fcd3399fdf69.tar.xz nixlib-3be89545798ca12a8bf7f1312cb2fcd3399fdf69.tar.zst nixlib-3be89545798ca12a8bf7f1312cb2fcd3399fdf69.zip | |
Merge pull request #39985 from jtojnar/drop-legacy-gst
various: {upgrade,drop} GStreamer 0.10 dependency Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/libcanberra/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/libraries/opencv/default.nix | 5 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix index 54f2273c2fcf..83f86c40c0d1 100644 --- a/pkgs/development/libraries/libcanberra/default.nix +++ b/pkgs/development/libraries/libcanberra/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libtool, gtk ? null, libcap -, alsaLib, libpulseaudio, gstreamer, gst-plugins-base, libvorbis }: +, alsaLib, libpulseaudio, gst_all_1, libvorbis }: stdenv.mkDerivation rec { name = "libcanberra-0.30"; @@ -9,11 +9,10 @@ stdenv.mkDerivation rec { sha256 = "0wps39h8rx2b00vyvkia5j40fkak3dpipp1kzilqla0cgvk73dn2"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig libtool ]; buildInputs = [ - libtool alsaLib libpulseaudio libvorbis gtk libcap - /*gstreamer gst-plugins-base*/ # ToDo: gstreamer not found (why?), add (g)udev? - ]; + alsaLib libpulseaudio libvorbis gtk libcap + ] ++ (with gst_all_1; [ gstreamer gst-plugins-base ]); configureFlags = "--disable-oss"; diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index cbac7210a10e..d2d106827169 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -8,7 +8,7 @@ , enableEXR ? (!stdenv.isDarwin), openexr, ilmbase , enableJPEG2K ? true, jasper , enableFfmpeg ? false, ffmpeg -, enableGStreamer ? false, gst_all +, enableGStreamer ? false, gst_all_1 , enableEigen ? true, eigen , darwin }: @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ++ lib.optionals enableEXR [ openexr ilmbase ] ++ lib.optional enableJPEG2K jasper ++ lib.optional enableFfmpeg ffmpeg - ++ lib.optionals enableGStreamer (with gst_all; [ gstreamer gst-plugins-base ]) + ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ]) ++ lib.optional enableEigen eigen ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa QTKit ]) ; @@ -69,6 +69,7 @@ stdenv.mkDerivation rec { (opencvFlag "JPEG" enableJPEG) (opencvFlag "PNG" enablePNG) (opencvFlag "OPENEXR" enableEXR) + (opencvFlag "GSTREAMER" enableGStreamer) ]; enableParallelBuilding = true; |