From fac85fd1fccae52b528c0ed8cc04b6c404ae6e38 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 2 Jan 2025 10:48:35 +0100 Subject: [PATCH] vectorscan: fix pkg-config --- pkgs/by-name/hy/hyperscan/package.nix | 4 ++-- pkgs/by-name/ve/vectorscan/package.nix | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hy/hyperscan/package.nix b/pkgs/by-name/hy/hyperscan/package.nix index b9ba8e7b8dda..bce1ead253fd 100644 --- a/pkgs/by-name/hy/hyperscan/package.nix +++ b/pkgs/by-name/hy/hyperscan/package.nix @@ -56,8 +56,8 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' sed -i '/examples/d' CMakeLists.txt substituteInPlace libhs.pc.in \ - --replace "libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@" "libdir=@CMAKE_INSTALL_LIBDIR@" \ - --replace "includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@" "includedir=@CMAKE_INSTALL_INCLUDEDIR@" + --replace-fail "libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@" "libdir=@CMAKE_INSTALL_LIBDIR@" \ + --replace-fail "includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@" "includedir=@CMAKE_INSTALL_INCLUDEDIR@" ''; doCheck = true; diff --git a/pkgs/by-name/ve/vectorscan/package.nix b/pkgs/by-name/ve/vectorscan/package.nix index 7ac93806d006..e2554d526f25 100644 --- a/pkgs/by-name/ve/vectorscan/package.nix +++ b/pkgs/by-name/ve/vectorscan/package.nix @@ -24,6 +24,10 @@ stdenv.mkDerivation rec { }; postPatch = '' + sed -i '/examples/d' CMakeLists.txt + substituteInPlace libhs.pc.in \ + --replace-fail "libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@" "libdir=@CMAKE_INSTALL_LIBDIR@" \ + --replace-fail "includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@" "includedir=@CMAKE_INSTALL_INCLUDEDIR@" substituteInPlace cmake/build_wrapper.sh \ --replace-fail 'nm' '${stdenv.cc.targetPrefix}nm' \ --replace-fail 'objcopy' '${stdenv.cc.targetPrefix}objcopy'