ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 12:53:59 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #14794 from veprbl/root6.04.16

Browse Source 
root: 5.34.15 -> 6.04.16
This commit is contained in:
Peter Simons 2016-04-18 11:18:05 +02:00
commit 5d3ccc0fe1
2 changed files with 7 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/science/misc/root/cmake.patch
View File

@ -1,11 +0,0 @@
--- a/cmake/modules/RootBuildOptions.cmake 1969-12-31 20:30:01.000000000 -0330
+++ b/cmake/modules/RootBuildOptions.cmake 2014-01-10 14:09:29.424937408 -0330
@@ -149,7 +149,7 @@
#---General Build options----------------------------------------------------------------------
# use, i.e. don't skip the full RPATH for the build tree
-set(CMAKE_SKIP_BUILD_RPATH FALSE)
+set(CMAKE_SKIP_BUILD_RPATH TRUE)
# when building, don't use the install RPATH already (but later on when installing)
set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
# add the automatically determined parts of the RPATH

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

@ -1,31 +1,18 @@
{ stdenv, fetchurl, fetchpatch, cmake, pkgconfig, mesa, gfortran
{ stdenv, fetchurl, fetchpatch, cmake, pkgconfig, python
, libX11, libXpm, libXft, libXext, zlib }:
stdenv.mkDerivation rec {
name = "root-${version}";
version = "5.34.15";
version = "6.04.16";
src = fetchurl {
url = "ftp://root.cern.ch/root/root_v${version}.source.tar.gz";
sha256 = "1bkiggcyya39a794d3d2rzzmmkbdymf86hbqhh0l1pl4f38xvp6i";
url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";
sha256 = "0f58dg83aqhggkxmimsfkd1qyni2vhmykq4qa89cz6jr9p73i1vm";
};
buildInputs = [ cmake pkgconfig gfortran mesa libX11 libXpm libXft libXext zlib ];
buildInputs = [ cmake pkgconfig python libX11 libXpm libXft libXext zlib ];
NIX_CFLAGS_LINK = "-lX11";
# CMAKE_INSTALL_RPATH_USE_LINK_PATH is set to FALSE in
# <rootsrc>/cmake/modules/RootBuildOptions.cmake.
# This patch sets it to TRUE.
patches = [
./cmake.patch
(fetchpatch {
name = "fix-tm_t-member.diff";
url = "https://github.com/root-mirror/root/commit/"
+ "08b08412bafc24fa635b0fdb832097a3aa2fa1d2.diff";
sha256 = "0apbp51pk8471gl06agx3i88dn76p6gpkgf1ssfhcyam0bjl8907";
})
];
cmakeFlags = "-Drpath=ON";
enableParallelBuilding = true;