public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

root: 6.18.04 -> 6.20.08

Browse Source
This commit is contained in:
Dmitry Kalinkin 2020-12-17 16:54:07 -05:00
parent 5ba4eb2d2e
commit 7d6e0d5324
No known key found for this signature in database
GPG Key ID: 5157B3EC8B2CA333
2 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/science/misc/root/default.nix
View File

@ -1,19 +1,20 @@
{ stdenv, lib, fetchurl, makeWrapper, cmake, gl2ps, gsl, libX11, libXpm, libXft { stdenv, lib, fetchurl, makeWrapper, cmake, ftgl, gl2ps, glew, gsl, libX11
, libXext, libGLU, libGL, libxml2, lz4, lzma, pcre, pkgconfig, python, xxHash , libXpm , libXft, libXext, libGLU, libGL, libxml2, lz4, lzma, pcre, pkgconfig
, zlib , python , xxHash, zlib, zstd
, libAfterImage, giflib, libjpeg, libtiff, libpng
, Cocoa, OpenGL, noSplash ? false }: , Cocoa, OpenGL, noSplash ? false }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "root"; pname = "root";
version = "6.18.04"; version = "6.20.08";
src = fetchurl { src = fetchurl {
url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";
sha256 = "196ghma6g5a7sqz52wyjkgvmh4hj4vqwppm0zwdypy33hgy8anii"; sha256 = "1s9sqapw2f31m3gcm8nyg7dl8g9mgj92ny28jsli9j08955j4byh";
}; };
nativeBuildInputs = [ makeWrapper cmake pkgconfig ]; nativeBuildInputs = [ makeWrapper cmake pkgconfig ];
buildInputs = [ gl2ps pcre zlib libxml2 lz4 lzma gsl xxHash python.pkgs.numpy ] buildInputs = [ ftgl gl2ps glew pcre zlib zstd libxml2 lz4 lzma gsl xxHash libAfterImage giflib libjpeg libtiff libpng python.pkgs.numpy ]
++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ]
++ lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ++ lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ]
; ;

18
pkgs/applications/science/misc/root/sw_vers.patch
View File

@ -1,7 +1,7 @@
diff a/build/unix/compiledata.sh b/build/unix/compiledata.sh diff a/build/unix/compiledata.sh b/build/unix/compiledata.sh
--- a/build/unix/compiledata.sh --- a/build/unix/compiledata.sh
+++ b/build/unix/compiledata.sh +++ b/build/unix/compiledata.sh
@@ -47,7 +47,7 @@ fi @@ -41,7 +41,7 @@ EXPLLINKLIBS="\$LinkedLibs"
if [ "$ARCH" = "macosx" ] || [ "$ARCH" = "macosx64" ] || \ if [ "$ARCH" = "macosx" ] || [ "$ARCH" = "macosx64" ] || \
[ "$ARCH" = "macosxicc" ]; then [ "$ARCH" = "macosxicc" ]; then
@ -13,7 +13,7 @@ diff a/build/unix/compiledata.sh b/build/unix/compiledata.sh
diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake
--- a/cmake/modules/SetUpMacOS.cmake --- a/cmake/modules/SetUpMacOS.cmake
+++ b/cmake/modules/SetUpMacOS.cmake +++ b/cmake/modules/SetUpMacOS.cmake
@@ -2,17 +2,8 @@ set(ROOT_ARCHITECTURE macosx) @@ -8,17 +8,8 @@ set(ROOT_ARCHITECTURE macosx)
set(ROOT_PLATFORM macosx) set(ROOT_PLATFORM macosx)
if (CMAKE_SYSTEM_NAME MATCHES Darwin) if (CMAKE_SYSTEM_NAME MATCHES Darwin)
@ -31,7 +31,7 @@ diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake
#TODO: check haveconfig and rpath -> set rpath true #TODO: check haveconfig and rpath -> set rpath true
#TODO: check Thread, define link command #TODO: check Thread, define link command
#TODO: more stuff check configure script #TODO: more stuff check configure script
@@ -25,23 +16,7 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin) @@ -31,23 +22,7 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64")
SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m64") SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m64")
@ -56,7 +56,7 @@ diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake
if (CMAKE_COMPILER_IS_GNUCXX) if (CMAKE_COMPILER_IS_GNUCXX)
message(STATUS "Found GNU compiler collection") message(STATUS "Found GNU compiler collection")
@@ -104,7 +79,6 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin) @@ -98,7 +73,6 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin)
endif() endif()
#---Set Linker flags---------------------------------------------------------------------- #---Set Linker flags----------------------------------------------------------------------
@ -67,7 +67,7 @@ diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake
diff a/config/root-config.in b/config/root-config.in diff a/config/root-config.in b/config/root-config.in
--- a/config/root-config.in --- a/config/root-config.in
+++ b/config/root-config.in +++ b/config/root-config.in
@@ -306,12 +306,6 @@ macosxicc) @@ -305,12 +305,6 @@ macosxicc)
auxlibs="-lm -ldl" auxlibs="-lm -ldl"
;; ;;
macosx64) macosx64)
@ -80,10 +80,10 @@ diff a/config/root-config.in b/config/root-config.in
auxcflags="${cxxversionflag} -m64" auxcflags="${cxxversionflag} -m64"
auxldflags="-m64" auxldflags="-m64"
auxlibs="-lm -ldl" auxlibs="-lm -ldl"
@@ -375,18 +369,11 @@ freebsd* | openbsd* | linux*) @@ -371,18 +365,11 @@ freebsd* | openbsd* | linux*)
done
;;
macosx*) macosx*)
for f in $features ; do
if test "x$f" = "xthread" ; then
- if [ $macosx_minor -ge 5 ]; then - if [ $macosx_minor -ge 5 ]; then
auxcflags="-pthread $auxcflags" auxcflags="-pthread $auxcflags"
auxlibs="-lpthread $auxlibs" auxlibs="-lpthread $auxlibs"
@ -91,7 +91,7 @@ diff a/config/root-config.in b/config/root-config.in
- auxcflags="-D_REENTRANT $auxcflags" - auxcflags="-D_REENTRANT $auxcflags"
- auxlibs="-lpthread $auxlibs" - auxlibs="-lpthread $auxlibs"
- fi - fi
fi for f in $features ; do
if test "x$f" = "xrpath" ; then if test "x$f" = "xrpath" ; then
- if [ $macosx_minor -ge 5 ]; then - if [ $macosx_minor -ge 5 ]; then
auxlibs="-Wl,-rpath,$libdir $auxlibs" auxlibs="-Wl,-rpath,$libdir $auxlibs"