b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

treewide: Stop setting CMAKE_SKIP_BUILD_RPATH=OFF

Browse source 
This is now the new default and thus doesn't need to be set manually
anymore.
This commit is contained in:
Josef Kemetmüller 2021-01-05 17:52:10 +01:00 committed by Artturin
parent f7414e2b3a
commit 1ca04aa9f1
36 changed files with 9 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/applications/gis/qgis/unwrapped-ltr.nix
View file

@ -128,7 +128,6 @@ in mkDerivation rec {
'';
cmakeFlags = [
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
"-DWITH_3D=True"
"-DWITH_PDAL=TRUE"
"-DPYQT5_SIP_DIR=${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings"

1
pkgs/applications/gis/qgis/unwrapped.nix
View file

@ -128,7 +128,6 @@ in mkDerivation rec {
'';
cmakeFlags = [
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
"-DWITH_3D=True"
"-DWITH_PDAL=TRUE"
"-DPYQT5_SIP_DIR=${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings"

4
pkgs/applications/kde/dolphin.nix
View file

@ -27,8 +27,4 @@ mkDerivation {
wayland qtwayland
];
outputs = [ "out" "dev" ];
# We need the RPATH for linking, because the `libkdeinit5_dolphin.so` links
# private against its dependencies and without the correct RPATH, these
# dependencies are not found.
cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" ];
}

1
pkgs/applications/science/machine-learning/shogun/default.nix
View file

@ -134,7 +134,6 @@ stdenv.mkDerivation rec {
"-DCMAKE_DISABLE_FIND_PACKAGE_Mosek=ON"
"-DCMAKE_DISABLE_FIND_PACKAGE_TFLogger=ON"
"-DCMAKE_DISABLE_FIND_PACKAGE_ViennaCL=ON"
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
"-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;TrainedModelSerialization'" # Sporadic segfault
"-DENABLE_TESTING=${enableIf doCheck}"
"-DDISABLE_META_INTEGRATION_TESTS=ON"

1
pkgs/desktops/gnome/core/evolution-data-server/default.nix
View file

@ -119,7 +119,6 @@ stdenv.mkDerivation rec {
"-DENABLE_UOA=OFF"
"-DENABLE_VALA_BINDINGS=ON"
"-DENABLE_INTROSPECTION=ON"
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
"-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include"
"-DWITH_PHONENUMBER=ON"
"-DWITH_GWEATHER4=ON"

1
pkgs/desktops/plasma-5/kwin/default.nix
View file

@ -61,7 +61,6 @@ mkDerivation {
CXXFLAGS = [
''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"''
];
cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" ];
postInstall = ''
# Some package(s) refer to these service types by the wrong name.
# I would prefer to patch those packages, but I cannot find them!

1
pkgs/development/libraries/arrow-cpp/default.nix
View file

@ -204,7 +204,6 @@ stdenv.mkDerivation rec {
] ++ lib.optionals (!enableShared) [
"-DARROW_TEST_LINKAGE=static"
] ++ lib.optionals stdenv.isDarwin [
"-DCMAKE_SKIP_BUILD_RPATH=OFF" # needed for tests
"-DCMAKE_INSTALL_RPATH=@loader_path/../lib" # needed for tools executables
] ++ lib.optional (!stdenv.isx86_64) "-DARROW_USE_SIMD=OFF"
++ lib.optional enableS3 "-DAWSSDK_CORE_HEADER_FILE=${aws-sdk-cpp}/include/aws/core/Aws.h";

3
pkgs/development/libraries/audio/libkeyfinder/default.nix
View file

@ -11,9 +11,6 @@ stdenv.mkDerivation rec {
sha256 = "sha256-7w/Wc9ncLinbnM2q3yv5DBtFoJFAM2e9xAUTsqvE9mg=";
};
# needed for finding libkeyfinder.so to link it into keyfinder-tests executable
cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" ];
nativeBuildInputs = [ cmake ];
buildInputs = [ fftw ];

1
pkgs/development/libraries/aws-c-auth/default.nix
View file

@ -39,7 +39,6 @@ stdenv.mkDerivation rec {
];
cmakeFlags = [
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
"-DBUILD_SHARED_LIBS=ON"
];

1
pkgs/development/libraries/aws-c-common/default.nix
View file

@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON"
"-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests
] ++ lib.optionals stdenv.hostPlatform.isRiscV [
"-DCMAKE_C_FLAGS=-fasynchronous-unwind-tables"
];

1
pkgs/development/libraries/aws-c-compression/default.nix
View file

@ -24,7 +24,6 @@ stdenv.mkDerivation rec {
];
cmakeFlags = [
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
"-DBUILD_SHARED_LIBS=ON"
];

1
pkgs/development/libraries/aws-c-http/default.nix
View file

@ -32,7 +32,6 @@ stdenv.mkDerivation rec {
];
cmakeFlags = [
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
"-DBUILD_SHARED_LIBS=ON"
];

1
pkgs/development/libraries/aws-c-mqtt/default.nix
View file

@ -34,7 +34,6 @@ stdenv.mkDerivation rec {
];
cmakeFlags = [
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
"-DBUILD_SHARED_LIBS=ON"
];

1
pkgs/development/libraries/aws-c-s3/default.nix
View file

@ -38,7 +38,6 @@ stdenv.mkDerivation rec {
];
cmakeFlags = [
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
"-DBUILD_SHARED_LIBS=ON"
];

1
pkgs/development/libraries/aws-c-sdkutils/default.nix
View file

@ -24,7 +24,6 @@ stdenv.mkDerivation rec {
];
cmakeFlags = [
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
"-DBUILD_SHARED_LIBS=ON"
];

1
pkgs/development/libraries/aws-crt-cpp/default.nix
View file

@ -67,7 +67,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DBUILD_DEPS=OFF"
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
"-DBUILD_SHARED_LIBS=ON"
];

1
pkgs/development/libraries/aws-sdk-cpp/default.nix
View file

@ -85,7 +85,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DBUILD_DEPS=OFF"
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
] ++ lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0"
++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
"-DENABLE_TESTING=OFF"

2
pkgs/development/libraries/crc32c/default.nix
View file

@ -29,8 +29,6 @@ stdenv.mkDerivation rec {
"-DCRC32C_BUILD_BENCHMARKS=0"
"-DCRC32C_USE_GLOG=0"
"-DBUILD_SHARED_LIBS=${if staticOnly then "0" else "1"}"
] ++ lib.optionals stdenv.isDarwin [
"-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests
];
doCheck = false;

7
pkgs/development/libraries/fcppt/default.nix
View file

@ -13,7 +13,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [ boost catch2 metal ];
cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=false" "-DENABLE_BOOST=true" "-DENABLE_EXAMPLES=true" "-DENABLE_CATCH=true" "-DENABLE_TEST=true" ];
cmakeFlags = [
"-DENABLE_BOOST=true"
"-DENABLE_EXAMPLES=true"
"-DENABLE_CATCH=true"
"-DENABLE_TEST=true"
];
meta = with lib; {
description = "Freundlich's C++ toolkit";

1
pkgs/development/libraries/fmt/default.nix
View file

@ -23,7 +23,6 @@ let
cmakeFlags = [
"-DBUILD_SHARED_LIBS=${if enableShared then "ON" else "OFF"}"
"-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests
];
doCheck = true;

3
pkgs/development/libraries/glog/default.nix
View file

@ -17,9 +17,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON"
# Mak CMake place RPATHs such that tests will find the built libraries.
# See https://github.com/NixOS/nixpkgs/pull/144561#discussion_r742468811 and https://github.com/NixOS/nixpkgs/pull/108496
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
];
# TODO: Re-enable Darwin tests once we're on a release that has https://github.com/google/glog/issues/709#issuecomment-960381653 fixed

1
pkgs/development/libraries/grpc/default.nix
View file

@ -61,7 +61,6 @@ stdenv.mkDerivation rec {
"-DgRPC_PROTOBUF_PROVIDER=package"
"-DgRPC_ABSL_PROVIDER=package"
"-DBUILD_SHARED_LIBS=ON"
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
"-D_gRPC_PROTOBUF_PROTOC_EXECUTABLE=${buildPackages.protobuf}/bin/protoc"
] ++ lib.optionals ((stdenv.hostPlatform.useLLVM or false) && lib.versionOlder stdenv.cc.cc.version "11.0") [

1
pkgs/development/libraries/leveldb/default.nix
View file

@ -36,7 +36,6 @@ stdenv.mkDerivation rec {
# NOTE: disabling tests due to gtest issue
cmakeFlags = [
"-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}"
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
"-DLEVELDB_BUILD_TESTS=OFF"
"-DLEVELDB_BUILD_BENCHMARKS=OFF"
];

1
pkgs/development/libraries/lib2geom/default.nix
View file

@ -44,7 +44,6 @@ stdenv.mkDerivation rec {
];
cmakeFlags = [
"-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests
"-D2GEOM_BUILD_SHARED=ON"
];

2
pkgs/development/libraries/libtiff/aarch64-darwin.nix
View file

@ -19,8 +19,6 @@ stdenv.mkDerivation rec {
sha256 = "1jrkjv0xya9radddn8idxvs2gqzp3l2b1s8knlizmn7ad3jq817b";
};
cmakeFlags = lib.optional stdenv.isDarwin "-DCMAKE_SKIP_BUILD_RPATH=OFF";
# FreeImage needs this patch
patches = [ ./headers-cmake.patch ];

4
pkgs/development/libraries/libuchardet/default.nix
View file

@ -13,10 +13,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
cmakeFlags = [
"-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests
];
doCheck = !stdenv.isi686; # tests fail on i686
meta = with lib; {

4
pkgs/development/libraries/libversion/default.nix
View file

@ -13,10 +13,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
cmakeFlags = lib.optional stdenv.isDarwin [
"-DCMAKE_SKIP_BUILD_RPATH=OFF" # needed for tests
];
preCheck = ''
export LD_LIBRARY_PATH=/build/source/build/libversion/''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH
'';

4
pkgs/development/libraries/plplot/default.nix
View file

@ -33,7 +33,9 @@ in stdenv.mkDerivation rec {
;
};
cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DBUILD_TEST=ON" ];
cmakeFlags = [
"-DBUILD_TEST=ON"
];
doCheck = true;

1
pkgs/development/libraries/s2n-tls/default.nix
View file

@ -23,7 +23,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON"
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
"-DUNSAFE_TREAT_WARNINGS_AS_ERRORS=OFF" # disable -Werror
] ++ lib.optionals stdenv.hostPlatform.isMips64 [
# See https://github.com/aws/s2n-tls/issues/1592 and https://github.com/aws/s2n-tls/pull/1609

1
pkgs/development/libraries/snappy/default.nix
View file

@ -36,7 +36,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}"
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
"-DSNAPPY_BUILD_TESTS=OFF"
"-DSNAPPY_BUILD_BENCHMARKS=OFF"
];

1
pkgs/development/libraries/utf8proc/default.nix
View file

@ -16,7 +16,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON"
"-DUTF8PROC_ENABLE_TESTING=ON"
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
];
doCheck = true;

4
pkgs/os-specific/linux/tiscamera/default.nix
View file

@ -108,10 +108,6 @@ stdenv.mkDerivation rec {
"-DTCAM_INTERNAL_ARAVIS=OFF"
"-DTCAM_ARAVIS_USB_VISION=${if withAravis && withAravisUsbVision then "ON" else "OFF"}"
"-DTCAM_INSTALL_FORCE_PREFIX=ON"
# There are gobject introspection commands launched as part of the build. Those have a runtime
# dependency on `libtcam` (which itself is built as part of this build). In order to allow
# that, we set the dynamic linker's path to point on the build time location of the library.
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
];
doCheck = true;

1
pkgs/servers/sql/mysql/5.7.x.nix
View file

@ -31,7 +31,6 @@ self = stdenv.mkDerivation rec {
outputs = [ "out" "static" ];
cmakeFlags = [
"-DCMAKE_SKIP_BUILD_RPATH=OFF" # To run libmysql/libmysql_api_test during build.
"-DWITH_SSL=yes"
"-DWITH_EMBEDDED_SERVER=yes"
"-DWITH_UNIT_TESTS=no"

1
pkgs/servers/sql/mysql/8.0.x.nix
View file

@ -34,7 +34,6 @@ self = stdenv.mkDerivation rec {
outputs = [ "out" "static" ];
cmakeFlags = [
"-DCMAKE_SKIP_BUILD_RPATH=OFF" # To run libmysql/libmysql_api_test during build.
"-DFORCE_UNSUPPORTED_COMPILER=1" # To configure on Darwin.
"-DWITH_ROUTER=OFF" # It may be packaged separately.
"-DWITH_SYSTEM_LIBS=ON"

1
pkgs/tools/backup/percona-xtrabackup/generic.nix
View file

@ -45,7 +45,6 @@ stdenv.mkDerivation rec {
"-DWITH_ZLIB=system"
"-DWITH_VALGRIND=ON"
"-DWITH_MAN_PAGES=OFF"
"-DCMAKE_SKIP_BUILD_RPATH=OFF" # To run libmysql/libmysql_api_test during build.
];
postInstall = ''

5
pkgs/tools/security/yubihsm-shell/default.nix
View file

@ -38,11 +38,6 @@ stdenv.mkDerivation rec {
openssl
];
cmakeFlags = [
# help2man fails without this
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
];
postPatch = ''
# Can't find libyubihsm at runtime because of dlopen() in C code
substituteInPlace lib/yubihsm.c \