From c4d336b239c982c11c0354ae27ceb65375261387 Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Thu, 24 Nov 2022 18:38:15 -0500 Subject: [PATCH] pkgsStatic.xstow: fix undefined reference error --- pkgs/tools/misc/xstow/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/xstow/default.nix b/pkgs/tools/misc/xstow/default.nix index 079f4e67579d..c46bef50caf2 100644 --- a/pkgs/tools/misc/xstow/default.nix +++ b/pkgs/tools/misc/xstow/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, ncurses }: +{ stdenv, lib, fetchurl, ncurses, autoreconfHook }: stdenv.mkDerivation rec { pname = "xstow"; version = "1.1.0"; @@ -8,6 +8,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-wXQ5XSmogAt1torfarrqIU4nBYj69MGM/HBYqeIE+dw="; }; + nativeBuildInputs = [ autoreconfHook ]; + + # Upstream seems to try to support building both static and dynamic version + # of executable on dynamic systems, but fails with link error when attempting + # to cross-build "xstow-static" to the system where "xstow" proper is static. + postPatch = lib.optionalString stdenv.hostPlatform.isStatic '' + substituteInPlace src/Makefile.am --replace xstow-static "" + substituteInPlace src/Makefile.am --replace xstow-stow "" + ''; + buildInputs = [ ncurses ];