alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #200412 from wegank/root-darwin

Browse source 
root: 6.26.06 -> 6.26.08
This commit is contained in:
Dmitry Kalinkin 2022-11-09 18:16:38 -05:00 committed by GitHub
parent 55c093a1d0 d474e39f7d
commit 25fd03cf72
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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;
};
}