Commit c81648b8 authored by Peter H. Hoeg's avatar Peter H. Hoeg Committed by Peter Hoeg
Browse files

kdiff3: 1.11.5 -> 1.12.2

parent ebe4301c

pkgs/tools/text/kdiff3/default.nix→pkgs/by-name/kd/kdiff3/package.nix

+10 −14
Original line number Diff line number Diff line
@@ -3,42 +3,38 @@ 
  lib,

  fetchurl,

  extra-cmake-modules,

  kdoctools,

  wrapQtAppsHook,

  boost,

  kcrash,

  kconfig,

  kinit,

  kparts,

  kiconthemes,

  kdePackages,

}:



stdenv.mkDerivation (finalAttrs: {

  pname = "kdiff3";

  version = "1.11.5";

  version = "1.12.2";



  src = fetchurl {

    url = "mirror://kde/stable/kdiff3/kdiff3-${finalAttrs.version}.tar.xz";

    hash = "sha256-Qg8Ys7lolpigXhAvikFxkEkHTaaPlslL4Y0bgpfutUU=";

    hash = "sha256-MaN8vPnUIHintIRdQqwaAzp9cjKlq66qAo9kJbufpDk=";

  };



  nativeBuildInputs = [

    extra-cmake-modules

    kdoctools

    wrapQtAppsHook

    kdePackages.kdoctools

    kdePackages.wrapQtAppsHook

  ];



  buildInputs = [

  buildInputs = with kdePackages; [

    qtbase

    boost

    kconfig

    kcrash

    kinit

    kparts

    kiconthemes

  ];



  cmakeFlags = [ "-Wno-dev" ];



  env.LANG = "C.UTF-8";



  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''

    ln -s "$out/Applications/KDE/kdiff3.app/Contents/MacOS" "$out/bin"

  '';
@@ -49,6 +45,6 @@ stdenv.mkDerivation (finalAttrs: { 
    homepage = "https://invent.kde.org/sdk/kdiff3";

    license = licenses.gpl2Plus;

    maintainers = with maintainers; [ peterhoeg ];

    platforms = with platforms; linux ++ darwin;

    inherit (kdePackages.qtbase.meta) platforms;

  };

})

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -4046,8 +4046,6 @@ with pkgs; 














  kronometer = libsForQt5.callPackage ../tools/misc/kronometer { };



























  kdiff3 = libsForQt5.callPackage ../tools/text/kdiff3 { };



























  kwalletcli = libsForQt5.callPackage ../tools/security/kwalletcli { };





























  peruse = libsForQt5.callPackage ../tools/misc/peruse { };