forked from mirrors/nixpkgs
Merge pull request #200412 from wegank/root-darwin
root: 6.26.06 -> 6.26.08
This commit is contained in:
commit
25fd03cf72
|
@ -1,6 +1,6 @@
|
||||||
{ stdenv
|
{ stdenv
|
||||||
, lib
|
, lib
|
||||||
, fetchurl
|
, fetchFromGitHub
|
||||||
, fetchpatch
|
, fetchpatch
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
, cmake
|
, cmake
|
||||||
|
@ -46,7 +46,7 @@
|
||||||
let
|
let
|
||||||
|
|
||||||
_llvm_9 = llvm_9.overrideAttrs (prev: {
|
_llvm_9 = llvm_9.overrideAttrs (prev: {
|
||||||
patches = (prev.patches or []) ++ [
|
patches = (prev.patches or [ ]) ++ [
|
||||||
(fetchpatch {
|
(fetchpatch {
|
||||||
url = "https://github.com/root-project/root/commit/a9c961cf4613ff1f0ea50f188e4a4b0eb749b17d.diff";
|
url = "https://github.com/root-project/root/commit/a9c961cf4613ff1f0ea50f188e4a4b0eb749b17d.diff";
|
||||||
stripLen = 3;
|
stripLen = 3;
|
||||||
|
@ -59,11 +59,13 @@ in
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "root";
|
pname = "root";
|
||||||
version = "6.26.06";
|
version = "6.26.08";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchFromGitHub {
|
||||||
url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";
|
owner = "root-project";
|
||||||
hash = "sha256-sfc8l2pYClxWyMigFSWCod/FYLTdgOG3VFI3tl5sics=";
|
repo = "root";
|
||||||
|
rev = "v${builtins.replaceStrings [ "." ] [ "-" ] version}";
|
||||||
|
sha256 = "sha256-cNd1GvEbO/a+WdDe8EHYGmdlw3TrOT2fWaSk+s7fw7U=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper cmake pkg-config git ];
|
nativeBuildInputs = [ makeWrapper cmake pkg-config git ];
|
||||||
|
@ -129,6 +131,8 @@ stdenv.mkDerivation rec {
|
||||||
# Eliminate impure reference to /System/Library/PrivateFrameworks
|
# Eliminate impure reference to /System/Library/PrivateFrameworks
|
||||||
substituteInPlace core/CMakeLists.txt \
|
substituteInPlace core/CMakeLists.txt \
|
||||||
--replace "-F/System/Library/PrivateFrameworks" ""
|
--replace "-F/System/Library/PrivateFrameworks" ""
|
||||||
|
'' + lib.optionalString (stdenv.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") ''
|
||||||
|
MACOSX_DEPLOYMENT_TARGET=10.16
|
||||||
'';
|
'';
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
|
@ -204,6 +208,6 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
# See https://github.com/NixOS/nixpkgs/pull/192581#issuecomment-1256860426
|
# See https://github.com/NixOS/nixpkgs/pull/192581#issuecomment-1256860426
|
||||||
# for some context on issues on aarch64.
|
# for some context on issues on aarch64.
|
||||||
broken = stdenv.isAarch64;
|
broken = stdenv.isAarch64 && stdenv.isLinux;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue