dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

root: replace deprecated --replace with --replace-fail

Browse Source
This commit is contained in:
Jonas Rembser 2024-09-15 14:41:21 +02:00
parent d78d09350a
commit aae672db41
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/science/misc/root/default.nix
View File

@ -124,22 +124,22 @@ stdenv.mkDerivation rec {
fi fi
done done
substituteInPlace cmake/modules/SearchInstalledSoftware.cmake \ substituteInPlace cmake/modules/SearchInstalledSoftware.cmake \
--replace 'set(lcgpackages ' '#set(lcgpackages ' --replace-fail 'set(lcgpackages ' '#set(lcgpackages '
# We have to bypass the connection check, because it would disable clad. # We have to bypass the connection check, because it would disable clad.
# This should probably be fixed upstream with a flag to disable the # This should probably be fixed upstream with a flag to disable the
# connectivity check! # connectivity check!
substituteInPlace CMakeLists.txt \ substituteInPlace CMakeLists.txt \
--replace 'if(clad AND NO_CONNECTION)' 'if(FALSE)' --replace-fail 'if(clad AND NO_CONNECTION)' 'if(FALSE)'
# Make sure that clad is not downloaded when building # Make sure that clad is not downloaded when building
substituteInPlace interpreter/cling/tools/plugins/clad/CMakeLists.txt \ substituteInPlace interpreter/cling/tools/plugins/clad/CMakeLists.txt \
--replace 'UPDATE_COMMAND ""' 'SOURCE_DIR ${clad_src} DOWNLOAD_COMMAND "" UPDATE_COMMAND ""' --replace-fail 'UPDATE_COMMAND ""' 'SOURCE_DIR ${clad_src} DOWNLOAD_COMMAND "" UPDATE_COMMAND ""'
# Make sure that clad is finding the right llvm version # Make sure that clad is finding the right llvm version
substituteInPlace interpreter/cling/tools/plugins/clad/CMakeLists.txt \ substituteInPlace interpreter/cling/tools/plugins/clad/CMakeLists.txt \
--replace '-DLLVM_DIR=''${LLVM_BINARY_DIR}' '-DLLVM_DIR=${llvm_16.dev}/lib/cmake/llvm' --replace-fail '-DLLVM_DIR=''${LLVM_BINARY_DIR}' '-DLLVM_DIR=${llvm_16.dev}/lib/cmake/llvm'
substituteInPlace interpreter/llvm-project/clang/tools/driver/CMakeLists.txt \ substituteInPlace interpreter/llvm-project/clang/tools/driver/CMakeLists.txt \
--replace 'add_clang_symlink(''${link} clang)' "" --replace-fail 'add_clang_symlink(''${link} clang)' ""
# Don't require textutil on macOS # Don't require textutil on macOS
: > cmake/modules/RootCPack.cmake : > cmake/modules/RootCPack.cmake
@ -152,7 +152,7 @@ stdenv.mkDerivation rec {
'' + lib.optionalString stdenv.hostPlatform.isDarwin '' '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
# Eliminate impure reference to /System/Library/PrivateFrameworks # Eliminate impure reference to /System/Library/PrivateFrameworks
substituteInPlace core/macosx/CMakeLists.txt \ substituteInPlace core/macosx/CMakeLists.txt \
--replace "-F/System/Library/PrivateFrameworks " "" --replace-fail "-F/System/Library/PrivateFrameworks " ""
'' + lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") '' '' + lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") ''
MACOSX_DEPLOYMENT_TARGET=10.16 MACOSX_DEPLOYMENT_TARGET=10.16
''; '';