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

root: 6.04.16 -> 6.04.18 (#17265)

Browse Source 
root: compile against external gsl

Revert "Revert "root: enable parallel building""

This reverts commit ee1a10ee6b4b0a1a22e3e0dbbcf96a2d667d0685.

ROOT has no problems with parallel build. The problems that caused the
original commit were not related to parallel building.
This commit is contained in:
Dmitry Kalinkin 2016-07-29 20:41:37 -04:00 committed by obadz
parent ad470d59fd
commit 4449ecb617
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,16 +1,23 @@
{ stdenv, fetchurl, fetchpatch, cmake, pkgconfig, python { stdenv, fetchurl, fetchpatch, cmake, pkgconfig, python
, libX11, libXpm, libXft, libXext, zlib, lzma }: , libX11, libXpm, libXft, libXext, zlib, lzma, gsl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "root-${version}"; name = "root-${version}";
version = "6.04.16"; version = "6.04.18";
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 = "0f58dg83aqhggkxmimsfkd1qyni2vhmykq4qa89cz6jr9p73i1vm"; sha256 = "00f3v3l8nimfkcxpn9qpyh3h23na0mi4wkds2y5gwqh8wh3jryq9";
}; };
buildInputs = [ cmake pkgconfig python libX11 libXpm libXft libXext zlib lzma ]; buildInputs = [ cmake pkgconfig python libX11 libXpm libXft libXext zlib lzma gsl ];
patches = [
(fetchpatch {
url = "https://github.com/root-mirror/root/commit/ee9964210c56e7c1868618a4434c5340fef38fe4.patch";
sha256 = "186i7ni75yvjydy6lpmaplqxfb5z2019bgpbhff1n6zn2qlrff2r";
})
];
preConfigure = '' preConfigure = ''
patchShebangs build/unix/ patchShebangs build/unix/
@ -23,6 +30,8 @@ stdenv.mkDerivation rec {
] ]
++ stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include"; ++ stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include";
enableParallelBuilding = true;
meta = { meta = {
homepage = "https://root.cern.ch/"; homepage = "https://root.cern.ch/";
description = "A data analysis framework"; description = "A data analysis framework";