diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2019-06-19 23:21:10 +0200 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2019-07-03 22:20:22 +0200 |
| commit | da7bcec42f7c9223e36d8ed472f1201552c5d670 (patch) | |
| tree | 0eb084b25657a87d39c63241e773a12ce989b45b /pkgs | |
| parent | 56127c23c2ce78f8ae31f6e935716e001dbfc16d (diff) | |
| download | nixlib-da7bcec42f7c9223e36d8ed472f1201552c5d670.tar nixlib-da7bcec42f7c9223e36d8ed472f1201552c5d670.tar.gz nixlib-da7bcec42f7c9223e36d8ed472f1201552c5d670.tar.bz2 nixlib-da7bcec42f7c9223e36d8ed472f1201552c5d670.tar.lz nixlib-da7bcec42f7c9223e36d8ed472f1201552c5d670.tar.xz nixlib-da7bcec42f7c9223e36d8ed472f1201552c5d670.tar.zst nixlib-da7bcec42f7c9223e36d8ed472f1201552c5d670.zip | |
root: remove cf-private
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/science/misc/root/5.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/science/misc/root/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/applications/science/misc/root/5.nix b/pkgs/applications/science/misc/root/5.nix index 871f5ece9cfe..0199373b082c 100644 --- a/pkgs/applications/science/misc/root/5.nix +++ b/pkgs/applications/science/misc/root/5.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, cmake, pcre, pkgconfig, python2 , libX11, libXpm, libXft, libXext, libGLU_combined, zlib, libxml2, lzma, gsl_1 -, Cocoa, OpenGL, cf-private, noSplash ? false }: +, Cocoa, OpenGL, 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 cf-private ] + ++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ; patches = [ diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 8b9573ce4e8b..2ec1ded68a26 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, cf-private, noSplash ? false }: +, Cocoa, OpenGL, 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 cf-private ] + ++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ; patches = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6747577c2947..44b78298f6b0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23013,13 +23013,11 @@ in ns-3 = callPackage ../development/libraries/science/networking/ns3 { }; root = callPackage ../applications/science/misc/root { - inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv; }; root5 = lowPrio (callPackage ../applications/science/misc/root/5.nix { - inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv; }); |