From 4865ae3eef8833b28667b9d344b08b70f39a8985 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 12 Feb 2025 09:43:51 +0100 Subject: [PATCH] xfsprogs: fix build --- pkgs/by-name/xf/xfsprogs/package.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/by-name/xf/xfsprogs/package.nix b/pkgs/by-name/xf/xfsprogs/package.nix index 86cc97764b9f..6ff404ce7f3a 100644 --- a/pkgs/by-name/xf/xfsprogs/package.nix +++ b/pkgs/by-name/xf/xfsprogs/package.nix @@ -3,6 +3,7 @@ stdenv, buildPackages, fetchurl, + autoreconfHook, gettext, pkg-config, icu, @@ -22,6 +23,14 @@ stdenv.mkDerivation rec { hash = "sha256-CDJAckfbeRzHDe+W5+JUvW7fBD3ISoCmLzzNbj3/0yk="; }; + patches = [ + (fetchurl { + name = "icu76.patch"; + url = "https://lore.kernel.org/linux-xfs/20250212081649.3502717-1-hi@alyssa.is/raw"; + hash = "sha256-Z7BW0B+/5eHWXdHre++wRtdbU/P6XZqudYx6EK5msIU="; + }) + ]; + outputs = [ "bin" "dev" @@ -31,6 +40,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ + autoreconfHook gettext pkg-config libuuid # codegen tool uses libuuid @@ -61,6 +71,12 @@ stdenv.mkDerivation rec { patchShebangs ./install-sh ''; + # The default --force would replace xfsprogs' custom install-sh. + autoreconfFlags = [ + "--install" + "--verbose" + ]; + configureFlags = [ "--disable-lib64" "--with-systemd-unit-dir=${placeholder "out"}/lib/systemd/system"