Merge pull request #181540 from Artturin/rpathfixes2

treewide: fix fallout from 'cmake/setup-hook.sh: Don't skip build-RPATH'
This commit is contained in:
Sandro 2022-07-15 12:11:01 +02:00 committed by GitHub
commit 0405b0fa87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 37 additions and 1 deletions

View File

@ -17,5 +17,10 @@ stdenv.mkDerivation {
cp -v vc4emul/vc4emul $out/bin/vc4emul
'';
cmakeFlags = [
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
"-DCMAKE_SKIP_BUILD_RPATH=ON"
];
meta.license = lib.licenses.mit;
}

View File

@ -29,6 +29,8 @@ mkDerivation rec {
"-DGTEST_ROOT=${gtest.src}/googletest"
"-DQT_TRANSLATIONS_DIR=${qttranslations}/translations"
"-DDFU_UTIL_PATH=${dfu-util}/bin/dfu-util"
# file RPATH_CHANGE could not write new RPATH
"-DCMAKE_SKIP_BUILD_RPATH=ON"
];
meta = with lib; {

View File

@ -31,6 +31,9 @@ mkDerivation rec {
# XXX I would prefer to include these here, though we will need to file a bug upstream to get that changed.
#"-DDFU_UTIL_PATH=${dfu-util}/bin/dfu-util"
#"-DAVRDUDE_PATH=${avrdude}/bin/avrdude"
# file RPATH_CHANGE could not write new RPATH
"-DCMAKE_SKIP_BUILD_RPATH=ON"
];
meta = with lib; {

View File

@ -47,6 +47,9 @@ let
"-DBUILD_STATIC=OFF"
"-DJAVA=${boolToCmake includeJava}"
"-DGPL=${boolToCmake includeGplCode}"
# file RPATH_CHANGE could not write new RPATH
"-DCMAKE_SKIP_BUILD_RPATH=ON"
];
postInstall = optionalString includeJava ''

View File

@ -65,6 +65,9 @@ stdenv.mkDerivation rec {
"-Denable_compile_warnings=off"
"-Denable_compile_optimizations=${optionOnOff optimize}"
"-Denable_lto=${optionOnOff optimize}"
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
"-DCMAKE_SKIP_BUILD_RPATH=ON"
];
makeFlags = optional debug "VERBOSE=1";

View File

@ -147,6 +147,9 @@ stdenv.mkDerivation rec {
"-DOPTION_INSTALL_HTML_DOCUMENTATION=${onOff withDocs}"
"-DOPTION_INSTALL_PDF_DOCUMENTATION=OFF"
"-DOPTION_INCLUDE_DRIVER_DOCUMENTATION=${onOff withDocs}"
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
"-DCMAKE_SKIP_BUILD_RPATH=ON"
];
preBuild = lib.optionalString (withCairo && withShared && stdenv.hostPlatform.isDarwin) ''

View File

@ -24,6 +24,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [ libxml2 freetype librevenge libvisio libwmf libemf2svg ];
cmakeFlags = [
# file RPATH_CHANGE could not write new RPATH
"-DCMAKE_SKIP_BUILD_RPATH=ON"
];
meta = with lib; {
description = "Library and tools to convert Microsoft Visio documents (VSS and VSD) to SVG";
homepage = "https://github.com/kakwa/libvisio2svg";

View File

@ -37,6 +37,9 @@ stdenv.mkDerivation rec {
"-DOPENHMD_EXAMPLE_SIMPLE=${examplesOnOff}"
"-DOPENHMD_EXAMPLE_SDL=${examplesOnOff}"
"-DOpenGL_GL_PREFERENCE=GLVND"
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
"-DCMAKE_SKIP_BUILD_RPATH=ON"
];
postInstall = lib.optionalString withExamples ''

View File

@ -18,6 +18,9 @@ stdenv.mkDerivation rec {
"-DUSE_PCAP=1"
"-DUSE_SSL=1"
"-DUSE_SCTP=${if stdenv.isLinux then "1" else "0"}"
# file RPATH_CHANGE could not write new RPATH
"-DCMAKE_SKIP_BUILD_RPATH=ON"
];
enableParallelBuilding = true;

View File

@ -47,6 +47,9 @@ stdenv.mkDerivation rec {
"-DWITH_CURL=ON"
"-DWITH_CLIENT_WMS=ON"
"-DWITH_CLIENT_WFS=ON"
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
"-DCMAKE_SKIP_BUILD_RPATH=ON"
] ++ lib.optional withPython "-DWITH_PYTHON=ON";
meta = with lib; {

View File

@ -20,7 +20,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake asciidoc xmlto docbook_xml_dtd_45
docbook_xsl libxslt ];
cmakeFlags = [ "-DWITH_STATIC=OFF" "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON" ];
cmakeFlags = [ "-DWITH_STATIC=OFF" "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON"
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
"-DCMAKE_SKIP_BUILD_RPATH=ON"
];
postInstall = ''
cp lib/* $out/lib