diff options
| author | Peter Hoeg <peter@hoeg.com> | 2022-01-28 12:11:00 +0800 |
|---|---|---|
| committer | Peter Hoeg <peter@hoeg.com> | 2022-01-28 12:11:00 +0800 |
| commit | 40057471f245e073a955020b4a1777d236b8fa9e (patch) | |
| tree | 1cbcfb846a3fd923be0692d658499b6b807324cf /pkgs/tools/text | |
| parent | 945ec499041db73043f745fad3b2a3a01e826081 (diff) | |
| download | nixpkgs-40057471f245e073a955020b4a1777d236b8fa9e.tar nixpkgs-40057471f245e073a955020b4a1777d236b8fa9e.tar.gz nixpkgs-40057471f245e073a955020b4a1777d236b8fa9e.tar.bz2 nixpkgs-40057471f245e073a955020b4a1777d236b8fa9e.tar.lz nixpkgs-40057471f245e073a955020b4a1777d236b8fa9e.tar.xz nixpkgs-40057471f245e073a955020b4a1777d236b8fa9e.tar.zst nixpkgs-40057471f245e073a955020b4a1777d236b8fa9e.zip | |
kdiff3: 1.8.5 -> 1.9.4
Diffstat (limited to 'pkgs/tools/text')
| -rw-r--r-- | pkgs/tools/text/kdiff3/default.nix | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index c230278c0a0..1362591e24c 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -1,26 +1,38 @@ -{ - mkDerivation, lib, fetchurl, - extra-cmake-modules, kdoctools, wrapGAppsHook, - kcrash, kconfig, kinit, kparts, kiconthemes +{ mkDerivation +, lib +, fetchurl +, extra-cmake-modules +, kdoctools +, wrapGAppsHook +, boost +, kcrash +, kconfig +, kinit +, kparts +, kiconthemes }: mkDerivation rec { pname = "kdiff3"; - version = "1.8.5"; + version = "1.9.4"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-vJL30E6xI/nFbb4wR69nv3FSQPqZSHrB0czypF4IVME="; + sha256 = "sha256-oTBxLO7wdN9pFCaQn8SjMrZvTD8UkKVIq1v7RjFsOFo="; }; + buildInputs = [ boost ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; propagatedBuildInputs = [ kconfig kcrash kinit kparts kiconthemes ]; + cmakeFlags = [ "-Wno-dev" ]; + meta = with lib; { + description = "Compares and merges 2 or 3 files or directories"; homepage = "https://invent.kde.org/sdk/kdiff3"; license = licenses.gpl2Plus; - description = "Compares and merges 2 or 3 files or directories"; maintainers = with maintainers; [ peterhoeg ]; platforms = with platforms; linux; }; |