movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-09 20:16:16 +03:00
Code Activity

[staging-next] xfsprogs: fix build (#381400)

Browse source
This commit is contained in:
K900 2025-02-12 11:58:27 +03:00 • committed by GitHub
commit 03c4436691
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

16
pkgs/by-name/xf/xfsprogs/package.nix
View file

@ -3,6 +3,7 @@
stdenv, stdenv,
buildPackages, buildPackages,
fetchurl, fetchurl,
autoreconfHook,
gettext, gettext,
pkg-config, pkg-config,
icu, icu,
@ -22,6 +23,14 @@ stdenv.mkDerivation rec {
hash = "sha256-CDJAckfbeRzHDe+W5+JUvW7fBD3ISoCmLzzNbj3/0yk="; 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 = [ outputs = [
"bin" "bin"
"dev" "dev"
@ -31,6 +40,7 @@ stdenv.mkDerivation rec {
depsBuildBuild = [ buildPackages.stdenv.cc ]; depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ nativeBuildInputs = [
autoreconfHook
gettext gettext
pkg-config pkg-config
libuuid # codegen tool uses libuuid libuuid # codegen tool uses libuuid
@ -61,6 +71,12 @@ stdenv.mkDerivation rec {
patchShebangs ./install-sh patchShebangs ./install-sh
''; '';
# The default --force would replace xfsprogs' custom install-sh.
autoreconfFlags = [
"--install"
"--verbose"
];
configureFlags = [ configureFlags = [
"--disable-lib64" "--disable-lib64"
"--with-systemd-unit-dir=${placeholder "out"}/lib/systemd/system" "--with-systemd-unit-dir=${placeholder "out"}/lib/systemd/system"