From 3897fd61eab81ada9f5da024930de41fec1d3754 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 10 Dec 2020 16:24:46 +0100 Subject: [PATCH] bomi: remove --- pkgs/applications/video/bomi/default.nix | 118 ----------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 - 3 files changed, 1 insertion(+), 122 deletions(-) delete mode 100644 pkgs/applications/video/bomi/default.nix diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix deleted file mode 100644 index d812ac488742..000000000000 --- a/pkgs/applications/video/bomi/default.nix +++ /dev/null @@ -1,118 +0,0 @@ -{ mkDerivation, config, stdenv, fetchFromGitHub -, fetchpatch, pkgconfig, perl, python, which -, libX11, libxcb, libGLU, libGL -, qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmake -, libchardet -, ffmpeg - -, mpg123 -, libass -, libdvdread -, libdvdnav -, icu -, libquvi -, alsaLib -, libvdpau, libva -, libbluray -, jackSupport ? false, jack ? null -, portaudioSupport ? false, portaudio ? null -, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null -, cddaSupport ? false, libcdda ? null -, youtubeSupport ? true, youtube-dl ? null -}: - -with stdenv.lib; - -assert jackSupport -> jack != null; -assert portaudioSupport -> portaudio != null; -assert pulseSupport -> libpulseaudio != null; -assert cddaSupport -> libcdda != null; -assert youtubeSupport -> youtube-dl != null; - -mkDerivation rec { - pname = "bomi"; - version = "0.9.11"; - - src = fetchFromGitHub { - owner = "xylosper"; - repo = "bomi"; - rev = "v${version}"; - sha256 = "0a7n46gn3n5098lxxvl3s29s8jlkzss6by9074jx94ncn9cayf2h"; - }; - - patches = [ - (fetchpatch rec { - name = "bomi-compilation-fix.patch"; - url = "https://svnweb.mageia.org/packages/cauldron/bomi/current/SOURCES/${name}?revision=995725&view=co&pathrev=995725"; - sha256 = "1dwryya5ljx35dbx6ag9d3rjjazni2mfn3vwirjdijdy6yz22jm6"; - }) - (fetchpatch rec { - name = "bomi-fix-expected-unqualified-id-before-numeric-constant-unix.patch"; - url = "https://svnweb.mageia.org/packages/cauldron/bomi/current/SOURCES/${name}?revision=995725&view=co&pathrev=995725"; - sha256 = "0n3xsrdrggimzw30gxlnrr088ndbdjqlqr46dzmfv8zan79lv5ri"; - }) - ]; - - buildInputs = with stdenv.lib; - [ libX11 - libxcb - libGLU libGL - qtbase - qtx11extras - qtdeclarative - qtquickcontrols - ffmpeg - libchardet - - mpg123 - libass - libdvdread - libdvdnav - icu - libquvi - alsaLib - libvdpau - libva - libbluray - ] - ++ optional jackSupport jack - ++ optional portaudioSupport portaudio - ++ optional pulseSupport libpulseaudio - ++ optional cddaSupport libcdda - ; - - preConfigure = '' - patchShebangs configure - ''; - - preBuild = '' - patchShebangs src/mpv/waf - patchShebangs build-mpv - ''; - - dontWrapQtApps = true; - postInstall = '' - wrapQtApp $out/bin/bomi \ - ${optionalString youtubeSupport "--prefix PATH ':' '${youtube-dl}/bin'"} - ''; - - dontUseQmakeConfigure = true; - - configureFlags = with stdenv.lib; - [ "--qmake=qmake" ] - ++ optional jackSupport "--enable-jack" - ++ optional portaudioSupport "--enable-portaudio" - ++ optional pulseSupport "--enable-pulseaudio" - ++ optional cddaSupport "--enable-cdda" - ; - - nativeBuildInputs = [ pkgconfig perl python which qttools qmake ]; - - meta = with stdenv.lib; { - description = "Powerful and easy-to-use multimedia player"; - homepage = "https://bomi-player.github.io/"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.abbradar ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8009208739a6..67f92c83a52f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -62,6 +62,7 @@ mapAliases ({ bridge_utils = bridge-utils; # added 2015-02-20 bro = zeek; # added 2019-09-29 bootchart = throw "bootchart has been removed from nixpkgs, as it is without a maintainer"; # added 2019-12-10 + bomi = throw "bomi has been removed from nixpkgs since it was broken and abandoned upstream"; # added 2020-12-10 btrfsProgs = btrfs-progs; # added 2016-01-03 bittorrentSync = throw "bittorrentSync has been deprecated by resilio-sync."; # added 2019-06-03 bittorrentSync14 = throw "bittorrentSync14 has been deprecated by resilio-sync."; # added 2019-06-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index febb6b1e8554..d764c18e6ee8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20503,10 +20503,6 @@ in bombono = callPackage ../applications/video/bombono {}; - bomi = libsForQt5.callPackage ../applications/video/bomi { - ffmpeg = ffmpeg_2; - }; - bonzomatic = callPackage ../applications/editors/bonzomatic { }; brackets = callPackage ../applications/editors/brackets { gconf = gnome2.GConf; };