Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2022-07-17 18:02:02 +00:00 committed by GitHub
commit d857dbe436
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 31 additions and 1 deletions

View File

@ -167,6 +167,9 @@ in stdenv.mkDerivation rec {
"-DDISABLE_DYNAMIC_LOADING_FFMPEG=ON"
"-Daudacity_conan_enabled=Off"
"-Daudacity_use_ffmpeg=loaded"
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
"-DCMAKE_SKIP_BUILD_RPATH=ON"
];
doCheck = false; # Test fails

View File

@ -138,6 +138,11 @@ stdenv.mkDerivation rec {
util-linux
];
cmakeFlags = [
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
"-DCMAKE_SKIP_BUILD_RPATH=ON"
];
meta = with lib; {
description = "Sound editor with graphical UI";
homepage = "https://tenacityaudio.org/";

View File

@ -83,6 +83,9 @@ mkDerivation rec {
cmakeFlags = [
"-DMINIZIP_INCLUDE_DIRS=${minizip2}/include"
"-DMINIZIP_LIBRARIES=minizip"
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
"-DCMAKE_SKIP_BUILD_RPATH=ON"
];
# The default install phase fails because the paths are somehow messed up in

View File

@ -75,7 +75,11 @@ stdenv.mkDerivation rec {
makeFlags = optionals (debug) [ "CFLAGS+=-Og" "CFLAGS+=-ggdb" ];
cmakeFlags = optionals (withScripting) [
cmakeFlags = [
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
"-DCMAKE_SKIP_BUILD_RPATH=ON"
]
++ optionals (withScripting) [
"-DKICAD_SCRIPTING_WXPYTHON=ON"
]
++ optionals (!withScripting) [

View File

@ -52,6 +52,11 @@ mkDerivation rec {
# the other libraries as `libGL` is part of our `buildInputs`.
NIX_CFLAGS_LINK = "-Wl,-rpath,${libGL}/lib";
cmakeFlags = [
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
"-DCMAKE_SKIP_BUILD_RPATH=ON"
];
preFixup = ''
mkdir -p "$out/bin"
cp -a "./bin/"* "$out/bin"

View File

@ -60,6 +60,11 @@ mkDerivation rec {
outputs = [ "out" "dev" ];
cmakeFlags = [
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
"-DCMAKE_SKIP_BUILD_RPATH=ON"
];
qtWrapperArgs = [
"--prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1"
"--prefix LADSPA_PATH : ${ladspaPlugins}/lib/ladspa"

View File

@ -62,6 +62,11 @@ stdenv.mkDerivation rec {
yajl
];
cmakeFlags = [
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
"-DCMAKE_SKIP_BUILD_RPATH=ON"
];
WITH_FONTS = "NO";
WITH_UPDATER = "NO";