about summary refs log tree commit diff
diff options
context:
space:
mode:
authorajs124 <git@ajs124.de>2022-03-24 01:06:31 +0100
committerajs124 <git@ajs124.de>2022-03-24 01:08:13 +0100
commitf0cac4d2ba5b8c1f27b781d85af5f3645d1aa078 (patch)
tree6a376faef6d03bd5fb184fe1aaed2f9e0f95f2b5
parent8f390037ebaf91499e3860e0a1623448a4ed1154 (diff)
downloadnixlib-f0cac4d2ba5b8c1f27b781d85af5f3645d1aa078.tar
nixlib-f0cac4d2ba5b8c1f27b781d85af5f3645d1aa078.tar.gz
nixlib-f0cac4d2ba5b8c1f27b781d85af5f3645d1aa078.tar.bz2
nixlib-f0cac4d2ba5b8c1f27b781d85af5f3645d1aa078.tar.lz
nixlib-f0cac4d2ba5b8c1f27b781d85af5f3645d1aa078.tar.xz
nixlib-f0cac4d2ba5b8c1f27b781d85af5f3645d1aa078.tar.zst
nixlib-f0cac4d2ba5b8c1f27b781d85af5f3645d1aa078.zip
ffmpeg-sixel: drop
-rw-r--r--pkgs/development/libraries/ffmpeg-sixel/default.nix37
-rw-r--r--pkgs/top-level/aliases.nix1
-rw-r--r--pkgs/top-level/all-packages.nix2
3 files changed, 1 insertions, 39 deletions
diff --git a/pkgs/development/libraries/ffmpeg-sixel/default.nix b/pkgs/development/libraries/ffmpeg-sixel/default.nix
deleted file mode 100644
index daa03d0293a0..000000000000
--- a/pkgs/development/libraries/ffmpeg-sixel/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, libsixel, yasm
-}:
-
-stdenv.mkDerivation {
-
-  pname = "ffmpeg-sixel";
-  version = "nightly-2.3.x";
-
-  src = fetchFromGitHub {
-    owner = "saitoha";
-    repo = "FFmpeg-SIXEL";
-    rev = "8566fdb8b7516b54aed58f329dc216e06fc10052";
-    sha256 = "00s2lggfdj2ibpngpyqqg7360p7yb69ys1ppg59yvv0m0mxk5x3k";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [
-    libsixel
-    yasm
-  ];
-
-  configurePhase = ''
-    ./configure --enable-libsixel --prefix=$out
-  '';
-
-  postInstall = ''
-    mv $out/bin/ffmpeg $out/bin/ffmpeg-sixel
-  '';
-
-  meta = with lib; {
-    description = "A complete, cross-platform solution to record, convert and stream audio and video, extended to support console graphics";
-    homepage = "http://www.ffmpeg.org/";
-    license = licenses.lgpl3;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ vrthra ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index b6d4c35d6845..65aa5c9319f8 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -323,6 +323,7 @@ mapAliases ({
   fedora-coreos-config-transpiler = throw "fedora-coreos-config-transpiler has been renamed to 'butane'"; # Added 2021-04-13
   fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H";
   ffadoFull = throw "'ffadoFull' has been renamed to/replaced by 'ffado'"; # Converted to throw 2022-02-22
+  ffmpeg-sixel = throw "ffmpeg-sixel has been removed, because it was an outdated/unmaintained fork of ffmpeg"; # Added 2022-03-23";
   ffmpeg_3 = throw "ffmpeg_3 was removed from nixpkgs, because it was an outdated and insecure release"; # added 2022-01-17
   finger_bsd = bsd-finger;
   fingerd_bsd = bsd-fingerd;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ce492c1f2fa2..2c430fffed6b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16762,8 +16762,6 @@ with pkgs;
 
   ffmpegthumbnailer = callPackage ../development/libraries/ffmpegthumbnailer { };
 
-  ffmpeg-sixel = callPackage ../development/libraries/ffmpeg-sixel { };
-
   ffmpeg-normalize = python3Packages.callPackage ../applications/video/ffmpeg-normalize { };
 
   ffms = callPackage ../development/libraries/ffms { };