From 321987a1b80f02e80437fcd0541dd3d582e6222e Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 14 Dec 2016 07:06:19 -0600 Subject: [PATCH] kpackage: patch for package name collisions --- .../kde-frameworks/kpackage/default.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix index 76ab7dbe013a..c3b89a05d198 100644 --- a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix @@ -1,4 +1,4 @@ -{ kdeFramework, lib, copyPathsToStore +{ kdeFramework, fetchurl, lib, copyPathsToStore , ecm , karchive , kconfig @@ -12,5 +12,18 @@ kdeFramework { meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ ecm kdoctools ]; propagatedBuildInputs = [ karchive kconfig kcoreaddons ki18n ]; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + patches = + copyPathsToStore (lib.readPathsFromFile ./. ./series) + ++ [ + (fetchurl { + url = "https://cgit.kde.org/kpackage.git/patch/?id=26e59d58438cc777873a6afc7817418ec735aaa3"; + sha256 = "05ad3awdq8cz1bmnhnf1lapvm70z5qc8sbdzrcgxlka7wzdbm5lw"; + name = "fix-cmake-failure-package-id-collision.patch"; + }) + (fetchurl { + url = "https://cgit.kde.org/kpackage.git/patch/?id=17915200921836d61266ad93dd6c3b87db1dc9e4"; + sha256 = "07irfx297lf39cyrv10i3q4z04fr8msm6pcp8mcwvss4gih05b74"; + name = "fix-cmake-failure-package-id-collision.patch"; + }) + ]; }