From 425c8101a9e9a484a2b109cf8e3aa34ed94f7cd6 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 12 Apr 2024 21:37:39 +0200 Subject: [PATCH] lomiri.trust-store: Fix references variable in pkg-config --- pkgs/desktops/lomiri/development/trust-store/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/lomiri/development/trust-store/default.nix b/pkgs/desktops/lomiri/development/trust-store/default.nix index d797fbd8f688..fbbd8cf4ac6f 100644 --- a/pkgs/desktops/lomiri/development/trust-store/default.nix +++ b/pkgs/desktops/lomiri/development/trust-store/default.nix @@ -44,12 +44,14 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' # pkg-config patching hook expects prefix variable substituteInPlace data/trust-store.pc.in \ - --replace 'includedir=''${exec_prefix}' 'includedir=''${prefix}' + --replace-fail 'libdir=''${exec_prefix}' 'libdir=''${prefix}' \ + --replace-fail 'includedir=''${exec_prefix}' 'includedir=''${prefix}' substituteInPlace src/core/trust/terminal_agent.h \ - --replace '/bin/whiptail' '${lib.getExe' newt "whiptail"}' + --replace-fail '/bin/whiptail' '${lib.getExe' newt "whiptail"}' '' + lib.optionalString (!finalAttrs.doCheck) '' - sed -i CMakeLists.txt -e '/add_subdirectory(tests)/d' + substituteInPlace CMakeLists.txt \ + --replace-fail 'add_subdirectory(tests)' "" ''; strictDeps = true;