mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-17 07:13:23 +01:00
Merge pull request #157095 from peterhoeg/u/kdiff3
kdiff3: 1.8.5 -> 1.9.4
This commit is contained in:
commit
db551ace3e
1 changed files with 19 additions and 7 deletions
|
@ -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;
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue