b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

root: remove -lgcc from NIX_LDFLAGS

Browse source
This commit is contained in:
Weijia Wang 2023-03-04 00:25:59 +02:00
parent f7ac4b4eda
commit ac62a206b7
2 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/applications/science/misc/root/default.nix
View file

@ -207,9 +207,6 @@ stdenv.mkDerivation rec {
"-Druntime_cxxmodules=OFF"
];
# https://github.com/NixOS/nixpkgs/issues/201254
NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc";
# Workaround the xrootd runpath bug #169677 by prefixing [DY]LD_LIBRARY_PATH with ${lib.makeLibraryPath xrootd}.
# TODO: Remove the [DY]LDLIBRARY_PATH prefix for xrootd when #200830 get merged.
postInstall = ''

2
pkgs/top-level/all-packages.nix
View file

@ -37522,8 +37522,6 @@ with pkgs;
root = callPackage ../applications/science/misc/root {
python = python3;
inherit (darwin.apple_sdk.frameworks) Cocoa CoreSymbolication OpenGL;
# https://github.com/NixOS/nixpkgs/issues/201254
stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc12Stdenv else stdenv;
};
root5 = lowPrio (callPackage ../applications/science/misc/root/5.nix {