Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2022-07-13 00:03:09 +00:00 committed by GitHub
commit 1570838769
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 42 additions and 2 deletions

View File

@ -23,6 +23,11 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "lib" ];
cmakeFlags = [
# RPATH of binary /nix/store/.../bin/btorsim contains a forbidden reference to /build/
"-DCMAKE_SKIP_BUILD_RPATH=ON"
];
meta = with lib; {
description = "A generic parser and tool package for the BTOR2 format";
homepage = "https://github.com/Boolector/btor2tools";

View File

@ -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 ];

View File

@ -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

View File

@ -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

View File

@ -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/";

View File

@ -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";

View File

@ -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; {

View File

@ -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 = {

View File

@ -30,6 +30,11 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/waifu2x-converter-cpp --prefix LD_LIBRARY_PATH : "${ocl-icd}/lib"
'';
cmakeFlags = [
# file RPATH_CHANGE could not write new RPATH
"-DCMAKE_SKIP_BUILD_RPATH=ON"
];
meta = {
description = "Improved fork of Waifu2X C++ using OpenCL and OpenCV";
homepage = "https://github.com/DeadSix27/waifu2x-converter-cpp";