pyrox.dev
lsd2dsl: fix build (#373762)
+17
-9
pkgs/by-name/ls/lsd2dsl/package.nix
+17
-9
pkgs/by-name/ls/lsd2dsl/package.nix
···
2
2
lib,
3
3
stdenv,
4
4
fetchFromGitHub,
5
+
fetchpatch,
5
6
makeDesktopItem,
6
7
copyDesktopItems,
7
8
cmake,
···
15
16
qt6,
16
17
}:
17
18
18
-
stdenv.mkDerivation rec {
19
+
stdenv.mkDerivation (finalAttrs: {
19
20
pname = "lsd2dsl";
20
21
version = "0.6.0";
21
22
22
23
src = fetchFromGitHub {
23
24
owner = "nongeneric";
24
25
repo = "lsd2dsl";
25
-
rev = "v${version}";
26
+
tag = "v${finalAttrs.version}";
26
27
hash = "sha256-0UsxDNpuWpBrfjh4q3JhZnOyXhHatSa3t/cApiG2JzM=";
27
28
};
28
29
30
+
patches = [
31
+
(fetchpatch {
32
+
url = "https://github.com/nongeneric/lsd2dsl/commit/bbda5be1b76a4a44804483d00c07d79783eceb6b.patch";
33
+
hash = "sha256-7is83D1cMBArXVLe5TP7D7lUcwnTMeXjkJ+cbaH5JQk=";
34
+
})
35
+
];
36
+
29
37
postPatch = ''
30
38
substituteInPlace CMakeLists.txt --replace "-Werror" ""
31
39
'';
···
48
56
qt6.qtwebengine
49
57
];
50
58
51
-
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-int-conversion";
59
+
env.NIX_CFLAGS_COMPILE = "-Wno-int-conversion";
52
60
53
61
desktopItems = lib.singleton (makeDesktopItem {
54
62
name = "lsd2dsl";
55
63
exec = "lsd2dsl-qtgui";
56
64
desktopName = "lsd2dsl";
57
65
genericName = "lsd2dsl";
58
-
comment = meta.description;
66
+
comment = finalAttrs.meta.description;
59
67
categories = [
60
68
"Dictionary"
61
69
"FileTools"
···
67
75
install -Dm755 console/lsd2dsl gui/lsd2dsl-qtgui -t $out/bin
68
76
'';
69
77
70
-
meta = with lib; {
78
+
meta = {
71
79
homepage = "https://rcebits.com/lsd2dsl/";
72
80
description = "Lingvo dictionaries decompiler";
73
81
longDescription = ''
74
82
A decompiler for ABBYY Lingvo’s proprietary dictionaries.
75
83
'';
76
-
license = licenses.mit;
77
-
maintainers = with maintainers; [ sikmir ];
78
-
platforms = platforms.unix;
84
+
license = lib.licenses.mit;
85
+
maintainers = with lib.maintainers; [ sikmir ];
86
+
platforms = lib.platforms.unix;
79
87
};
80
-
}
88
+
})