From 0c9335fb1ca2a0a78d52ba19e057dfb1103c6c43 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 11 Jan 2019 20:06:37 -0500 Subject: root, root5: fix build on darwin --- pkgs/applications/science/misc/root/5.nix | 4 ++-- pkgs/applications/science/misc/root/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/applications/science/misc') diff --git a/pkgs/applications/science/misc/root/5.nix b/pkgs/applications/science/misc/root/5.nix index 7f43dfb328a8..1194ab7296ea 100644 --- a/pkgs/applications/science/misc/root/5.nix +++ b/pkgs/applications/science/misc/root/5.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, pcre, pkgconfig, python2 , libX11, libXpm, libXft, libXext, libGLU_combined, zlib, libxml2, lzma, gsl_1 -, Cocoa, OpenGL, noSplash ? false }: +, Cocoa, OpenGL, cf-private, noSplash ? false }: stdenv.mkDerivation rec { name = "root-${version}"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cmake pcre python2 zlib libxml2 lzma gsl_1 ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU_combined ] - ++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] + ++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL cf-private ] ; patches = [ diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 2ec1ded68a26..8b9573ce4e8b 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, pcre, pkgconfig, python2 , libX11, libXpm, libXft, libXext, libGLU_combined, zlib, libxml2, lz4, lzma, gsl, xxHash -, Cocoa, OpenGL, noSplash ? false }: +, Cocoa, OpenGL, cf-private, noSplash ? false }: stdenv.mkDerivation rec { name = "root-${version}"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cmake pcre python2 zlib libxml2 lz4 lzma gsl xxHash ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU_combined ] - ++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] + ++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL cf-private ] ; patches = [ -- cgit 1.4.1