diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2017-02-06 11:21:31 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-06 11:21:31 -0600 |
| commit | f0bbf73e0bbc01ddf51b4db563920fdc65bd9f7d (patch) | |
| tree | e0692206d2a0dfd8f331c3f90e71766a29c6e7bf /pkgs | |
| parent | 667a78f176c9700f1872f8855505920769579269 (diff) | |
| parent | 8d803b90ac81576795538b0242e68deae7145732 (diff) | |
| download | nixpkgs-f0bbf73e0bbc01ddf51b4db563920fdc65bd9f7d.tar nixpkgs-f0bbf73e0bbc01ddf51b4db563920fdc65bd9f7d.tar.gz nixpkgs-f0bbf73e0bbc01ddf51b4db563920fdc65bd9f7d.tar.bz2 nixpkgs-f0bbf73e0bbc01ddf51b4db563920fdc65bd9f7d.tar.lz nixpkgs-f0bbf73e0bbc01ddf51b4db563920fdc65bd9f7d.tar.xz nixpkgs-f0bbf73e0bbc01ddf51b4db563920fdc65bd9f7d.tar.zst nixpkgs-f0bbf73e0bbc01ddf51b4db563920fdc65bd9f7d.zip | |
Merge pull request #22477 from peterhoeg/f/kdiff3
kdiff3-qt5: init at 1.7.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/text/kdiff3/kde5.nix | 37 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 39 insertions, 0 deletions
diff --git a/pkgs/tools/text/kdiff3/kde5.nix b/pkgs/tools/text/kdiff3/kde5.nix new file mode 100644 index 00000000000..f1ae958ed63 --- /dev/null +++ b/pkgs/tools/text/kdiff3/kde5.nix @@ -0,0 +1,37 @@ +{ + kdeDerivation, kdeWrapper, lib, fetchgit, + ecm, kdoctools, kconfig, kinit, kparts +}: + +let + rev = "468652ce70b1214842cef0a021c81d056ec6aa01"; + + unwrapped = kdeDerivation rec { + name = "kdiff3-${version}"; + version = "1.7.0-${lib.strings.substring 0 7 rev}"; + + src = fetchgit { + url = "https://gitlab.com/tfischer/kdiff3"; + sha256 = "126xl7jbb26v2970ba1rw1d6clhd14p1f2avcwvj8wzqmniq5y5m"; + inherit rev; + }; + + preConfigure = "cd kdiff3"; + + nativeBuildInputs = [ ecm kdoctools ]; + + propagatedBuildInputs = [ kconfig kinit kparts ]; + + meta = with lib; { + homepage = http://kdiff3.sourceforge.net/; + license = licenses.gpl2Plus; + description = "Compares and merges 2 or 3 files or directories"; + maintainers = with maintainers; [ viric urkud peterhoeg ]; + platforms = with platforms; linux; + }; + }; + +in kdeWrapper { + inherit unwrapped; + targets = [ "bin/kdiff3" ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ea9f9e6774..d5950c36d0b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2430,6 +2430,8 @@ with pkgs; kronometer = qt5.callPackage ../tools/misc/kronometer { }; + kdiff3-qt5 = qt5.callPackage ../tools/text/kdiff3/kde5.nix { }; + peruse = qt5.callPackage ../tools/misc/peruse { }; kst = qt5.callPackage ../tools/graphics/kst { gsl = gsl_1; }; |