mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 16:33:15 +00:00
Merge pull request #214251 from binarin/fix-lib3mf-pkg-config
lib3mf: fix include paths in pkg-config file
This commit is contained in:
commit
7ca42d1edb
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_INSTALL_INCLUDEDIR=${placeholder "out"}/include/lib3mf"
|
||||
"-DCMAKE_INSTALL_INCLUDEDIR=include/lib3mf"
|
||||
"-DUSE_INCLUDED_ZLIB=OFF"
|
||||
"-DUSE_INCLUDED_LIBZIP=OFF"
|
||||
"-DUSE_INCLUDED_GTEST=OFF"
|
||||
@ -30,7 +30,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postPatch = ''
|
||||
# fix libdir=''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
|
||||
sed -i 's,=''${\(exec_\)\?prefix}/,=,' lib3mf.pc.in
|
||||
sed -i 's,libdir=''${\(exec_\)\?prefix}/,libdir=,' lib3mf.pc.in
|
||||
|
||||
|
||||
# replace bundled binaries
|
||||
for i in AutomaticComponentToolkit/bin/act.*; do
|
||||
|
Loading…
Reference in New Issue
Block a user