Skip to content

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

Merged
NickCao merged 2 commits intoNixOS:stagingfrom
SuperSandro2000:pcsclite-outputs
Jan 29, 2024
Merged

pcsclite: move binaries, polkit, systemd files to out, move libraries to lib#283452
NickCao merged 2 commits intoNixOS:stagingfrom
SuperSandro2000:pcsclite-outputs

Conversation

@SuperSandro2000
Copy link
Member

@SuperSandro2000 SuperSandro2000 commented Jan 24, 2024

Description of changes

This should make the things related to the udev rules and binaries a lot simpler and more expected.

based on feedback in #280826

Closes #280826

Before:

 ▶ tree result*
 result ⇒ /nix/store/jx5yidqpzyb7x6wb24s17jssg94ifbdg-pcsclite-with-polkit-2.0.1
├──  lib
│   ├──  libpcsclite.la
│   ├──  libpcsclite.so ⇒ libpcsclite.so.1.0.0
│   ├──  libpcsclite.so.1 ⇒ libpcsclite.so.1.0.0
│   ├──  libpcsclite.so.1.0.0
│   ├──  libpcscspy.la
│   ├──  libpcscspy.so ⇒ libpcscspy.so.0.0.0
│   ├──  libpcscspy.so.0 ⇒ libpcscspy.so.0.0.0
│   └──  libpcscspy.so.0.0.0
└──  share
    └──  polkit-1
        └──  actions
            └──  org.debian.pcsc-lite.policy
 result-bin ⇒ /nix/store/m546wyabfa3pqykgy2nf8w8n29yvm1ff-pcsclite-with-polkit-2.0.1-bin
├──  bin
│   └──  pcscd
├──  lib
│   └──  systemd
│       └──  system
│           ├──  pcscd.service
│           └──  pcscd.socket
└──  sbin ⇒ bin
 result-dev ⇒ /nix/store/38rf0slm04pa8pli1my4161cxf6q93mi-pcsclite-with-polkit-2.0.1-dev
├──  bin
│   └──  pcsc-spy
├──  include
│   └──  PCSC
│       ├──  debuglog.h
│       ├──  ifdhandler.h
│       ├──  pcsclite.h
│       ├──  reader.h
│       ├──  winscard.h
│       └──  wintypes.h
├──  lib
│   └──  pkgconfig
│       └──  libpcsclite.pc
└──  nix-support
    └──  propagated-build-inputs
 result-doc ⇒ /nix/store/hddg5c5bngr3dr9z7ll6y7gg0ygpj8kf-pcsclite-with-polkit-2.0.1-doc
└──  share
    └──  doc
        └──  pcsc-lite
            ├──  install_spy.sh
            ├──  README.polkit
            └──  uninstall_spy.sh
 result-man ⇒ /nix/store/yqjd5312lbr2jar2l9cjr5mq205d543j-pcsclite-with-polkit-2.0.1-man
└──  share
    └──  man
        ├──  man1
        │   └──  pcsc-spy.1.gz
        ├──  man5
        │   └──  reader.conf.5.gz
        └──  man8
            └──  pcscd.8.gz

after

 result
├──  bin
│   └──  pcscd
├──  lib
│   └──  systemd
│       └──  system
│           ├──  pcscd.service
│           └──  pcscd.socket
├──  sbin
│   └──  pcscd
└──  share
    └──  polkit-1
        └──  actions
            └──  org.debian.pcsc-lite.policy
 result-dev
├──  bin
│   └──  pcsc-spy
├──  include
│   └──  PCSC
│       ├──  debuglog.h
│       ├──  ifdhandler.h
│       ├──  pcsclite.h
│       ├──  reader.h
│       ├──  winscard.h
│       └──  wintypes.h
├──  lib
│   └──  pkgconfig
│       └──  libpcsclite.pc
└──  nix-support
    └──  propagated-build-inputs
 result-doc
└──  share
    └──  doc
        └──  pcsc-lite
            ├──  install_spy.sh
            ├──  README.polkit
            └──  uninstall_spy.sh
 result-lib
└──  lib
    ├──  libpcsclite.la
    ├──  libpcsclite.so
    ├──  libpcsclite.so.1
    ├──  libpcsclite.so.1.0.0
    ├──  libpcscspy.la
    ├──  libpcscspy.so
    ├──  libpcscspy.so.0
    └──  libpcscspy.so.0.0.0
 result-man
└──  share
    └──  man
        ├──  man1
        │   └──  pcsc-spy.1.gz
        ├──  man5
        │   └──  reader.conf.5.gz
        └──  man8
            └──  pcscd.8.gz

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Jan 24, 2024
@ofborg ofborg bot requested a review from anthonyroussel January 24, 2024 10:21
@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Jan 24, 2024
@SuperSandro2000 SuperSandro2000 changed the base branch from master to staging January 24, 2024 11:55
@SuperSandro2000
Copy link
Member Author

I don't think I can test this on my complete nixos config due to the amounts of rebuilds :/

@SuperSandro2000 SuperSandro2000 marked this pull request as ready for review January 24, 2024 11:56
@foolnotion
Copy link
Contributor

Just tested this and my yubikey works, I believe I did build everything correctly:

result
├── bin
│   └── pcscd
├── lib
│   └── systemd
│       └── system
│           ├── pcscd.service
│           └── pcscd.socket
├── sbin -> bin
└── share
    └── polkit-1
        └── actions
            └── org.debian.pcsc-lite.policy

Merging this should fix #280826

Copy link
Member

@NickCao NickCao left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pkgs/development/tools/global-platform-pro/default.nix
1:{ lib, stdenv, fetchFromGitHub, jdk8, maven, makeWrapper, jre8_headless, pcsclite, proot, zlib }:
50:      --prefix LD_LIBRARY_PATH : "${pcsclite.out}/lib"

There is another reference require fixing.

… to lib

This should make the things related to the udev rules and binaries a lot
simpler and more expected.
Copy link
Member

@NickCao NickCao left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

diff LGTM

@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one person. label Jan 28, 2024
@ofborg ofborg bot requested a review from Ekleog January 28, 2024 21:34
@NickCao NickCao merged commit 519ebe3 into NixOS:staging Jan 29, 2024
@SuperSandro2000 SuperSandro2000 deleted the pcsclite-outputs branch January 29, 2024 12:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

pcsclite: polkit policy actions not registered

4 participants