From 715bc56b080974f2be2bd985a0b96c95cefb3c05 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 16 Apr 2023 17:40:56 -0700 Subject: [PATCH 1/2] abiword: fix cross This commit adds `perl` to `nativeBuildInputs` of abiword, to avoid the following build failure: ``` abiword-aarch64-unknown-linux-gnu> checking for perl... no abiword-aarch64-unknown-linux-gnu> configure: error: *** perl program not found error: build of '/nix/store/v670j4pyqk5vy625gh7w0j2jla1wrz2s-abiword-aarch64-unknown-linux-gnu-3.0.5.drv' on 'ssh://root@192.168.22.102' failed: builder for '/nix/store/v670j4pyqk5vy625gh7w0j2jla1wrz2s-abiword-aarch64-unknown-linux-gnu-3.0.5.drv' failed with exit code 1 error: builder for '/nix/store/v670j4pyqk5vy625gh7w0j2jla1wrz2s-abiword-aarch64-unknown-linux-gnu-3.0.5.drv' failed with exit code 1; last 10 log lines: > checking if aarch64-unknown-linux-gnu-g++ -std=c++11 PIC flag -fPIC -DPIC works... yes > checking if aarch64-unknown-linux-gnu-g++ -std=c++11 static flag -static works... no > checking if aarch64-unknown-linux-gnu-g++ -std=c++11 supports -c -o file.o... yes > checking if aarch64-unknown-linux-gnu-g++ -std=c++11 supports -c -o file.o... (cached) yes > checking whether the aarch64-unknown-linux-gnu-g++ -std=c++11 linker (aarch64-unknown-linux-gnu-ld) supports shared libraries... yes > checking dynamic linker characteristics... (cached) GNU/Linux ld.so > checking how to hardcode library paths into programs... immediate > checking whether ln -s works... yes > checking for perl... no > configure: error: *** perl program not found For full logs, run 'nix log /nix/store/v670j4pyqk5vy625gh7w0j2jla1wrz2s-abiword-aarch64-unknown-linux-gnu-3.0.5.drv'. ``` --- pkgs/applications/office/abiword/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix index 954c50befc8a9..ab53692cf8064 100644 --- a/pkgs/applications/office/abiword/default.nix +++ b/pkgs/applications/office/abiword/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config wrapGAppsHook + perl ]; buildInputs = [ @@ -44,7 +45,6 @@ stdenv.mkDerivation rec { enchant wv libjpeg - perl boost libxslt goffice From 10d06c610fb80e724a53599b87a831f63b927866 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Mon, 17 Apr 2023 19:59:00 -0700 Subject: [PATCH 2/2] abiword: set strictDeps=true --- pkgs/applications/office/abiword/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix index ab53692cf8064..b90b23a3905a4 100644 --- a/pkgs/applications/office/abiword/default.nix +++ b/pkgs/applications/office/abiword/default.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { goffice ]; + strictDeps = true; enableParallelBuilding = true; meta = with lib; {