From cddf3efbe92e4a17a99aa7bab3e1fb71eadb670e Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman <145775305+xokdvium@users.noreply.github.com> Date: Fri, 7 Feb 2025 11:01:24 +0300 Subject: [PATCH 1/2] liborcus: fix and enable strictDeps --- pkgs/by-name/li/liborcus/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/li/liborcus/package.nix b/pkgs/by-name/li/liborcus/package.nix index 4e3a48d10b8b..2a4a0910caa9 100644 --- a/pkgs/by-name/li/liborcus/package.nix +++ b/pkgs/by-name/li/liborcus/package.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config + python3.pythonOnBuildForHost ]; buildInputs = [ @@ -35,6 +36,8 @@ stdenv.mkDerivation rec { zlib ]; + strictDeps = true; + meta = with lib; { description = "Collection of parsers and import filters for spreadsheet documents"; homepage = "https://gitlab.com/orcus/orcus"; From ee6ca62b12becac9ae0fff31689a889c92ea7885 Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman <145775305+xokdvium@users.noreply.github.com> Date: Fri, 7 Feb 2025 11:16:44 +0300 Subject: [PATCH 2/2] liborcus: enable tests and parallel builds --- pkgs/by-name/li/liborcus/package.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/by-name/li/liborcus/package.nix b/pkgs/by-name/li/liborcus/package.nix index 2a4a0910caa9..d50b469fc91e 100644 --- a/pkgs/by-name/li/liborcus/package.nix +++ b/pkgs/by-name/li/liborcus/package.nix @@ -36,7 +36,25 @@ stdenv.mkDerivation rec { zlib ]; + preCheck = + '' + patchShebangs test/python + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}${ + lib.concatMapStringsSep ":" (d: "$(pwd)/src/${d}/.libs") [ + "liborcus" + "parser" + "python" + "spreadsheet" + ] + } + ''; + strictDeps = true; + doCheck = true; + enableParallelBuilding = true; + enableParallelChecking = true; meta = with lib; { description = "Collection of parsers and import filters for spreadsheet documents";