From f2200369e511e9818cde1446056ab8013eaf3606 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 20 Apr 2016 01:41:46 -0400 Subject: root: fix NixOS build, build with lzma from nix, update homepage url --- pkgs/applications/science/misc/root/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'pkgs/applications/science/misc') diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 9795604bab14..583ba397487c 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, cmake, pkgconfig, python -, libX11, libXpm, libXft, libXext, zlib }: +, libX11, libXpm, libXft, libXext, zlib, lzma }: stdenv.mkDerivation rec { name = "root-${version}"; @@ -10,14 +10,17 @@ stdenv.mkDerivation rec { sha256 = "0f58dg83aqhggkxmimsfkd1qyni2vhmykq4qa89cz6jr9p73i1vm"; }; - buildInputs = [ cmake pkgconfig python libX11 libXpm libXft libXext zlib ]; + buildInputs = [ cmake pkgconfig python libX11 libXpm libXft libXext zlib lzma ]; - cmakeFlags = "-Drpath=ON"; + cmakeFlags = [ + "-Drpath=ON" + ] + ++ stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include"; enableParallelBuilding = true; meta = { - homepage = "http://root.cern.ch/drupal/"; + homepage = "https://root.cern.ch/"; description = "A data analysis framework"; platforms = stdenv.lib.platforms.linux; }; -- cgit 1.4.1