diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-07-13 00:03:09 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-13 00:03:09 +0000 |
commit | 1570838769fad637e3cf26a56ab6ff14d23c4b95 (patch) | |
tree | f049a3c6b786ffdcbf3198bbf42babb507a36fa2 /pkgs/development | |
parent | 695f489e7470c013027f5ede8278f180f9a0548a (diff) | |
parent | 9bea0f82ddf1ad05a225f022118ac63d281ea2a1 (diff) | |
download | nixpkgs-1570838769fad637e3cf26a56ab6ff14d23c4b95.tar nixpkgs-1570838769fad637e3cf26a56ab6ff14d23c4b95.tar.gz nixpkgs-1570838769fad637e3cf26a56ab6ff14d23c4b95.tar.bz2 nixpkgs-1570838769fad637e3cf26a56ab6ff14d23c4b95.tar.lz nixpkgs-1570838769fad637e3cf26a56ab6ff14d23c4b95.tar.xz nixpkgs-1570838769fad637e3cf26a56ab6ff14d23c4b95.tar.zst nixpkgs-1570838769fad637e3cf26a56ab6ff14d23c4b95.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development')
7 files changed, 32 insertions, 2 deletions
diff --git a/pkgs/development/compilers/seexpr/default.nix b/pkgs/development/compilers/seexpr/default.nix index f13ec5174d5..b07a9159933 100644 --- a/pkgs/development/compilers/seexpr/default.nix +++ b/pkgs/development/compilers/seexpr/default.nix @@ -22,7 +22,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-r6mgyb/FGz4KYZOgLDgmIqjO+PSmneD3KUWjymZXtEk="; }; - cmakeFlags = [ "-DENABLE_SSE4=OFF" ]; + cmakeFlags = [ + "-DENABLE_SSE4=OFF" + # file RPATH_CHANGE could not write new RPATH + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; nativeBuildInputs = [ cmake ]; buildInputs = [ libGLU libpng zlib qt4 python3Packages.pyqt4 python3Packages.boost bison flex ]; diff --git a/pkgs/development/compilers/spirv-llvm-translator/default.nix b/pkgs/development/compilers/spirv-llvm-translator/default.nix index b0ba8508fc3..ace6c773770 100644 --- a/pkgs/development/compilers/spirv-llvm-translator/default.nix +++ b/pkgs/development/compilers/spirv-llvm-translator/default.nix @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { "-DLLVM_DIR=${llvm_11.dev}" "-DBUILD_SHARED_LIBS=YES" "-DLLVM_SPIRV_BUILD_EXTERNAL=YES" + # RPATH of binary /nix/store/.../bin/llvm-spirv contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; # FIXME: CMake tries to run "/llvm-lit" which of course doesn't exist diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix index a2cd8f44ce2..fc8b60e9e3f 100644 --- a/pkgs/development/compilers/zig/default.nix +++ b/pkgs/development/compilers/zig/default.nix @@ -38,6 +38,11 @@ stdenv.mkDerivation rec { export HOME=$TMPDIR; ''; + cmakeFlags = [ + # file RPATH_CHANGE could not write new RPATH + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; + doCheck = true; checkPhase = '' runHook preCheck diff --git a/pkgs/development/embedded/xc3sprog/default.nix b/pkgs/development/embedded/xc3sprog/default.nix index b9785bac7c5..ead48a00472 100644 --- a/pkgs/development/embedded/xc3sprog/default.nix +++ b/pkgs/development/embedded/xc3sprog/default.nix @@ -16,6 +16,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libusb-compat-0_1 libftdi ]; + cmakeFlags = [ + # file RPATH_CHANGE could not write new RPATH + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; + meta = with lib; { description = "Command-line tools for programming FPGAs, microcontrollers and PROMs via JTAG"; homepage = "http://xc3sprog.sourceforge.net/"; diff --git a/pkgs/development/libraries/codec2/default.nix b/pkgs/development/libraries/codec2/default.nix index e360279c6a4..cc0ef008f82 100644 --- a/pkgs/development/libraries/codec2/default.nix +++ b/pkgs/development/libraries/codec2/default.nix @@ -23,6 +23,11 @@ stdenv.mkDerivation rec { sed -r -i 's/(\<_Complex)(\s+)(float|double)/\3\2\1/' $out/include/$pname/freedv_api.h ''; + cmakeFlags = [ + # RPATH of binary /nix/store/.../bin/freedv_rx contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; + meta = with lib; { description = "Speech codec designed for communications quality speech at low data rates"; homepage = "https://www.rowetel.com/codec2.html"; diff --git a/pkgs/development/libraries/ctpp2/default.nix b/pkgs/development/libraries/ctpp2/default.nix index 626606d0526..c8bc708a2aa 100644 --- a/pkgs/development/libraries/ctpp2/default.nix +++ b/pkgs/development/libraries/ctpp2/default.nix @@ -16,6 +16,11 @@ stdenv.mkDerivation rec { sed -ie 's/<stdlib.h>/<stdlib.h>\n#include <unistd.h>/' src/CTPP2FileSourceLoader.cpp ''; + cmakeFlags = [ + # RPATH of binary /nix/store/.../bin/ctpp2json contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; + doCheck = false; # fails meta = with lib; { diff --git a/pkgs/development/libraries/science/math/metis/default.nix b/pkgs/development/libraries/science/math/metis/default.nix index 41deec25d45..cd221e86b14 100644 --- a/pkgs/development/libraries/science/math/metis/default.nix +++ b/pkgs/development/libraries/science/math/metis/default.nix @@ -9,7 +9,11 @@ stdenv.mkDerivation rec { sha256 = "1cjxgh41r8k6j029yxs8msp3z6lcnpm16g5pvckk35kc7zhfpykn"; }; - cmakeFlags = [ "-DGKLIB_PATH=../GKlib" ]; + cmakeFlags = [ + "-DGKLIB_PATH=../GKlib" + # remove once updated past https://github.com/KarypisLab/METIS/commit/521a2c360dc21ace5c4feb6dc0b7992433e3cb0f + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; nativeBuildInputs = [ unzip cmake ]; meta = { |