diff options
Diffstat (limited to 'pkgs/applications/science/misc/root')
-rw-r--r-- | pkgs/applications/science/misc/root/5.nix | 10 | ||||
-rw-r--r-- | pkgs/applications/science/misc/root/default.nix | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/applications/science/misc/root/5.nix b/pkgs/applications/science/misc/root/5.nix index d8e6ae06a24..144827413b5 100644 --- a/pkgs/applications/science/misc/root/5.nix +++ b/pkgs/applications/science/misc/root/5.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ pcre python2 zlib libxml2 lz4 lzma gsl_1 xxHash ] - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] - ++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] + ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] + ++ lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ; patches = [ @@ -30,14 +30,14 @@ stdenv.mkDerivation rec { preConfigure = '' patchShebangs build/unix/ - ln -s ${stdenv.lib.getDev stdenv.cc.libc}/include/AvailabilityMacros.h cint/cint/include/ + ln -s ${lib.getDev stdenv.cc.libc}/include/AvailabilityMacros.h cint/cint/include/ '' # Fix CINTSYSDIR for "build" version of rootcint # This is probably a bug that breaks out-of-source builds + '' substituteInPlace cint/cint/src/loadfile.cxx\ --replace 'env = "cint";' 'env = "'`pwd`'/cint";' - '' + stdenv.lib.optionalString noSplash '' + '' + lib.optionalString noSplash '' substituteInPlace rootx/src/rootx.cxx --replace "gNoLogo = false" "gNoLogo = true" ''; @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { "-Dxml=ON" "-Dxrootd=OFF" ] - ++ stdenv.lib.optional stdenv.isDarwin "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"; + ++ lib.optional stdenv.isDarwin "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"; setupHook = ./setup-hook.sh; diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 8bfde114beb..425d3e1e4b9 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { --replace 'set(lcgpackages ' '#set(lcgpackages ' patchShebangs build/unix/ - '' + stdenv.lib.optionalString noSplash '' + '' + lib.optionalString noSplash '' substituteInPlace rootx/src/rootx.cxx --replace "gNoLogo = false" "gNoLogo = true" ''; @@ -70,8 +70,8 @@ stdenv.mkDerivation rec { "-Dxml=ON" "-Dxrootd=OFF" ] - ++ stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.lib.getDev stdenv.cc.libc}/include" - ++ stdenv.lib.optionals stdenv.isDarwin [ + ++ lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${lib.getDev stdenv.cc.libc}/include" + ++ lib.optionals stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" "-DCMAKE_DISABLE_FIND_PACKAGE_Python2=TRUE" |