tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
kdiff3: 1.11.5 -> 1.12.2
Peter H. Hoeg
9 months ago
c81648b8
ebe4301c
+10
-16
2 changed files
expand all
collapse all
unified
split
pkgs
by-name
kd
kdiff3
package.nix
top-level
all-packages.nix
+10
-14
pkgs/tools/text/kdiff3/default.nix
pkgs/by-name/kd/kdiff3/package.nix
···
3
3
lib,
4
4
fetchurl,
5
5
extra-cmake-modules,
6
6
-
kdoctools,
7
7
-
wrapQtAppsHook,
8
6
boost,
9
9
-
kcrash,
10
10
-
kconfig,
11
11
-
kinit,
12
12
-
kparts,
13
13
-
kiconthemes,
7
7
+
kdePackages,
14
8
}:
15
9
16
10
stdenv.mkDerivation (finalAttrs: {
17
11
pname = "kdiff3";
18
18
-
version = "1.11.5";
12
12
+
version = "1.12.2";
19
13
20
14
src = fetchurl {
21
15
url = "mirror://kde/stable/kdiff3/kdiff3-${finalAttrs.version}.tar.xz";
22
22
-
hash = "sha256-Qg8Ys7lolpigXhAvikFxkEkHTaaPlslL4Y0bgpfutUU=";
16
16
+
hash = "sha256-MaN8vPnUIHintIRdQqwaAzp9cjKlq66qAo9kJbufpDk=";
23
17
};
24
18
25
19
nativeBuildInputs = [
26
20
extra-cmake-modules
27
27
-
kdoctools
28
28
-
wrapQtAppsHook
21
21
+
kdePackages.kdoctools
22
22
+
kdePackages.wrapQtAppsHook
29
23
];
30
24
31
31
-
buildInputs = [
25
25
+
buildInputs = with kdePackages; [
26
26
+
qtbase
32
27
boost
33
28
kconfig
34
29
kcrash
35
35
-
kinit
36
30
kparts
37
31
kiconthemes
38
32
];
39
33
40
34
cmakeFlags = [ "-Wno-dev" ];
41
35
36
36
+
env.LANG = "C.UTF-8";
37
37
+
42
38
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
43
39
ln -s "$out/Applications/KDE/kdiff3.app/Contents/MacOS" "$out/bin"
44
40
'';
···
49
45
homepage = "https://invent.kde.org/sdk/kdiff3";
50
46
license = licenses.gpl2Plus;
51
47
maintainers = with maintainers; [ peterhoeg ];
52
52
-
platforms = with platforms; linux ++ darwin;
48
48
+
inherit (kdePackages.qtbase.meta) platforms;
53
49
};
54
50
})
-2
pkgs/top-level/all-packages.nix
···
4046
4046
4047
4047
kronometer = libsForQt5.callPackage ../tools/misc/kronometer { };
4048
4048
4049
4049
-
kdiff3 = libsForQt5.callPackage ../tools/text/kdiff3 { };
4050
4050
-
4051
4049
kwalletcli = libsForQt5.callPackage ../tools/security/kwalletcli { };
4052
4050
4053
4051
peruse = libsForQt5.callPackage ../tools/misc/peruse { };