nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 00:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

mysql-shell-innovation: add libutil on darwin; refactor to new SDK pattern

Browse Source
This commit is contained in:
Theodore Ni 2024-11-09 01:50:56 -08:00
parent 194e35dd63
commit 9ba75eb753
No known key found for this signature in database
GPG Key ID: 48B67583BDDD4474
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

@ -549,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;