diff options
| author | Yipeng Sun <syp@umd.edu> | 2022-01-27 19:37:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-27 19:37:36 -0500 |
| commit | 54cbee8d9700668eaa51219f6c852b4019cfd2ba (patch) | |
| tree | a7fe47109e942a15c9694eb6771dcefa720528df | |
| parent | dff905b0847b11280c07dec9fb6959a9596d8d14 (diff) | |
| download | nixpkgs-54cbee8d9700668eaa51219f6c852b4019cfd2ba.tar nixpkgs-54cbee8d9700668eaa51219f6c852b4019cfd2ba.tar.gz nixpkgs-54cbee8d9700668eaa51219f6c852b4019cfd2ba.tar.bz2 nixpkgs-54cbee8d9700668eaa51219f6c852b4019cfd2ba.tar.lz nixpkgs-54cbee8d9700668eaa51219f6c852b4019cfd2ba.tar.xz nixpkgs-54cbee8d9700668eaa51219f6c852b4019cfd2ba.tar.zst nixpkgs-54cbee8d9700668eaa51219f6c852b4019cfd2ba.zip | |
root: tweak wrapping flags for auxiliary programs, avoid forcing CMAKE_CXX_STANDARD (#157069)
| -rw-r--r-- | pkgs/applications/science/misc/root/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 9962b1ce60f..f8037c01e08 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -120,7 +120,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-Drpath=ON" - "-DCMAKE_CXX_STANDARD=17" "-DCMAKE_INSTALL_BINDIR=bin" "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" @@ -176,7 +175,8 @@ stdenv.mkDerivation rec { postInstall = '' for prog in rootbrowse rootcp rooteventselector rootls rootmkdir rootmv rootprint rootrm rootslimtree; do wrapProgram "$out/bin/$prog" \ - --prefix PYTHONPATH : "$out/lib" + --set PYTHONPATH "$out/lib" \ + --set ${lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH "$out/lib" done ''; |