From 301e9a34a1728bf4dbcf994f98df202af41baad7 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 14 Apr 2025 15:58:54 +0200 Subject: [PATCH] pkgsStatic.bcachefs-tools: fix build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In pkgsStatic, there is no systemd.pc or udev.pc, so running make without setting these variables will fail. There's not really any reason to only set them for installing anyway — in general it's best to set variables like this for all phases to minimize the risk of a mismatch between build and install behaviour. --- pkgs/by-name/bc/bcachefs-tools/package.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/bc/bcachefs-tools/package.nix b/pkgs/by-name/bc/bcachefs-tools/package.nix index 2c1ac93181b4..1963233ec231 100644 --- a/pkgs/by-name/bc/bcachefs-tools/package.nix +++ b/pkgs/by-name/bc/bcachefs-tools/package.nix @@ -70,6 +70,10 @@ stdenv.mkDerivation (finalAttrs: { "PREFIX=${placeholder "out"}" "VERSION=${finalAttrs.version}" "INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools" + + # Tries to install to the 'systemd-minimal' and 'udev' nix installation paths + "PKGCONFIG_SERVICEDIR=$(out)/lib/systemd/system" + "PKGCONFIG_UDEVDIR=$(out)/lib/udev" ] ++ lib.optional fuseSupport "BCACHEFS_FUSE=1"; env = { @@ -90,12 +94,6 @@ stdenv.mkDerivation (finalAttrs: { ''; checkFlags = [ "BCACHEFS_TEST_USE_VALGRIND=no" ]; - # Tries to install to the 'systemd-minimal' and 'udev' nix installation paths - installFlags = [ - "PKGCONFIG_SERVICEDIR=$(out)/lib/systemd/system" - "PKGCONFIG_UDEVDIR=$(out)/lib/udev" - ]; - postInstall = '' substituteInPlace $out/libexec/bcachefsck_all \