From 7e77aaf221b8e50c51ccf91f777d0f0e07052a73 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 18 Feb 2017 13:25:38 -0600 Subject: [PATCH] Remove kde4.kwooty - No maintainer in Nixpkgs - No upstream activity --- .../kwooty/0001-search-paths.patch | 33 ---------------- .../networking/newsreaders/kwooty/default.nix | 39 ------------------- pkgs/top-level/all-packages.nix | 1 - 3 files changed, 73 deletions(-) delete mode 100644 pkgs/applications/networking/newsreaders/kwooty/0001-search-paths.patch delete mode 100644 pkgs/applications/networking/newsreaders/kwooty/default.nix diff --git a/pkgs/applications/networking/newsreaders/kwooty/0001-search-paths.patch b/pkgs/applications/networking/newsreaders/kwooty/0001-search-paths.patch deleted file mode 100644 index 6d1d2bac409b..000000000000 --- a/pkgs/applications/networking/newsreaders/kwooty/0001-search-paths.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 6b5730e729d72c8d9242163e7061b956abee61f5 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Sat, 12 Sep 2015 16:14:10 -0500 -Subject: [PATCH] search paths - ---- - src/utilities/utility.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/utilities/utility.cpp b/src/utilities/utility.cpp -index 2e322aa..2e9e4d2 100644 ---- a/src/utilities/utility.cpp -+++ b/src/utilities/utility.cpp -@@ -299,6 +299,7 @@ QString Utility::searchExternalPrograms(const QString& programToSearch, bool& pr - - QString programPathName; - QStringList searchPathList = Settings::searchPathList(); -+ searchPathList << "/usr/bin/unpar" << "/usr/bin/unrar" << "/usr/bin/7z"; - - QStringList programsWithDifferentNames = programToSearch.split(";"); - -@@ -368,7 +369,7 @@ QStringList Utility::buildPriorityArgument(const int& processPriority, const int - QStringList niceProcessArgs; - - // look for 'nice' location : -- QString nicePath = KStandardDirs::findExe("nice"); -+ QString nicePath = QString("/usr/bin/nice"); - niceProcessArgs.append(nicePath); - niceProcessArgs.append("-n"); - --- -2.5.0 - diff --git a/pkgs/applications/networking/newsreaders/kwooty/default.nix b/pkgs/applications/networking/newsreaders/kwooty/default.nix deleted file mode 100644 index f4bd04e8a2d1..000000000000 --- a/pkgs/applications/networking/newsreaders/kwooty/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, fetchurl, cmake, qt4, gettext -, kdelibs, kdebase_workspace, perl -, openssl, phonon, automoc4 -, libX11, libXext, libXft -, unrar, p7zip, par2cmdline, coreutils -}: - -let version = "1.1.0"; - name = "kwooty-${version}"; -in stdenv.mkDerivation { - inherit name; - - src = fetchurl { - url = "https://dl.opendesktop.org/api/files/download/id/1466631747/114385-${name}.tar.gz"; - sha256 = "10a9asjv6ja1xdjli2399dyka2rbia3qdm5bdpmcng6xdsbhx3ap"; - }; - - patches = [ ./0001-search-paths.patch ]; - - postPatch = '' - echo "Changing paths to archive utilities to the nix store"; - substituteInPlace "src/utility.cpp" \ - --replace "/usr/bin/unrar" "${unrar}/bin" \ - --replace "/usr/bin/unpar" "${par2cmdline}/bin" \ - --replace "/usr/bin/7z" "${p7zip}/bin" \ - --replace "/usr/bin/nice" "${coreutils}/bin/nice" - ''; - - buildInputs = - [ stdenv perl cmake qt4 gettext automoc4 openssl - kdelibs kdebase_workspace phonon - libX11 libXext libXft - ]; - - meta = { - description = "Binary news reader of KDE"; - broken = true; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74b85117a810..7e22cd2b9c00 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16772,7 +16772,6 @@ with pkgs; zanshin = callPackage ../applications/office/zanshin { }; - kwooty = callPackage ../applications/networking/newsreaders/kwooty { }; }); in recurseIntoAttrs self;