From b46d3a271077ac928288fccc68932c6143875d9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BChlbacher?= Date: Mon, 17 Jun 2024 17:57:20 +0200 Subject: [PATCH] fix(nix): install paths from pkg-config properly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Because we were using `DESTDIR` instead of `PREFIX` for some reason, no one noticed that this didn't work. Signed-off-by: Thomas Mühlbacher --- flake.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index e4bc38eaf..f871d1871 100644 --- a/flake.nix +++ b/flake.nix @@ -76,9 +76,14 @@ inherit version; src = self; + env = { + PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; + PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; + }; + makeFlags = [ - "DESTDIR=${placeholder "out"}" - "PREFIX=" + "INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools" + "PREFIX=${placeholder "out"}" "VERSION=${version}" ];