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

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Vladimír Čunát
2017-07-05 09:53:53 +02:00
parent 7205dfadec 5328aac7be
commit 9e1c7ddaae
96 changed files with 1859 additions and 518 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/text/kdiff3/default.nix
View File

@@ -1,7 +1,7 @@
{
mkDerivation, lib, fetchgit, fetchpatch,
extra-cmake-modules, kdoctools, wrapGAppsHook,
kconfig, kinit, kparts
kcrash, kconfig, kinit, kparts
}:
mkDerivation rec {
@@ -32,7 +32,7 @@ mkDerivation rec {
nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
propagatedBuildInputs = [ kconfig kinit kparts ];
propagatedBuildInputs = [ kconfig kcrash kinit kparts ];
meta = with lib; {
homepage = http://kdiff3.sourceforge.net/;