nitrokey-app: 0.6.3 -> 1.0

The nitrokey-app is now fetched from git because a submodule is needed
for compilation.
This commit is contained in:
Kai Harries 2017-05-05 22:15:39 +02:00 committed by Franz Pletz
parent f0c08e3cd4
commit ba002a4215
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
3 changed files with 12 additions and 35 deletions

View File

@ -1,11 +0,0 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -273,7 +273,7 @@
# Install autocompletion scripts
install(FILES
${CMAKE_SOURCE_DIR}/data/bash-autocomplete/nitrokey-app
- DESTINATION /etc/bash_completion.d
+ DESTINATION etc/bash_completion.d
)
install(FILES

View File

@ -1,13 +0,0 @@
diff --git a/src/utils/hid_libusb.c b/src/utils/hid_libusb.c
index bd8c14e..537292d 100644
--- a/src/utils/hid_libusb.c
+++ b/src/utils/hid_libusb.c
@@ -44,7 +44,7 @@
#include <wchar.h>
/* GNU / LibUSB */
-#include "libusb.h"
+#include "libusb-1.0/libusb.h"
#include "iconv.h"
#include "hidapi.h"

View File

@ -1,29 +1,30 @@
{ stdenv, cmake, fetchFromGitHub, libusb1, pkgconfig, qt5 }: { stdenv, cmake, fetchgit, hidapi, libusb1, pkgconfig, qt5 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "nitrokey-app"; name = "nitrokey-app";
version = "0.6.3"; version = "1.0";
src = fetchFromGitHub { src = fetchgit {
owner = "Nitrokey"; url = "https://github.com/Nitrokey/nitrokey-app.git";
repo = "nitrokey-app"; rev = "refs/tags/v${version}";
rev = "v${version}"; sha256 = "0i910d1xrl4bfrg5ifkj3w4dp31igaxncy2yf97y4rsc8094bcb1";
sha256 = "1l5l4lwxmyd3jrafw19g12sfc42nd43sv7h7i4krqxnkk6gfx11q";
}; };
buildInputs = [ buildInputs = [
hidapi
libusb1 libusb1
qt5.qtbase qt5.qtbase
qt5.qttranslations
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
pkgconfig pkgconfig
]; ];
patches = [
./FixInstallDestination.patch
./HeaderPath.patch
];
cmakeFlags = "-DHAVE_LIBAPPINDICATOR=NO"; cmakeFlags = "-DHAVE_LIBAPPINDICATOR=NO";
postPatch = ''
substituteInPlace CMakeLists.txt --replace 'DESTINATION ''${UDEV_MAIN_DIR}' 'DESTINATION lib/udev/rules.d'
substituteInPlace data/41-nitrokey.rules --replace 'plugdev' 'wheel'
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Provides extra functionality for the Nitrokey Pro and Storage"; description = "Provides extra functionality for the Nitrokey Pro and Storage";
longDescription = '' longDescription = ''