From 5bfb738471cdd61125d2a2f33a1869faa37a56c3 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 17 Jan 2022 19:39:59 +0100 Subject: [PATCH] libgroove: drop --- .../libraries/libgroove/default.nix | 33 ------------------- .../libgroove/no-warnings-as-errors.patch | 15 --------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 1 insertion(+), 50 deletions(-) delete mode 100644 pkgs/development/libraries/libgroove/default.nix delete mode 100644 pkgs/development/libraries/libgroove/no-warnings-as-errors.patch diff --git a/pkgs/development/libraries/libgroove/default.nix b/pkgs/development/libraries/libgroove/default.nix deleted file mode 100644 index f14524df0dc5..000000000000 --- a/pkgs/development/libraries/libgroove/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, ffmpeg_3, SDL2, chromaprint, libebur128 }: - -stdenv.mkDerivation rec { - version = "4.3.0"; - pname = "libgroove"; - - src = fetchFromGitHub { - owner = "andrewrk"; - repo = "libgroove"; - rev = version; - sha256 = "1la9d9kig50mc74bxvhx6hzqv0nrci9aqdm4k2j4q0s1nlfgxipd"; - }; - - patches = [ - ./no-warnings-as-errors.patch - (fetchpatch { - name = "update-for-ffmpeg-3.0.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/0001-update-for-ffmpeg-3.0.patch?h=libgroove&id=a9f3bd2a5afd3227733414a5d54c7a2aa0a1249e"; - sha256 = "0800drk9df1kwbv80f2ffv77xk888249fk0d961rp2a305hvyrk0"; - }) - ]; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ ffmpeg_3 SDL2 chromaprint libebur128 ]; - - meta = with lib; { - description = "Streaming audio processing library"; - homepage = "https://github.com/andrewrk/libgroove"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ andrewrk ]; - }; -} diff --git a/pkgs/development/libraries/libgroove/no-warnings-as-errors.patch b/pkgs/development/libraries/libgroove/no-warnings-as-errors.patch deleted file mode 100644 index 86a8a935769c..000000000000 --- a/pkgs/development/libraries/libgroove/no-warnings-as-errors.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a1e8541..6bc9c30 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -135,8 +135,8 @@ configure_file ( - "${PROJECT_BINARY_DIR}/config.h" - ) - --set(LIB_CFLAGS "${C99_C_FLAGS} -pedantic -Werror -Wall -Werror=strict-prototypes -Werror=old-style-definition -Werror=missing-prototypes -D_REENTRANT -D_POSIX_C_SOURCE=200809L") --set(EXAMPLE_CFLAGS "${C99_C_FLAGS} -pedantic -Werror -Wall -g") -+set(LIB_CFLAGS "${C99_C_FLAGS} -pedantic -Wall -Werror=strict-prototypes -Werror=old-style-definition -Werror=missing-prototypes -D_REENTRANT -D_POSIX_C_SOURCE=200809L") -+set(EXAMPLE_CFLAGS "${C99_C_FLAGS} -pedantic -Wall -g") - set(EXAMPLE_INCLUDES "${PROJECT_SOURCE_DIR}") - - add_library(groove SHARED ${LIBGROOVE_SOURCES} ${LIBGROOVE_HEADERS}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 83878adccd68..2c4c35a150c4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -480,6 +480,7 @@ mapAliases ({ libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25 libgpgerror = libgpg-error; # added 2021-09-04 libgumbo = gumbo; # added 2018-01-21 + libgroove = throw "libgroove has been removed, because it depends on an outdated and insecure version of ffmpeg"; # added 2022-01-21 libGL_driver = mesa.drivers; # added 2019-05-28 libintlOrEmpty = lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # added 2018-03-14 libjpeg_drop = libjpeg_original; # added 2020-06-05 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e9853a6702b..5fd11763b11a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17783,8 +17783,6 @@ with pkgs; libgringotts = callPackage ../development/libraries/libgringotts { }; - libgroove = callPackage ../development/libraries/libgroove { }; - libgrss = callPackage ../development/libraries/libgrss { }; libgweather = callPackage ../development/libraries/libgweather { };