diff --git a/pkgs/os-specific/linux/usbrelay/daemon.nix b/pkgs/os-specific/linux/usbrelay/daemon.nix index 7aa1c3f153b..6e4e4661fd5 100644 --- a/pkgs/os-specific/linux/usbrelay/daemon.nix +++ b/pkgs/os-specific/linux/usbrelay/daemon.nix @@ -5,7 +5,7 @@ in # This is a separate derivation, not just an additional output of # usbrelay, because otherwise, we have a cyclic dependency between # usbrelay (default.nix) and the python module (python.nix). -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "usbrelayd"; inherit (usbrelay) src version; diff --git a/pkgs/os-specific/linux/usbrelay/default.nix b/pkgs/os-specific/linux/usbrelay/default.nix index 43407f405a8..385f4da1142 100644 --- a/pkgs/os-specific/linux/usbrelay/default.nix +++ b/pkgs/os-specific/linux/usbrelay/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchFromGitHub, hidapi, installShellFiles }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "usbrelay"; version = "1.2"; src = fetchFromGitHub { owner = "darrylb123"; repo = "usbrelay"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-oJyHzbXOBKxLmPFZMS2jLF80frkiKjPJ89UwkenjIzs="; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; makeFlags = [ - "DIR_VERSION=${version}" + "DIR_VERSION=${finalAttrs.version}" "PREFIX=${placeholder "out"}" "LDCONFIG=${stdenv.cc.libc.bin}/bin/ldconfig" ]; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ wentasah ]; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/os-specific/linux/usbrelay/python.nix b/pkgs/os-specific/linux/usbrelay/python.nix index b8779894090..90838295ecb 100644 --- a/pkgs/os-specific/linux/usbrelay/python.nix +++ b/pkgs/os-specific/linux/usbrelay/python.nix @@ -1,6 +1,6 @@ { buildPythonPackage, usbrelay }: -buildPythonPackage rec { +buildPythonPackage { pname = "usbrelay_py"; inherit (usbrelay) version src;