From 12298ba68db826fbf7e881ae1461691f19cb8035 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Sun, 11 Nov 2018 01:18:29 +0000 Subject: [PATCH 01/18] acoustid-fingerprinter: switch to ffmpeg_2 --- .../audio/acoustid-fingerprinter/default.nix | 11 +++++--- .../audio/acoustid-fingerprinter/ffmpeg.patch | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 pkgs/tools/audio/acoustid-fingerprinter/ffmpeg.patch diff --git a/pkgs/tools/audio/acoustid-fingerprinter/default.nix b/pkgs/tools/audio/acoustid-fingerprinter/default.nix index f68671bc6fb..4c28c4f3458 100644 --- a/pkgs/tools/audio/acoustid-fingerprinter/default.nix +++ b/pkgs/tools/audio/acoustid-fingerprinter/default.nix @@ -15,10 +15,13 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DTAGLIB_MIN_VERSION=${(builtins.parseDrvName taglib.name).version}" ]; - patches = [ (fetchpatch { - url = "https://bitbucket.org/acoustid/acoustid-fingerprinter/commits/632e87969c3a5562a5d4842b03613267ba6236b2/raw"; - sha256 = "15hm9knrpqn3yqrwyjz4zh2aypwbcycd0c5svrsy1fb2h2rh05jk"; - }) ]; + patches = [ + (fetchpatch { + url = "https://bitbucket.org/acoustid/acoustid-fingerprinter/commits/632e87969c3a5562a5d4842b03613267ba6236b2/raw"; + sha256 = "15hm9knrpqn3yqrwyjz4zh2aypwbcycd0c5svrsy1fb2h2rh05jk"; + }) + ./ffmpeg.patch + ]; meta = with stdenv.lib; { homepage = https://acoustid.org/fingerprinter; diff --git a/pkgs/tools/audio/acoustid-fingerprinter/ffmpeg.patch b/pkgs/tools/audio/acoustid-fingerprinter/ffmpeg.patch new file mode 100644 index 00000000000..f3eacae26f7 --- /dev/null +++ b/pkgs/tools/audio/acoustid-fingerprinter/ffmpeg.patch @@ -0,0 +1,26 @@ +diff --git a/decoder.h b/decoder.h +index 028f58f..4428ac1 100644 +--- a/decoder.h ++++ b/decoder.h +@@ -39,6 +39,8 @@ extern "C" { + #define AV_SAMPLE_FMT_S16 SAMPLE_FMT_S16 + #endif + ++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 ++ + class Decoder + { + public: +diff --git a/ffmpeg/audioconvert.h b/ffmpeg/audioconvert.h +index 2b28e2e..a699986 100644 +--- a/ffmpeg/audioconvert.h ++++ b/ffmpeg/audioconvert.h +@@ -79,7 +79,7 @@ int avcodec_channel_layout_num_channels(int64_t channel_layout); + * @param fmt_name Format name, or NULL if unknown + * @return Channel layout mask + */ +-uint64_t avcodec_guess_channel_layout(int nb_channels, enum CodecID codec_id, const char *fmt_name); ++uint64_t avcodec_guess_channel_layout(int nb_channels, enum AVCodecID codec_id, const char *fmt_name); + + struct AVAudioConvert; + typedef struct AVAudioConvert AVAudioConvert; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 22b41d9468e..764e238699f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -458,7 +458,7 @@ in acme-sh = callPackage ../tools/admin/acme.sh { }; acoustidFingerprinter = callPackage ../tools/audio/acoustid-fingerprinter { - ffmpeg = ffmpeg_1; + ffmpeg = ffmpeg_2; }; acpica-tools = callPackage ../tools/system/acpica-tools { }; From 1e899e82810ca1267a4c50e7806f3804158b9b89 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Sun, 11 Nov 2018 01:18:46 +0000 Subject: [PATCH 02/18] cantata: switch to default ffmpeg --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 764e238699f..f1feda35b1f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1848,7 +1848,6 @@ in cantata = libsForQt5.callPackage ../applications/audio/cantata { inherit vlc; - ffmpeg = ffmpeg_2; }; can-utils = callPackage ../os-specific/linux/can-utils { }; From 156b33d4ef9d344143c65b58f1e8e84b321a07c6 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Sun, 11 Nov 2018 01:19:06 +0000 Subject: [PATCH 03/18] cfdg: switch to default ffmpeg --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f1feda35b1f..41f33e69815 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1882,9 +1882,7 @@ in certmgr = callPackage ../tools/security/certmgr { }; - cfdg = callPackage ../tools/graphics/cfdg { - ffmpeg = ffmpeg_2; - }; + cfdg = callPackage ../tools/graphics/cfdg { }; checkinstall = callPackage ../tools/package-management/checkinstall { }; From 14133c7ec355a32bd19ed51e64e6f9a1f9bafbb3 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Sun, 11 Nov 2018 01:19:19 +0000 Subject: [PATCH 04/18] renpy: switch to default ffmpeg --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 41f33e69815..90976c0e67c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8113,9 +8113,7 @@ in inherit (ocamlPackages) reason; - renpy = callPackage ../development/interpreters/renpy { - ffmpeg = ffmpeg_2; - }; + renpy = callPackage ../development/interpreters/renpy { }; pixie = callPackage ../development/interpreters/pixie { }; dust = callPackage ../development/interpreters/pixie/dust.nix { }; From 1e68d2ff788643875688ae5a110bd08712bdce7e Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Sun, 11 Nov 2018 01:20:09 +0000 Subject: [PATCH 05/18] ffmpegthumbnailer: switch to default ffmpeg --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90976c0e67c..93cdf15ca80 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9788,9 +9788,7 @@ in VideoDecodeAcceleration; }; - ffmpegthumbnailer = callPackage ../development/libraries/ffmpegthumbnailer { - ffmpeg = ffmpeg_2; - }; + ffmpegthumbnailer = callPackage ../development/libraries/ffmpegthumbnailer { }; ffmpeg-sixel = callPackage ../development/libraries/ffmpeg-sixel { }; From f474f511a6c651661d3876aa134ec0be8e44a90e Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Sun, 11 Nov 2018 01:20:24 +0000 Subject: [PATCH 06/18] ffms: switch to default ffmpeg --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93cdf15ca80..4edf39d064d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9792,9 +9792,7 @@ in ffmpeg-sixel = callPackage ../development/libraries/ffmpeg-sixel { }; - ffms = callPackage ../development/libraries/ffms { - ffmpeg = ffmpeg_2; - }; + ffms = callPackage ../development/libraries/ffms { }; fftw = callPackage ../development/libraries/fftw { }; fftwSinglePrec = fftw.override { precision = "single"; }; From 3293800babc67a339fa2bf72c2d15eb153df6a81 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Sun, 11 Nov 2018 01:22:13 +0000 Subject: [PATCH 07/18] opencv: switch to default ffmpeg --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4edf39d064d..e4b0b63e9e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11892,7 +11892,6 @@ in openct = callPackage ../development/libraries/openct { }; opencv = callPackage ../development/libraries/opencv { - ffmpeg = ffmpeg_2; inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) Cocoa QTKit; }; From 22d92d62457daa2bf1db856506b0dc6d7682087c Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Sun, 11 Nov 2018 01:22:27 +0000 Subject: [PATCH 08/18] xineLib: switch to default ffmpeg --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e4b0b63e9e5..2c7c70d6257 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13088,9 +13088,7 @@ in xdo = callPackage ../tools/misc/xdo { }; - xineLib = callPackage ../development/libraries/xine-lib { - ffmpeg = ffmpeg_2; - }; + xineLib = callPackage ../development/libraries/xine-lib { }; xautolock = callPackage ../misc/screensavers/xautolock { }; From f8d0626890cab9bf47e106d0bb9638b4c853759b Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Sun, 11 Nov 2018 01:22:40 +0000 Subject: [PATCH 09/18] livepeer: ffmpeg_3 is the current default so don't override --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2c7c70d6257..686622ae62d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13645,7 +13645,7 @@ in lighttpd = callPackage ../servers/http/lighttpd { }; - livepeer = callPackage ../servers/livepeer { ffmpeg = ffmpeg_3; }; + livepeer = callPackage ../servers/livepeer { }; lwan = callPackage ../servers/http/lwan { }; From 7ec7bace880b31d63355aba3a595201a9b73149d Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Sun, 11 Nov 2018 01:23:03 +0000 Subject: [PATCH 10/18] avxsynth: switch to default ffmpeg --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 686622ae62d..1b2f8caa88e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16199,7 +16199,6 @@ in avxsynth = callPackage ../applications/video/avxsynth { libjpeg = libjpeg_original; # error: 'JCOPYRIGHT_SHORT' was not declared in this scope - ffmpeg = ffmpeg_2; }; awesome-4-0 = callPackage ../applications/window-managers/awesome { From b8ae9072fb08526c4e48e61c96b08aae1328e817 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Sun, 11 Nov 2018 01:23:17 +0000 Subject: [PATCH 11/18] baresip: switch to default ffmpeg --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b2f8caa88e..2d0dd009d6a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16221,9 +16221,7 @@ in bandwidth = callPackage ../tools/misc/bandwidth { }; - baresip = callPackage ../applications/networking/instant-messengers/baresip { - ffmpeg = ffmpeg_1; - }; + baresip = callPackage ../applications/networking/instant-messengers/baresip { }; barrier = callPackage ../applications/misc/barrier {}; From 16b8498022e40aaa1a18a22435de48e643337f47 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Sun, 11 Nov 2018 01:24:07 +0000 Subject: [PATCH 12/18] freerdp_legacy: switch to ffmpeg_2 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2d0dd009d6a..e6b3d8f8adb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17343,7 +17343,7 @@ in # This must go when weston v2 is released freerdp_legacy = callPackage ../applications/networking/remote/freerdp/legacy.nix { cmake = cmake_2_8; - ffmpeg = ffmpeg_1; + ffmpeg = ffmpeg_2; }; fte = callPackage ../applications/editors/fte { }; From a17ac8cc40020150662c86de9bd63431168eb379 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Sun, 11 Nov 2018 01:24:19 +0000 Subject: [PATCH 13/18] guvcview: switch to default ffmpeg --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e6b3d8f8adb..1ce194773e9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17559,7 +17559,6 @@ in guvcview = callPackage ../os-specific/linux/guvcview { pulseaudioSupport = config.pulseaudio or true; - ffmpeg = ffmpeg_2; }; gxmessage = callPackage ../applications/misc/gxmessage { }; From 323ad74b1a1ec069375b6dec7fd85498ab06b7c4 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Sun, 11 Nov 2018 01:24:31 +0000 Subject: [PATCH 14/18] moc: switch to default ffmpeg --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ce194773e9..f592cf32d9b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18272,9 +18272,7 @@ in wxGTK30 = wxGTK30.override { withWebKit = true ; }; }; - moc = callPackage ../applications/audio/moc { - ffmpeg = ffmpeg_2; - }; + moc = callPackage ../applications/audio/moc { }; mod-distortion = callPackage ../applications/audio/mod-distortion { }; From 336cd48da9917e5a7b8942bbc9d5e668f791329c Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Sun, 11 Nov 2018 01:24:47 +0000 Subject: [PATCH 15/18] spotify: switch to ffmpeg_2 --- pkgs/applications/audio/spotify/default.nix | 7 +++++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 06f8e8616f0..6afd8f2dff8 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, squashfsTools, xorg, alsaLib, makeWrapper, openssl, freetype , glib, pango, cairo, atk, gdk_pixbuf, gtk2, cups, nspr, nss, libpng -, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_0_10, curl, zlib, gnome3 +, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curl, zlib, gnome3 , at-spi2-atk }: @@ -26,7 +26,7 @@ let curl dbus expat - ffmpeg_0_10 + ffmpeg fontconfig freetype gdk_pixbuf @@ -118,6 +118,9 @@ stdenv.mkDerivation { ln -s ${nspr.out}/lib/libnspr4.so $libdir/libnspr4.so ln -s ${nspr.out}/lib/libplc4.so $libdir/libplc4.so + ln -s ${ffmpeg.out}/lib/libavcodec.so.56 $libdir/libavcodec-ffmpeg.so.56 + ln -s ${ffmpeg.out}/lib/libavformat.so.56 $libdir/libavformat-ffmpeg.so.56 + rpath="$out/share/spotify:$libdir" patchelf \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f592cf32d9b..d1721716af9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19453,6 +19453,7 @@ in spotify = callPackage ../applications/audio/spotify { libgcrypt = libgcrypt_1_5; libpng = libpng12; + ffmpeg = ffmpeg_2; curl = curl.override { sslSupport = false; gnutlsSupport = true; }; From 8eeecd653d5d9c304884b71ca1c47adc1a9224fe Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Sun, 11 Nov 2018 01:25:04 +0000 Subject: [PATCH 16/18] ffmpeg_1: drop --- pkgs/development/libraries/ffmpeg/1.2.nix | 8 -------- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 12 deletions(-) delete mode 100644 pkgs/development/libraries/ffmpeg/1.2.nix diff --git a/pkgs/development/libraries/ffmpeg/1.2.nix b/pkgs/development/libraries/ffmpeg/1.2.nix deleted file mode 100644 index 312eb70fdf2..00000000000 --- a/pkgs/development/libraries/ffmpeg/1.2.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "${branch}.12"; - branch = "1.2"; - sha256 = "0za9w87rk4x6wkjc6iaxqx2ihlsgj181ilfgxfjc54mdgxfcjfli"; - patches = [ ./vpxenc-1.2-libvpx-1.5.patch ]; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1721716af9..4a41013f018 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9750,9 +9750,6 @@ in ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; }; - ffmpeg_1_2 = callPackage ../development/libraries/ffmpeg/1.2.nix { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; ffmpeg_2_8 = callPackage ../development/libraries/ffmpeg/2.8.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; }; @@ -9765,7 +9762,6 @@ in # Aliases ffmpeg_0 = ffmpeg_0_10; - ffmpeg_1 = ffmpeg_1_2; ffmpeg_2 = ffmpeg_2_8; ffmpeg_3 = ffmpeg_3_4; ffmpeg = ffmpeg_3; From 0fb0af65b03dcd4267d8755d4272ca448a3b798f Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Sun, 25 Nov 2018 19:40:30 +0000 Subject: [PATCH 17/18] gst-ffmpeg: drop --- .../gstreamer/legacy/gst-ffmpeg/default.nix | 30 ------------------- pkgs/top-level/aliases.nix | 1 - pkgs/top-level/all-packages.nix | 4 --- 3 files changed, 35 deletions(-) delete mode 100644 pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix deleted file mode 100644 index 9c9243a1c68..00000000000 --- a/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gst-plugins-base, bzip2, yasm, orc -, useInternalFfmpeg ? false, ffmpeg ? null }: - -stdenv.mkDerivation rec { - name = "gst-ffmpeg-0.10.13"; - - src = fetchurl { - urls = [ - "https://gstreamer.freedesktop.org/src/gst-ffmpeg/${name}.tar.bz2" - "mirror://gentoo/distfiles/${name}.tar.bz2" - ]; - sha256 = "0qmvgwcfybci78sd73mhvm4bsb7l0xsk9yljrgik80g011ds1z3n"; - }; - - # Upstream strongly recommends against using --with-system-ffmpeg, - # but we do it anyway because we're so hardcore (and we don't want - # multiple copies of ffmpeg). - configureFlags = stdenv.lib.optional (!useInternalFfmpeg) "--with-system-ffmpeg"; - - buildInputs = - [ pkgconfig bzip2 gst-plugins-base orc ] - ++ (if useInternalFfmpeg then [ yasm ] else [ ffmpeg ]); - - meta = { - homepage = https://gstreamer.freedesktop.org/releases/gst-ffmpeg; - description = "GStreamer's plug-in using FFmpeg"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 18be4e6e459..4442453644c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -118,7 +118,6 @@ mapAliases ({ googleAuthenticator = google-authenticator; # added 2016-10-16 grantlee5 = libsForQt5.grantlee; # added 2015-12-19 gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25 - gst_ffmpeg = gst-ffmpeg; # added 2017-02 gst_plugins_bad = gst-plugins-bad; # added 2017-02 gst_plugins_base = gst-plugins-base; # added 2017-02 gst_plugins_good = gst-plugins-good; # added 2017-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a41013f018..cd777353afb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10118,10 +10118,6 @@ in gst-plugins-ugly = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-ugly {}; - gst-ffmpeg = callPackage ../development/libraries/gstreamer/legacy/gst-ffmpeg { - ffmpeg = ffmpeg_0; - }; - gst-python = callPackage ../development/libraries/gstreamer/legacy/gst-python {}; gstreamermm = callPackage ../development/libraries/gstreamer/legacy/gstreamermm { }; From c626c85dce94e1e5cc891e3895bc67c3a1fab48d Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Sun, 25 Nov 2018 19:40:56 +0000 Subject: [PATCH 18/18] ffmpeg_0: drop --- pkgs/development/libraries/ffmpeg/0.10.nix | 8 -------- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 12 deletions(-) delete mode 100644 pkgs/development/libraries/ffmpeg/0.10.nix diff --git a/pkgs/development/libraries/ffmpeg/0.10.nix b/pkgs/development/libraries/ffmpeg/0.10.nix deleted file mode 100644 index 4eebad6b307..00000000000 --- a/pkgs/development/libraries/ffmpeg/0.10.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "${branch}.16"; - branch = "0.10"; - sha256 = "1l9z5yfp1vq4z2y4mh91707dhcn41c3pd505i0gvdzcdsp5j6y77"; - patches = [ ./vpxenc-0.10-libvpx-1.5.patch ]; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cd777353afb..37bfbbed7fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9747,9 +9747,6 @@ in blas = if stdenv.isDarwin then blas else openblas; }; - ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; ffmpeg_2_8 = callPackage ../development/libraries/ffmpeg/2.8.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; }; @@ -9761,7 +9758,6 @@ in }; # Aliases - ffmpeg_0 = ffmpeg_0_10; ffmpeg_2 = ffmpeg_2_8; ffmpeg_3 = ffmpeg_3_4; ffmpeg = ffmpeg_3;