diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2019-01-12 12:15:44 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2019-01-12 12:19:34 +0100 |
| commit | bde8efe792b5be621a1fdc169a3b717b5a5b5cc2 (patch) | |
| tree | 93b8d1a2b18224578db4cab7ada60d28692f3e89 /pkgs/applications/science/misc | |
| parent | 3d730814998c6f7ac8bfb753b9514a0df4a9d183 (diff) | |
| parent | 6359e9baf01a7bdc37f18a6eda7b6953e95318f0 (diff) | |
| download | nixlib-bde8efe792b5be621a1fdc169a3b717b5a5b5cc2.tar nixlib-bde8efe792b5be621a1fdc169a3b717b5a5b5cc2.tar.gz nixlib-bde8efe792b5be621a1fdc169a3b717b5a5b5cc2.tar.bz2 nixlib-bde8efe792b5be621a1fdc169a3b717b5a5b5cc2.tar.lz nixlib-bde8efe792b5be621a1fdc169a3b717b5a5b5cc2.tar.xz nixlib-bde8efe792b5be621a1fdc169a3b717b5a5b5cc2.tar.zst nixlib-bde8efe792b5be621a1fdc169a3b717b5a5b5cc2.zip | |
Merge branch 'master' into staging-next
A couple thousand rebuilds have accumulated on master.
Diffstat (limited to 'pkgs/applications/science/misc')
| -rw-r--r-- | pkgs/applications/science/misc/root/5.nix | 7 | ||||
| -rw-r--r-- | pkgs/applications/science/misc/root/default.nix | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/applications/science/misc/root/5.nix b/pkgs/applications/science/misc/root/5.nix index 7f43dfb328a8..1f0fc663647a 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 = [ @@ -73,5 +73,8 @@ stdenv.mkDerivation rec { description = "A data analysis framework"; platforms = platforms.unix; maintainers = with maintainers; [ veprbl ]; + # needs to be adapted to work with modern glibc + # it works on darwin by impurely picking up system's libc headers + broken = stdenv.isLinux; }; } 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 = [ |