pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #130210 from veprbl/pr/root_6_24_02

authored by

Sandro and committed by
GitHub daa42d53 8e170dc4

+86 -15
unified split
+25 -4
pkgs/applications/science/misc/root/5.nix
··· 1 - { lib, stdenv, fetchurl, fetchpatch, cmake, pcre, pkg-config, python2 2 - , libX11, libXpm, libXft, libXext, libGLU, libGL, zlib, libxml2, lz4, xz, gsl_1, xxHash 3 - , Cocoa, OpenGL, noSplash ? false }: 4 5 stdenv.mkDerivation rec { 6 pname = "root"; ··· 15 buildInputs = [ pcre python2 zlib libxml2 lz4 xz gsl_1 xxHash ] 16 ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] 17 ++ lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] 18 - ; 19 20 patches = [ 21 ./sw_vers_root5.patch
··· 1 + { lib 2 + , stdenv 3 + , fetchurl 4 + , fetchpatch 5 + , cmake 6 + , pcre 7 + , pkg-config 8 + , python2 9 + , libX11 10 + , libXpm 11 + , libXft 12 + , libXext 13 + , libGLU 14 + , libGL 15 + , zlib 16 + , libxml2 17 + , lz4 18 + , xz 19 + , gsl_1 20 + , xxHash 21 + , Cocoa 22 + , OpenGL 23 + , noSplash ? false 24 + }: 25 26 stdenv.mkDerivation rec { 27 pname = "root"; ··· 36 buildInputs = [ pcre python2 zlib libxml2 lz4 xz gsl_1 xxHash ] 37 ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] 38 ++ lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] 39 + ; 40 41 patches = [ 42 ./sw_vers_root5.patch
+61 -11
pkgs/applications/science/misc/root/default.nix
··· 1 - { stdenv, lib, fetchurl, makeWrapper, cmake, git, ftgl, gl2ps, glew, gsl 2 - , libX11, libXpm, libXft, libXext, libGLU, libGL, libxml2, lz4, xz, pcre, nlohmann_json 3 - , pkg-config, python, xxHash, zlib, zstd 4 - , libAfterImage, giflib, libjpeg, libtiff, libpng 5 - , Cocoa, CoreSymbolication, OpenGL, noSplash ? false }: 6 7 stdenv.mkDerivation rec { 8 pname = "root"; 9 - version = "6.24.00"; 10 11 src = fetchurl { 12 url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; 13 - sha256 = "12crjzd7pzx5qpk2pb3z0rhmxlw5gsqaqzfl48qiq8c9l940b8wx"; 14 }; 15 16 nativeBuildInputs = [ makeWrapper cmake pkg-config git ]; 17 - buildInputs = [ ftgl gl2ps glew pcre zlib zstd libxml2 lz4 xz gsl xxHash libAfterImage giflib libjpeg libtiff libpng nlohmann_json python.pkgs.numpy ] 18 - ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] 19 - ++ lib.optionals (stdenv.isDarwin) [ Cocoa CoreSymbolication OpenGL ] 20 - ; 21 22 patches = [ 23 ./sw_vers.patch
··· 1 + { stdenv 2 + , lib 3 + , fetchurl 4 + , makeWrapper 5 + , cmake 6 + , git 7 + , ftgl 8 + , gl2ps 9 + , glew 10 + , gsl 11 + , libX11 12 + , libXpm 13 + , libXft 14 + , libXext 15 + , libGLU 16 + , libGL 17 + , libxml2 18 + , lz4 19 + , xz 20 + , pcre 21 + , nlohmann_json 22 + , pkg-config 23 + , python 24 + , xxHash 25 + , zlib 26 + , zstd 27 + , libAfterImage 28 + , giflib 29 + , libjpeg 30 + , libtiff 31 + , libpng 32 + , Cocoa 33 + , CoreSymbolication 34 + , OpenGL 35 + , noSplash ? false 36 + }: 37 38 stdenv.mkDerivation rec { 39 pname = "root"; 40 + version = "6.24.02"; 41 42 src = fetchurl { 43 url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; 44 + sha256 = "sha256-BQfhCV4nnMxyQPZR0llmAkMlF5+oWhJZtpS1ZyOtfBw="; 45 }; 46 47 nativeBuildInputs = [ makeWrapper cmake pkg-config git ]; 48 + buildInputs = [ 49 + ftgl 50 + gl2ps 51 + glew 52 + pcre 53 + zlib 54 + zstd 55 + libxml2 56 + lz4 57 + xz 58 + gsl 59 + xxHash 60 + libAfterImage 61 + giflib 62 + libjpeg 63 + libtiff 64 + libpng 65 + nlohmann_json 66 + python.pkgs.numpy 67 + ] 68 + ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] 69 + ++ lib.optionals (stdenv.isDarwin) [ Cocoa CoreSymbolication OpenGL ] 70 + ; 71 72 patches = [ 73 ./sw_vers.patch