colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pcsclite: move binaries, polkit, systemd files to out, move libraries to lib

Browse Source 
This should make the things related to the udev rules and binaries a lot
simpler and more expected.
This commit is contained in:
Sandro Jäckel 2024-01-24 10:53:04 +01:00
parent 15fcb26b3c
commit 3da096a5c3
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/services/hardware/pcscd.nix
View File

@ -46,8 +46,8 @@ in
config = mkIf config.services.pcscd.enable { config = mkIf config.services.pcscd.enable {
environment.etc."reader.conf".source = cfgFile; environment.etc."reader.conf".source = cfgFile;
environment.systemPackages = [ package.out ]; environment.systemPackages = [ package ];
systemd.packages = [ (getBin package) ]; systemd.packages = [ package ];
services.pcscd.plugins = [ pkgs.ccid ]; services.pcscd.plugins = [ pkgs.ccid ];
@ -64,7 +64,7 @@ in
# around it, we force the path to the cfgFile. # around it, we force the path to the cfgFile.
# #
# https://github.com/NixOS/nixpkgs/issues/121088 # https://github.com/NixOS/nixpkgs/issues/121088
serviceConfig.ExecStart = [ "" "${getBin package}/bin/pcscd -f -x -c ${cfgFile}" ]; serviceConfig.ExecStart = [ "" "${package}/bin/pcscd -f -x -c ${cfgFile}" ];
}; };
}; };
} }

4
pkgs/tools/security/pcsclite/default.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
inherit pname; inherit pname;
version = "2.0.1"; version = "2.0.1";
outputs = [ "bin" "out" "dev" "doc" "man" ]; outputs = [ "out" "lib" "dev" "doc" "man" ];
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "salsa.debian.org"; domain = "salsa.debian.org";
@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
(lib.enableFeature polkitSupport "polkit") (lib.enableFeature polkitSupport "polkit")
] ++ lib.optionals stdenv.isLinux [ ] ++ lib.optionals stdenv.isLinux [
"--enable-ipcdir=/run/pcscd" "--enable-ipcdir=/run/pcscd"
"--with-systemdsystemunitdir=${placeholder "bin"}/lib/systemd/system" "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
]; ];
makeFlags = [ makeFlags = [