Skip to content

xwax: install default importers#405985

Merged
pbsds merged 1 commit intoNixOS:masterfrom
trofi:xwax-fix-install
May 24, 2025
Merged

xwax: install default importers#405985
pbsds merged 1 commit intoNixOS:masterfrom
trofi:xwax-fix-install

Conversation

@trofi
Copy link
Contributor

@trofi trofi commented May 10, 2025

Without the change user needs to supply their own importer and scanner. Discovered in #402378 (comment)

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.

Comment on lines 38 to 39
Copy link
Member

Choose a reason for hiding this comment

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

Shouldn't be using lib.getExe pkg instead of ${lib.getBin pkg}/bin/...?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sounds good. Changed to:

--- a/pkgs/by-name/xw/xwax/package.nix
+++ b/pkgs/by-name/xw/xwax/package.nix
@@ -35,8 +35,8 @@ stdenv.mkDerivation (finalAttrs: {

     # make paths to executed binaries hermetic:
     substituteInPlace import \
-      --replace-fail "exec cdparanoia" "exec ${lib.getBin cdparanoia}/bin/cdparanoia" \
-      --replace-fail "exec ffmpeg" "exec ${lib.getBin ffmpeg}/bin/ffmpeg"
+      --replace-fail "exec cdparanoia" "exec ${lib.getExe cdparanoia}" \
+      --replace-fail "exec ffmpeg" "exec ${lib.getExe ffmpeg}"
   '';

   buildInputs = [

@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any 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 May 10, 2025
Without the change user needs to supply their own importer and scanner.
Discovered in NixOS#402378 (comment)
@trofi trofi force-pushed the xwax-fix-install branch from 1a12dfe to c8595a8 Compare May 10, 2025 21:30
@Sigmanificient
Copy link
Member

nixpkgs-review result

Generated using nixpkgs-review-gha

Command: nixpkgs-review pr 405985

Logs: https://github.com/Sigmanificient/nixpkgs-review-gha/actions/runs/14949331030


x86_64-linux

✅ 1 package built:
  • xwax

aarch64-linux

✅ 1 package built:
  • xwax

@Sigmanificient
Copy link
Member

Sigmanificient commented May 10, 2025

Importing/Scanning works, a but lost on how to test it further

@pbsds pbsds merged commit 3fce8ba into NixOS:master May 24, 2025
23 checks passed
@trofi trofi deleted the xwax-fix-install branch May 24, 2025 05:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 0 This PR does not cause any packages 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