diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-07-05 09:53:53 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-07-05 09:53:53 +0200 |
| commit | 9e1c7ddaaeeaa32cce6239ce27d4aafc4e678274 (patch) | |
| tree | f7bda821b368d3d854d19ced09a82d21a757ebad /pkgs/tools/text | |
| parent | 7205dfadec4363e0846d6c65266d92a9dddfef6a (diff) | |
| parent | 5328aac7be5b7ebf794349f915a379efd04b018b (diff) | |
| download | nixlib-9e1c7ddaaeeaa32cce6239ce27d4aafc4e678274.tar nixlib-9e1c7ddaaeeaa32cce6239ce27d4aafc4e678274.tar.gz nixlib-9e1c7ddaaeeaa32cce6239ce27d4aafc4e678274.tar.bz2 nixlib-9e1c7ddaaeeaa32cce6239ce27d4aafc4e678274.tar.lz nixlib-9e1c7ddaaeeaa32cce6239ce27d4aafc4e678274.tar.xz nixlib-9e1c7ddaaeeaa32cce6239ce27d4aafc4e678274.tar.zst nixlib-9e1c7ddaaeeaa32cce6239ce27d4aafc4e678274.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/tools/text')
| -rw-r--r-- | pkgs/tools/text/kdiff3/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index e1a2f157085f..38362333cadd 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -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/; |