qbit/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Weijia Wang 2024-11-10 01:56:16 +01:00 committed by GitHub
commit df10ec72ac
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/tools/mysql-shell/8.nix
View File

@ -5,9 +5,8 @@
, fetchurl , fetchurl
, git , git
, cctools , cctools
, DarwinTools , darwin
, makeWrapper , makeWrapper
, CoreServices
, bison , bison
, openssl , openssl
, protobuf , protobuf
@ -73,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ] nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ]
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools DarwinTools ]; ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools darwin.DarwinTools ];
buildInputs = [ buildInputs = [
curl curl
@ -96,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
antlr.runtime.cpp antlr.runtime.cpp
] ++ pythonDeps ] ++ pythonDeps
++ lib.optionals stdenv.hostPlatform.isLinux [ libtirpc ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libtirpc ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libutil ];
preConfigure = '' preConfigure = ''
# Build MySQL # Build MySQL

7
pkgs/development/tools/mysql-shell/innovation.nix
View File

@ -5,9 +5,8 @@
, fetchurl , fetchurl
, git , git
, cctools , cctools
, DarwinTools , darwin
, makeWrapper , makeWrapper
, CoreServices
, bison , bison
, openssl , openssl
, protobuf , protobuf
@ -73,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ] nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ]
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools DarwinTools ]; ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools darwin.DarwinTools ];
buildInputs = [ buildInputs = [
curl curl
@ -96,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
antlr.runtime.cpp antlr.runtime.cpp
] ++ pythonDeps ] ++ pythonDeps
++ lib.optionals stdenv.hostPlatform.isLinux [ libtirpc ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libtirpc ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libutil ];
preConfigure = '' preConfigure = ''
# Build MySQL # Build MySQL

4
pkgs/top-level/all-packages.nix
View File

@ -540,8 +540,6 @@ with pkgs;
inherit ({ inherit ({
mysql-shell_8 = callPackage ../development/tools/mysql-shell/8.nix { mysql-shell_8 = callPackage ../development/tools/mysql-shell/8.nix {
inherit (darwin) DarwinTools;
inherit (darwin.apple_sdk.frameworks) CoreServices;
antlr = antlr4_10; antlr = antlr4_10;
icu = icu73; icu = icu73;
protobuf = protobuf_24; protobuf = protobuf_24;
@ -551,8 +549,6 @@ with pkgs;
; ;
mysql-shell-innovation = callPackage ../development/tools/mysql-shell/innovation.nix { mysql-shell-innovation = callPackage ../development/tools/mysql-shell/innovation.nix {
inherit (darwin) DarwinTools;
inherit (darwin.apple_sdk.frameworks) CoreServices;
antlr = antlr4_10; antlr = antlr4_10;
icu = icu73; icu = icu73;
protobuf = protobuf_24; protobuf = protobuf_24;