From c8595a8bed2d2a3b164c9c2a180351fc49ab6bed Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 10 May 2025 22:18:52 +0100 Subject: [PATCH] xwax: install default importers Without the change user needs to supply their own importer and scanner. Discovered in https://github.com/NixOS/nixpkgs/pull/402378#issuecomment-2848182471 --- pkgs/by-name/xw/xwax/package.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/xw/xwax/package.nix b/pkgs/by-name/xw/xwax/package.nix index 5550e81df577..a6e4f24b80db 100644 --- a/pkgs/by-name/xw/xwax/package.nix +++ b/pkgs/by-name/xw/xwax/package.nix @@ -32,6 +32,11 @@ stdenv.mkDerivation (finalAttrs: { # therefore we patch interface.c to also look up in the dejavu_fonts nix store path substituteInPlace interface.c \ --replace-fail "/usr/X11R6/lib/X11/fonts/TTF" "${dejavu_fonts.outPath}/share/fonts/truetype/" + + # make paths to executed binaries hermetic: + substituteInPlace import \ + --replace-fail "exec cdparanoia" "exec ${lib.getExe cdparanoia}" \ + --replace-fail "exec ffmpeg" "exec ${lib.getExe ffmpeg}" ''; buildInputs = [ @@ -60,17 +65,14 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; + nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "-h"; doInstallCheck = true; - installPhase = '' - runHook preInstall - mkdir -p $out/bin - cp xwax $out/bin/xwax - runHook postInstall - ''; - meta = { homepage = "https://xwax.org"; description = "Digital vinyl on Linux";