nitrokey-app: 1.3.2 -> 1.4.2

The optional argument group was removed because it is no longer used
in the udev-rules that come with the libnitrokey.
This commit is contained in:
Kai Harries 2021-01-03 13:03:19 +01:00
parent f9ced01f4a
commit d27be236f1
2 changed files with 4 additions and 14 deletions

View file

@ -3,21 +3,16 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "nitrokey-app"; pname = "nitrokey-app";
version = "1.3.2"; version = "1.4.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Nitrokey"; owner = "Nitrokey";
repo = "nitrokey-app"; repo = "nitrokey-app";
rev = "v${version}"; rev = "v${version}";
sha256 = "193kzlz3qn9il56h78faiqkgv749hdils1nn1iw6g3wphgx5fjs2"; sha256 = "1k0w921hfrya4q2r7bqn7kgmwvwb7c15k9ymlbnksmfc9yyjyfcv";
fetchSubmodules = true; fetchSubmodules = true;
}; };
postPatch = ''
substituteInPlace libnitrokey/CMakeLists.txt \
--replace '/data/41-nitrokey.rules' '/libnitrokey/data/41-nitrokey.rules'
'';
buildInputs = [ buildInputs = [
bash-completion bash-completion
hidapi hidapi

View file

@ -1,6 +1,5 @@
{ lib, stdenv, nitrokey-app { lib, stdenv, nitrokey-app }:
, group ? "nitrokey"
}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "nitrokey-udev-rules-${lib.getVersion nitrokey-app}"; name = "nitrokey-udev-rules-${lib.getVersion nitrokey-app}";
@ -9,10 +8,6 @@ stdenv.mkDerivation {
dontBuild = true; dontBuild = true;
patchPhase = ''
substituteInPlace libnitrokey/data/41-nitrokey.rules --replace plugdev "${group}"
'';
installPhase = '' installPhase = ''
mkdir -p $out/etc/udev/rules.d mkdir -p $out/etc/udev/rules.d
cp libnitrokey/data/41-nitrokey.rules $out/etc/udev/rules.d cp libnitrokey/data/41-nitrokey.rules $out/etc/udev/rules.d