From 2d5ac64f89e0d497e0011f7d0ee2d71bd40e75a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 10 Feb 2018 19:52:54 +0100 Subject: [PATCH] Revert "kdeFrameworks.kdelibs4support: add patch for openssl 1.1" This reverts commit 19f770218e053cd9542ecffef0eac604707fce96. It's no longer applicable nor needed. --- .../libraries/kde-frameworks/kdelibs4support/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix b/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix index f03ae825585..7e3de9d4d14 100644 --- a/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, fetchpatch, + mkDerivation, lib, copyPathsToStore, docbook_xml_dtd_45, extra-cmake-modules, kdoctools, kauth, karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kcrash, kdbusaddons, kded, kdesignerplugin, kemoticons, kglobalaccel, kguiaddons, @@ -11,12 +11,7 @@ mkDerivation { name = "kdelibs4support"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series) ++ [ - (fetchpatch { - url = "https://raw.githubusercontent.com/OpenMandrivaAssociation/kdelibs4support/d101a02d6812ee65542ee36d0fd0f524be5c3fc1/kdelibs4support-5.32.0-openssl-1.1.patch"; - sha256 = "00jiy43hxkczmih4mirbmzbgc42sv15rnnm0kaar963s58pp6fy2"; - }) - ]; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); setupHook = ./setup-hook.sh; nativeBuildInputs = [ extra-cmake-modules qttools ]; propagatedNativeBuildInputs = [ kdoctools ];