pyrox.dev
nitrokey-app: 0.5.1 -> 0.6.3 (#24219)
* nitrokey-app: 0.5.1 -> 0.6.3
* Fix (native)buildInputs and refactor
+4
-50
pkgs/tools/security/nitrokey-app/FixInstallDestination.patch
+4
-50
pkgs/tools/security/nitrokey-app/FixInstallDestination.patch
···
1
1
--- a/CMakeLists.txt
2
2
+++ b/CMakeLists.txt
3
-
@@ -251,23 +251,23 @@
4
-
# ${CMAKE_SOURCE_DIR}/data/icons/48x48
5
-
# ${CMAKE_SOURCE_DIR}/data/icons/128x128
6
-
${CMAKE_SOURCE_DIR}/data/icons/
7
-
- DESTINATION usr/share/icons/
8
-
+ DESTINATION share/icons/
9
-
)
10
-
11
-
install(FILES
12
-
${CMAKE_SOURCE_DIR}/data/nitrokey-app.desktop
13
-
- DESTINATION usr/share/applications
14
-
+ DESTINATION share/applications
15
-
)
16
-
17
-
install(FILES
18
-
${CMAKE_SOURCE_DIR}/data/icons/hicolor/128x128/apps/nitrokey-app.png
19
-
- DESTINATION usr/share/pixmaps
20
-
+ DESTINATION share/pixmaps
21
-
)
22
-
23
-
# Install Nitrokey udev rules
24
-
install(FILES
25
-
${CMAKE_SOURCE_DIR}/data/40-nitrokey.rules
26
-
- DESTINATION usr/lib/udev/rules.d
27
-
+ DESTINATION lib/udev/rules.d
28
-
)
29
-
3
+
@@ -273,7 +273,7 @@
30
4
# Install autocompletion scripts
31
-
@@ -278,7 +278,7 @@
32
-
33
5
install(FILES
34
-
${CMAKE_SOURCE_DIR}/po/de_DE/nitrokey-app.mo
35
-
- DESTINATION usr/share/locale/de_DE/LC_MESSAGES
36
-
+ DESTINATION share/locale/de_DE/LC_MESSAGES
6
+
${CMAKE_SOURCE_DIR}/data/bash-autocomplete/nitrokey-app
7
+
- DESTINATION /etc/bash_completion.d
8
+
+ DESTINATION etc/bash_completion.d
37
9
)
38
10
39
11
install(FILES
40
-
@@ -286,7 +286,7 @@
41
-
${CMAKE_SOURCE_DIR}/images/quit.png
42
-
${CMAKE_SOURCE_DIR}/images/safe_zahlenkreis.png
43
-
${CMAKE_SOURCE_DIR}/images/settings.png
44
-
- DESTINATION usr/share/nitrokey
45
-
+ DESTINATION share/nitrokey
46
-
)
47
-
48
-
ENDIF () # NOT WIN32
49
-
@@ -299,7 +299,7 @@
50
-
${resources_ouput}
51
-
)
52
-
53
-
-INSTALL(TARGETS nitrokey-app DESTINATION usr/bin)
54
-
+INSTALL(TARGETS nitrokey-app DESTINATION bin)
55
-
56
-
TARGET_LINK_LIBRARIES(nitrokey-app
57
-
${QT_LIBRARIES}
+9
-7
pkgs/tools/security/nitrokey-app/default.nix
+9
-7
pkgs/tools/security/nitrokey-app/default.nix
···
2
2
3
3
stdenv.mkDerivation rec {
4
4
name = "nitrokey-app";
5
-
version = "0.5.1";
5
+
version = "0.6.3";
6
6
7
7
src = fetchFromGitHub {
8
8
owner = "Nitrokey";
9
9
repo = "nitrokey-app";
10
10
rev = "v${version}";
11
-
sha256 = "0acb2502r3wa0mry6h8sz1k16zaa4bgnhxwxqd1vd1y42xc6g9bw";
11
+
sha256 = "1l5l4lwxmyd3jrafw19g12sfc42nd43sv7h7i4krqxnkk6gfx11q";
12
12
};
13
13
14
14
buildInputs = [
15
-
cmake
16
15
libusb1
17
-
pkgconfig
18
16
qt5.qtbase
19
17
];
18
+
nativeBuildInputs = [
19
+
cmake
20
+
pkgconfig
21
+
];
20
22
patches = [
21
23
./FixInstallDestination.patch
22
24
./HeaderPath.patch
23
25
];
24
26
cmakeFlags = "-DHAVE_LIBAPPINDICATOR=NO";
25
-
meta = {
27
+
meta = with stdenv.lib; {
26
28
description = "Provides extra functionality for the Nitrokey Pro and Storage";
27
29
longDescription = ''
28
30
The nitrokey-app provides a QT system tray widget with wich you can
···
31
33
'';
32
34
homepage = https://github.com/Nitrokey/nitrokey-app;
33
35
repositories.git = https://github.com/Nitrokey/nitrokey-app.git;
34
-
license = stdenv.lib.licenses.gpl3;
35
-
maintainer = stdenv.lib.maintainers.kaiha;
36
+
license = licenses.gpl3;
37
+
maintainer = maintainers.kaiha;
36
38
};
37
39
}