b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

nitrokey-app: 0.5.1 -> 0.6.3 (#24219)

Browse source 
* nitrokey-app: 0.5.1 -> 0.6.3

* Fix (native)buildInputs and refactor
This commit is contained in:
Kai 2017-04-14 22:34:36 +02:00 committed by ndowens
parent 81589bff4c
commit 91d2dc00bb
2 changed files with 13 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
pkgs/tools/security/nitrokey-app/FixInstallDestination.patch
View file

@ -1,57 +1,11 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -251,23 +251,23 @@
# ${CMAKE_SOURCE_DIR}/data/icons/48x48
# ${CMAKE_SOURCE_DIR}/data/icons/128x128
${CMAKE_SOURCE_DIR}/data/icons/
- DESTINATION usr/share/icons/
+ DESTINATION share/icons/
)
install(FILES
${CMAKE_SOURCE_DIR}/data/nitrokey-app.desktop
- DESTINATION usr/share/applications
+ DESTINATION share/applications
)
install(FILES
${CMAKE_SOURCE_DIR}/data/icons/hicolor/128x128/apps/nitrokey-app.png
- DESTINATION usr/share/pixmaps
+ DESTINATION share/pixmaps
)
# Install Nitrokey udev rules
install(FILES
${CMAKE_SOURCE_DIR}/data/40-nitrokey.rules
- DESTINATION usr/lib/udev/rules.d
+ DESTINATION lib/udev/rules.d
)
@@ -273,7 +273,7 @@
# Install autocompletion scripts
@@ -278,7 +278,7 @@
install(FILES
${CMAKE_SOURCE_DIR}/po/de_DE/nitrokey-app.mo
- DESTINATION usr/share/locale/de_DE/LC_MESSAGES
+ DESTINATION share/locale/de_DE/LC_MESSAGES
${CMAKE_SOURCE_DIR}/data/bash-autocomplete/nitrokey-app
- DESTINATION /etc/bash_completion.d
+ DESTINATION etc/bash_completion.d
)
install(FILES
@@ -286,7 +286,7 @@
${CMAKE_SOURCE_DIR}/images/quit.png
${CMAKE_SOURCE_DIR}/images/safe_zahlenkreis.png
${CMAKE_SOURCE_DIR}/images/settings.png
- DESTINATION usr/share/nitrokey
+ DESTINATION share/nitrokey
)
ENDIF () # NOT WIN32
@@ -299,7 +299,7 @@
${resources_ouput}
)
-INSTALL(TARGETS nitrokey-app DESTINATION usr/bin)
+INSTALL(TARGETS nitrokey-app DESTINATION bin)
TARGET_LINK_LIBRARIES(nitrokey-app
${QT_LIBRARIES}

16
pkgs/tools/security/nitrokey-app/default.nix
View file

@ -2,27 +2,29 @@
stdenv.mkDerivation rec {
name = "nitrokey-app";
version = "0.5.1";
version = "0.6.3";
src = fetchFromGitHub {
owner = "Nitrokey";
repo = "nitrokey-app";
rev = "v${version}";
sha256 = "0acb2502r3wa0mry6h8sz1k16zaa4bgnhxwxqd1vd1y42xc6g9bw";
sha256 = "1l5l4lwxmyd3jrafw19g12sfc42nd43sv7h7i4krqxnkk6gfx11q";
};
buildInputs = [
cmake
libusb1
pkgconfig
qt5.qtbase
];
nativeBuildInputs = [
cmake
pkgconfig
];
patches = [
./FixInstallDestination.patch
./HeaderPath.patch
];
cmakeFlags = "-DHAVE_LIBAPPINDICATOR=NO";
meta = {
meta = with stdenv.lib; {
description = "Provides extra functionality for the Nitrokey Pro and Storage";
longDescription = ''
The nitrokey-app provides a QT system tray widget with wich you can
@ -31,7 +33,7 @@ stdenv.mkDerivation rec {
'';
homepage = https://github.com/Nitrokey/nitrokey-app;
repositories.git = https://github.com/Nitrokey/nitrokey-app.git;
license = stdenv.lib.licenses.gpl3;
maintainer = stdenv.lib.maintainers.kaiha;
license = licenses.gpl3;
maintainer = maintainers.kaiha;
};
}