Unverified Commit df10ec72 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

mysql-shell: add libutil on darwin; refactor to new SDK pattern (#354735)

parents b9c73c53 9ba75eb7

pkgs/development/tools/mysql-shell/8.nix

+3 −4
Original line number Diff line number Diff line
@@ -5,9 +5,8 @@ 
, fetchurl

, git

, cctools

, DarwinTools

, darwin

, makeWrapper

, CoreServices

, bison

, openssl

, protobuf
@@ -73,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { 


  nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ]

    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ]

    ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools DarwinTools ];

    ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools darwin.DarwinTools ];



  buildInputs = [

    curl
@@ -96,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: { 
    antlr.runtime.cpp

  ] ++ pythonDeps

  ++ lib.optionals stdenv.hostPlatform.isLinux [ libtirpc ]

  ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ];

  ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libutil ];



  preConfigure = ''

    # Build MySQL

pkgs/development/tools/mysql-shell/innovation.nix

+3 −4
Original line number Diff line number Diff line
@@ -5,9 +5,8 @@ 
, fetchurl

, git

, cctools

, DarwinTools

, darwin

, makeWrapper

, CoreServices

, bison

, openssl

, protobuf
@@ -73,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { 


  nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ]

    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ]

    ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools DarwinTools ];

    ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools darwin.DarwinTools ];



  buildInputs = [

    curl
@@ -96,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: { 
    antlr.runtime.cpp

  ] ++ pythonDeps

  ++ lib.optionals stdenv.hostPlatform.isLinux [ libtirpc ]

  ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ];

  ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libutil ];



  preConfigure = ''

    # Build MySQL

pkgs/top-level/all-packages.nix

+0 −4
Original line number Diff line number Diff line
@@ -540,8 +540,6 @@ with pkgs; 














  inherit ({















    mysql-shell_8 = callPackage ../development/tools/mysql-shell/8.nix {













      inherit (darwin) DarwinTools;













      inherit (darwin.apple_sdk.frameworks) CoreServices;















      antlr = antlr4_10;















      icu =  icu73;















      protobuf = protobuf_24;









@@ -551,8 +549,6 @@ with pkgs;













  ;





























  mysql-shell-innovation = callPackage ../development/tools/mysql-shell/innovation.nix {













    inherit (darwin) DarwinTools;













    inherit (darwin.apple_sdk.frameworks) CoreServices;















    antlr = antlr4_10;















    icu =  icu73;















    protobuf = protobuf_24;