ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-18 02:05:51 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #283452 from SuperSandro2000/pcsclite-outputs

Browse Source 
pcsclite: move binaries, polkit, systemd files to out, move libraries to lib
This commit is contained in:
Nick Cao 2024-01-28 21:19:51 -05:00 committed by GitHub
commit 519ebe37e2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 6 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}" ];
}; };
}; };
} }

2
pkgs/development/tools/global-platform-pro/default.nix
View File

@ -47,7 +47,7 @@ mavenJdk8.buildMavenPackage rec {
cp tool/target/gp.jar "$out/share/java" cp tool/target/gp.jar "$out/share/java"
makeWrapper "${jre8_headless}/bin/java" "$out/bin/gp" \ makeWrapper "${jre8_headless}/bin/java" "$out/bin/gp" \
--add-flags "-jar '$out/share/java/gp.jar'" \ --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; { meta = with lib; {

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 = [