Skip to content

openct: unbreak, modernize#396964

Merged
FliegendeWurst merged 1 commit intoNixOS:masterfrom
0xda157:fix-openct
Apr 8, 2025
Merged

openct: unbreak, modernize#396964
FliegendeWurst merged 1 commit intoNixOS:masterfrom
0xda157:fix-openct

Conversation

@0xda157
Copy link
Copy Markdown
Contributor

@0xda157 0xda157 commented Apr 8, 2025

#388196

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 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 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Apr 8, 2025
Comment thread pkgs/by-name/op/openct/package.nix Outdated
Comment thread pkgs/by-name/op/openct/package.nix Outdated
@haylinmoore
Copy link
Copy Markdown
Contributor

nixpkgs-review result

Generated using nixpkgs-review-gha

Command: nixpkgs-review pr 396964

Logs: https://github.com/haylinmoore/nixpkgs-review-gha/actions/runs/14323559050


x86_64-linux

✅ 1 package built:
  • openct

aarch64-linux

✅ 1 package built:
  • openct

@FliegendeWurst
Copy link
Copy Markdown
Member

Might as well fix the build inputs while we are here:

diff --git a/pkgs/by-name/op/openct/package.nix b/pkgs/by-name/op/openct/package.nix
index 2b25bf2614c5..1f222be31c3e 100644
--- a/pkgs/by-name/op/openct/package.nix
+++ b/pkgs/by-name/op/openct/package.nix
@@ -5,6 +5,7 @@
   autoreconfHook,
   pkg-config,
   pcsclite,
+  libtool,
   libusb-compat-0_1,
   doxygen,
   libxslt,
@@ -35,14 +36,16 @@ stdenv.mkDerivation rec {

   nativeBuildInputs = [
     autoreconfHook
+    doxygen
+    libxslt # xsltproc
     pkg-config
   ];
   buildInputs = [
     pcsclite
+    libtool # libltdl
     libusb-compat-0_1
-    doxygen
-    libxslt
   ];
+  strictDeps = true;

   preInstall = ''
     mkdir -p $out/etc

Comment thread pkgs/by-name/op/openct/package.nix Outdated
@FliegendeWurst FliegendeWurst merged commit aff3966 into NixOS:master Apr 8, 2025
24 of 27 checks passed
@0xda157 0xda157 deleted the fix-openct branch April 8, 2025 17:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants