Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NickCao merged 2 commits into from
Jan 29, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3da096a
pcsclite: move binaries, polkit, systemd files to out, move libraries…
SuperSandro2000 Jan 24, 2024
38b2b0f
global-platform-pro: fix path pcsclite libs
SuperSandro2000 Jan 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions nixos/modules/services/hardware/pcscd.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ in
config = mkIf config.services.pcscd.enable {
environment.etc."reader.conf".source = cfgFile;

environment.systemPackages = [ package.out ];
systemd.packages = [ (getBin package) ];
environment.systemPackages = [ package ];
systemd.packages = [ package ];

services.pcscd.plugins = [ pkgs.ccid ];

Expand All @@ -64,7 +64,7 @@ in
# around it, we force the path to the cfgFile.
#
# 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}" ];
};
};
}
2 changes: 1 addition & 1 deletion pkgs/development/tools/global-platform-pro/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ mavenJdk8.buildMavenPackage rec {
cp tool/target/gp.jar "$out/share/java"
makeWrapper "${jre8_headless}/bin/java" "$out/bin/gp" \
--add-flags "-jar '$out/share/java/gp.jar'" \
--prefix LD_LIBRARY_PATH : "${pcsclite.out}/lib"
--prefix LD_LIBRARY_PATH : "${lib.getLib pcsclite}/lib"
'';

meta = with lib; {
Expand Down
4 changes: 2 additions & 2 deletions pkgs/tools/security/pcsclite/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
inherit pname;
version = "2.0.1";

outputs = [ "bin" "out" "dev" "doc" "man" ];
outputs = [ "out" "lib" "dev" "doc" "man" ];

src = fetchFromGitLab {
domain = "salsa.debian.org";
Expand All @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
(lib.enableFeature polkitSupport "polkit")
] ++ lib.optionals stdenv.isLinux [
"--enable-ipcdir=/run/pcscd"
"--with-systemdsystemunitdir=${placeholder "bin"}/lib/systemd/system"
"--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
];

makeFlags = [
Expand Down