diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2022-11-09 18:16:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-09 18:16:38 -0500 |
| commit | 25fd03cf72f0ad816e31e2ebedc0bf71512ac811 (patch) | |
| tree | 013dc30e1fc3ebb1bade3ebb078751f2641c06b2 /pkgs/applications/science/misc | |
| parent | 55c093a1d0ba4b2d3b21dd860fb1cea9ed930dcb (diff) | |
| parent | d474e39f7d577eb509f3f39369fac575c0a04fdc (diff) | |
Merge pull request #200412 from wegank/root-darwin
root: 6.26.06 -> 6.26.08
Diffstat (limited to 'pkgs/applications/science/misc')
| -rw-r--r-- | pkgs/applications/science/misc/root/default.nix | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index b00a7ddecbe2b..f60fc95e0d56b 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -1,6 +1,6 @@ { stdenv , lib -, fetchurl +, fetchFromGitHub , fetchpatch , makeWrapper , cmake @@ -46,7 +46,7 @@ let _llvm_9 = llvm_9.overrideAttrs (prev: { - patches = (prev.patches or []) ++ [ + patches = (prev.patches or [ ]) ++ [ (fetchpatch { url = "https://github.com/root-project/root/commit/a9c961cf4613ff1f0ea50f188e4a4b0eb749b17d.diff"; stripLen = 3; @@ -59,11 +59,13 @@ in stdenv.mkDerivation rec { pname = "root"; - version = "6.26.06"; + version = "6.26.08"; - src = fetchurl { - url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - hash = "sha256-sfc8l2pYClxWyMigFSWCod/FYLTdgOG3VFI3tl5sics="; + src = fetchFromGitHub { + owner = "root-project"; + repo = "root"; + rev = "v${builtins.replaceStrings [ "." ] [ "-" ] version}"; + sha256 = "sha256-cNd1GvEbO/a+WdDe8EHYGmdlw3TrOT2fWaSk+s7fw7U="; }; nativeBuildInputs = [ makeWrapper cmake pkg-config git ]; @@ -129,6 +131,8 @@ stdenv.mkDerivation rec { # Eliminate impure reference to /System/Library/PrivateFrameworks substituteInPlace core/CMakeLists.txt \ --replace "-F/System/Library/PrivateFrameworks" "" + '' + lib.optionalString (stdenv.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") '' + MACOSX_DEPLOYMENT_TARGET=10.16 ''; cmakeFlags = [ @@ -204,6 +208,6 @@ stdenv.mkDerivation rec { # See https://github.com/NixOS/nixpkgs/pull/192581#issuecomment-1256860426 # for some context on issues on aarch64. - broken = stdenv.isAarch64; + broken = stdenv.isAarch64 && stdenv.isLinux; }; } |