diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2021-01-19 19:20:35 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-19 19:20:35 +0100 |
commit | f591395492104572d815cc2a7806245fe0e2aa15 (patch) | |
tree | f3c8683f6f5b7680037c927142d36dfc3c0d7728 /pkgs/tools | |
parent | 337475b19928203eac8f7a1eded5f3aeef232134 (diff) | |
parent | 991aba30f81235c0d8221c069a9ff20bdbf6c904 (diff) |
Merge pull request #108319 from KaiHa/pr/nitrokey-app-1.4.2
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/security/nitrokey-app/default.nix | 9 | ||||
-rw-r--r-- | pkgs/tools/security/nitrokey-app/udev-rules.nix | 9 |
2 files changed, 4 insertions, 14 deletions
diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix index c3aebc782d8a5..bc7731a0a7aa8 100644 --- a/pkgs/tools/security/nitrokey-app/default.nix +++ b/pkgs/tools/security/nitrokey-app/default.nix @@ -3,21 +3,16 @@ stdenv.mkDerivation rec { pname = "nitrokey-app"; - version = "1.3.2"; + version = "1.4.2"; src = fetchFromGitHub { owner = "Nitrokey"; repo = "nitrokey-app"; rev = "v${version}"; - sha256 = "193kzlz3qn9il56h78faiqkgv749hdils1nn1iw6g3wphgx5fjs2"; + sha256 = "1k0w921hfrya4q2r7bqn7kgmwvwb7c15k9ymlbnksmfc9yyjyfcv"; fetchSubmodules = true; }; - postPatch = '' - substituteInPlace libnitrokey/CMakeLists.txt \ - --replace '/data/41-nitrokey.rules' '/libnitrokey/data/41-nitrokey.rules' - ''; - buildInputs = [ bash-completion hidapi diff --git a/pkgs/tools/security/nitrokey-app/udev-rules.nix b/pkgs/tools/security/nitrokey-app/udev-rules.nix index a8143ae6925ca..11dcd63d77616 100644 --- a/pkgs/tools/security/nitrokey-app/udev-rules.nix +++ b/pkgs/tools/security/nitrokey-app/udev-rules.nix @@ -1,6 +1,5 @@ -{ lib, stdenv, nitrokey-app -, group ? "nitrokey" -}: +{ lib, stdenv, nitrokey-app }: + stdenv.mkDerivation { name = "nitrokey-udev-rules-${lib.getVersion nitrokey-app}"; @@ -9,10 +8,6 @@ stdenv.mkDerivation { dontBuild = true; - patchPhase = '' - substituteInPlace libnitrokey/data/41-nitrokey.rules --replace plugdev "${group}" - ''; - installPhase = '' mkdir -p $out/etc/udev/rules.d cp libnitrokey/data/41-nitrokey.rules $out/etc/udev/rules.d |