summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authoradisbladis <adisbladis@gmail.com>2017-12-28 18:02:27 +0800
committerGitHub <noreply@github.com>2017-12-28 18:02:27 +0800
commitf80200e07baed022b5b9471fac86871213b54f3a (patch)
treeb83b8a949dec4f069dc02a95b6b0fcb03710f9b6 /pkgs/tools
parent4000e6b47ea0738f19acc189f7ebb7f740b03451 (diff)
parentd01f0530acae04f38c35519feaef7644adbf7b54 (diff)
downloadnixlib-f80200e07baed022b5b9471fac86871213b54f3a.tar
nixlib-f80200e07baed022b5b9471fac86871213b54f3a.tar.gz
nixlib-f80200e07baed022b5b9471fac86871213b54f3a.tar.bz2
nixlib-f80200e07baed022b5b9471fac86871213b54f3a.tar.lz
nixlib-f80200e07baed022b5b9471fac86871213b54f3a.tar.xz
nixlib-f80200e07baed022b5b9471fac86871213b54f3a.tar.zst
nixlib-f80200e07baed022b5b9471fac86871213b54f3a.zip
Merge pull request #33112 from KaiHa/nitrokey-1.2
nitrokey-app: 1.1 -> 1.2
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/security/nitrokey-app/default.nix10
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix
index 1443409c0226..1aced2cd427d 100644
--- a/pkgs/tools/security/nitrokey-app/default.nix
+++ b/pkgs/tools/security/nitrokey-app/default.nix
@@ -1,16 +1,18 @@
-{ stdenv, cmake, fetchgit, hidapi, libusb1, pkgconfig, qt5 }:
+{ stdenv, bash-completion, cmake, fetchgit, hidapi, libusb1, pkgconfig, qt5 }:
 
 stdenv.mkDerivation rec {
   name = "nitrokey-app";
-  version = "1.1";
+  version = "1.2";
 
+  # We use fetchgit instead of fetchFromGitHub because of necessary git submodules
   src = fetchgit {
     url = "https://github.com/Nitrokey/nitrokey-app.git";
     rev = "refs/tags/v${version}";
-    sha256 = "11pz1p5qgghkr5f8s2wg34zqhxk2vq465i73w1h479j88x35rdp0";
+    sha256 = "0mm6vlgxlmpahmmcn4awnfpx5rx5bj8m44cywhgxlmz012x73hzi";
   };
 
   buildInputs = [
+    bash-completion
     hidapi
     libusb1
     qt5.qtbase
@@ -20,7 +22,7 @@ stdenv.mkDerivation rec {
     cmake
     pkgconfig
   ];
-  cmakeFlags = "-DHAVE_LIBAPPINDICATOR=NO";
+  cmakeFlags = "-DCMAKE_BUILD_TYPE=Release";
 
   meta = with stdenv.lib; {
     description      = "Provides extra functionality for the Nitrokey Pro and Storage";