Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rave,fun4all: fix for new compiler #113

Merged
merged 2 commits into from
Dec 14, 2023
Merged

rave,fun4all: fix for new compiler #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a6b9e2
rave: fix for new compiler
veprbl Dec 14, 2023
0b0fa99
fun4all: fix for new compiler
veprbl Dec 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions pkgs/fun4all/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,9 @@ let
root
];

NIX_CFLAGS_COMPILE =
lib.optionals stdenv.isDarwin [ "-DBOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED" ];
CXXFLAGS =
lib.optionals (stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "15") [ "-Wno-error=unused-but-set-variable" ]
++ lib.optionals stdenv.isDarwin [ "-DBOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED" ];

preAutoreconf = ''
cd ${path}
Expand Down Expand Up @@ -135,6 +136,8 @@ let
postPatch = ''
substituteInPlace src/dtconv.h \
--replace ODBCXX_STRING_PERCENT '"%"'
find . -type f \( -name "*.cpp" -o -name "*.h" \) -exec sed -i {} -e 's/auto_ptr/shared_ptr/g' \;
'';

meta.license = lib.licenses.lgpl2Only;
Expand All @@ -151,7 +154,10 @@ let
hash = "sha256-8TYw6XZfSmJ1v1WlMI2eY8t/fO5+exPwM999qziPa6Q=";
};

postPatch = ":";
# overrides postPatch of the acts_orig
postPatch = ''
find . -type f -name "*.hpp" -exec sed -i {} -e 's/std::binary_function<T, T, bool>/std::function<bool(T, T)>/g' \;
'';

buildInputs = [
boost
Expand Down Expand Up @@ -601,6 +607,8 @@ sphenix_packages = with extra_deps; let geant4 = extra_deps.geant4_10_6_2; in en
};
simulation.g4simulation.g4eiccalos = mk_path_eicdetectors "simulation/g4simulation/g4eiccalos" {
buildInputs = [ gsl extra_deps.acts offline.database.PHParameter offline.framework.fun4all offline.framework.phool offline.packages.CaloBase offline.packages.trackbase_historic simulation.g4simulation.g4detectors simulation.g4simulation.g4gdml simulation.g4simulation.g4main ];
CXXFLAGS =
lib.optionals (stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "15") [ "-Wno-error=array-parameter" ];
};
simulation.g4simulation.g4eicdirc = mk_path_eicdetectors "simulation/g4simulation/g4eicdirc" {
buildInputs = [ offline.database.PHParameter offline.framework.fun4all offline.framework.phool simulation.g4simulation.g4detectors simulation.g4simulation.g4main ];
Expand Down
2 changes: 1 addition & 1 deletion pkgs/rave/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
];

CPPFLAGS="-DDISABLE_GNU_EXTENSIONS";
CXXFLAGS="-std=c++11";
CXXFLAGS="-std=c++11 -Wno-enum-constexpr-conversion";

nativeBuildInputs = [
pkg-config
Expand Down
Loading