public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kpackage: patch for package name collisions

This commit is contained in:
Thomas Tuegel 2016-12-14 07:06:19 -06:00
parent 8faa589a90
commit 321987a1b8
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/libraries/kde-frameworks/kpackage/default.nix
View File

@ -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";
})
];
}