diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-01-11 20:06:37 -0500 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-01-11 20:45:37 -0500 |
| commit | 0c9335fb1ca2a0a78d52ba19e057dfb1103c6c43 (patch) | |
| tree | ee82e5e80878392878fb408db27e05ae5ae1b10c /pkgs/applications/science/misc | |
| parent | 61e57a827b84251bbe4713ea2714a99f9e6f7314 (diff) | |
| download | nixlib-0c9335fb1ca2a0a78d52ba19e057dfb1103c6c43.tar nixlib-0c9335fb1ca2a0a78d52ba19e057dfb1103c6c43.tar.gz nixlib-0c9335fb1ca2a0a78d52ba19e057dfb1103c6c43.tar.bz2 nixlib-0c9335fb1ca2a0a78d52ba19e057dfb1103c6c43.tar.lz nixlib-0c9335fb1ca2a0a78d52ba19e057dfb1103c6c43.tar.xz nixlib-0c9335fb1ca2a0a78d52ba19e057dfb1103c6c43.tar.zst nixlib-0c9335fb1ca2a0a78d52ba19e057dfb1103c6c43.zip | |
root, root5: fix build on darwin
Diffstat (limited to 'pkgs/applications/science/misc')
| -rw-r--r-- | pkgs/applications/science/misc/root/5.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/science/misc/root/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
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 = [ |