diff options
author | Artturin <Artturin@artturin.com> | 2022-07-19 17:44:16 +0300 |
---|---|---|
committer | Artturin <Artturin@artturin.com> | 2022-07-19 17:47:13 +0300 |
commit | 6b8c65acd97bb59c917a018f9c84061f91e26e1a (patch) | |
tree | 16d6d9bea2547a9ab6a16913f0d23ccf4949db19 /pkgs/applications | |
parent | cfe78489c90b8ba3adb0713b16c984c84e863664 (diff) |
treewide: fix fallout from 'cmake/setup-hook.sh: Don't skip build-RPATH'
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/audio/in-formant/default.nix | 3 | ||||
-rw-r--r-- | pkgs/applications/science/misc/simgrid/default.nix | 5 | ||||
-rw-r--r-- | pkgs/applications/video/ccextractor/default.nix | 5 |
3 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/applications/audio/in-formant/default.nix b/pkgs/applications/audio/in-formant/default.nix index 7cf0fb8c14547..5fb36b0345060 100644 --- a/pkgs/applications/audio/in-formant/default.nix +++ b/pkgs/applications/audio/in-formant/default.nix @@ -35,6 +35,9 @@ stdenv.mkDerivation rec { cp in-formant $out/bin ''; + # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ + cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; + meta = with lib; { description = "A real-time pitch and formant tracking software"; homepage = "https://github.com/in-formant/in-formant"; diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 4aaf6665b00c9..8db9245ed33ed 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -76,6 +76,11 @@ stdenv.mkDerivation rec { patchShebangs .. ''; + # needed by tests (so libsimgrid.so is found) + preConfigure = '' + export LD_LIBRARY_PATH="$PWD/build/lib" + ''; + doCheck = true; preCheck = '' # prevent the execution of tests known to fail diff --git a/pkgs/applications/video/ccextractor/default.nix b/pkgs/applications/video/ccextractor/default.nix index 905034091a297..26954375aff5b 100644 --- a/pkgs/applications/video/ccextractor/default.nix +++ b/pkgs/applications/video/ccextractor/default.nix @@ -36,7 +36,10 @@ stdenv.mkDerivation rec { ++ lib.optional (!stdenv.isLinux) libiconv ++ lib.optionals enableOcr [ leptonica tesseract4 ffmpeg ]; - cmakeFlags = lib.optionals enableOcr [ "-DWITH_OCR=on" "-DWITH_HARDSUBX=on" ]; + cmakeFlags = [ + # file RPATH_CHANGE could not write new RPATH: + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ] ++ lib.optionals enableOcr [ "-DWITH_OCR=on" "-DWITH_HARDSUBX=on" ]; postInstall = lib.optionalString enableOcr '' wrapProgram "$out/bin/ccextractor" \ |