git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #108319 from KaiHa/pr/nitrokey-app-1.4.2
commitf591395492104572d815cc2a7806245fe0e2aa15 authorSandro <sandro.jaeckel@gmail.com> dateTue 19 Jan 2021, 19:20 (6 years ago) parent337475b991aba3
3 files changed+5−29
nixos/modules/hardware/nitrokey.nix+1−15 pkgs/tools/security/nitrokey-app/default.nix+2−7 pkgs/tools/security/nitrokey-app/udev-rules.nix+2−7
nixos/modules/hardware/nitrokey.nix+1−15
@@ -19,23 +19,9 @@ in
1919 nitrokey-app package, depending on your device and needs.
2020 '';
2121 };
22−
23− group = mkOption {
24− type = types.str;
25− default = "nitrokey";
26− example = "wheel";
27− description = ''
28− Grant access to Nitrokey devices to users in this group.
29− '';
30− };
3122 };
3223
3324 config = mkIf cfg.enable {
34− services.udev.packages = [
35− (pkgs.nitrokey-udev-rules.override (attrs:
36− { inherit (cfg) group; }
37− ))
38− ];
39− users.groups.${cfg.group} = {};
25+ services.udev.packages = [ pkgs.nitrokey-udev-rules ];
4026 };
4127}
pkgs/tools/security/nitrokey-app/default.nix+2−7
@@ -3,21 +3,16 @@
33
44stdenv.mkDerivation rec {
55 pname = "nitrokey-app";
6− version = "1.3.2";
6+ version = "1.4.2";
77
88 src = fetchFromGitHub {
99 owner = "Nitrokey";
1010 repo = "nitrokey-app";
1111 rev = "v${version}";
12− sha256 = "193kzlz3qn9il56h78faiqkgv749hdils1nn1iw6g3wphgx5fjs2";
12+ sha256 = "1k0w921hfrya4q2r7bqn7kgmwvwb7c15k9ymlbnksmfc9yyjyfcv";
1313 fetchSubmodules = true;
1414 };
1515
16− postPatch = ''
17− substituteInPlace libnitrokey/CMakeLists.txt \
18− --replace '/data/41-nitrokey.rules' '/libnitrokey/data/41-nitrokey.rules'
19− '';
20−
2116 buildInputs = [
2217 bash-completion
2318 hidapi
pkgs/tools/security/nitrokey-app/udev-rules.nix+2−7
@@ -1,6 +1,5 @@
1−{ lib, stdenv, nitrokey-app
2−, group ? "nitrokey"
3−}:
1+{ lib, stdenv, nitrokey-app }:
2+
43
54stdenv.mkDerivation {
65 name = "nitrokey-udev-rules-${lib.getVersion nitrokey-app}";
@@ -9,10 +8,6 @@ stdenv.mkDerivation {
98
109 dontBuild = true;
1110
12− patchPhase = ''
13− substituteInPlace libnitrokey/data/41-nitrokey.rules --replace plugdev "${group}"
14− '';
15−
1611 installPhase = ''
1712 mkdir -p $out/etc/udev/rules.d
1813 cp libnitrokey/data/41-nitrokey.rules $out/etc/udev/rules.d