From 0fb0af65b03dcd4267d8755d4272ca448a3b798f Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Sun, 25 Nov 2018 19:40:30 +0000 Subject: [PATCH] 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 9c9243a1c683..000000000000 --- 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 18be4e6e4592..4442453644c7 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 4a41013f018a..cd777353afb0 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 { };