materialize: move to by-name

This commit is contained in:
Gaetan Lepage
2024-12-05 01:11:10 +01:00
parent 162733d9a2
commit 0809ab6602
4 changed files with 7 additions and 21 deletions
@@ -4,14 +4,11 @@
fetchFromGitHub,
fetchzip,
rustPlatform,
bootstrap_cmds,
DiskArbitration,
Foundation,
cmake,
libiconv,
openssl,
perl,
pkg-config,
darwin,
protobuf,
libclang,
rdkafka,
@@ -143,22 +140,16 @@ rustPlatform.buildRustPackage rec {
rustPlatform.bindgenHook
]
# Provides the mig command used by the krb5-src build script
++ lib.optional stdenv.hostPlatform.isDarwin bootstrap_cmds;
++ lib.optional stdenv.hostPlatform.isDarwin darwin.bootstrap_cmds;
# Needed to get openssl-sys to use pkg-config.
OPENSSL_NO_VENDOR = 1;
buildInputs =
[
openssl
rdkafka
libclang
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
libiconv
DiskArbitration
Foundation
];
buildInputs = [
openssl
rdkafka
libclang
];
# the check phase requires linking with rocksdb which can be a problem since
# the rust rocksdb crate is not updated very often.
-5
View File
@@ -11714,11 +11714,6 @@ with pkgs;
yarn-berry = yarn-berry.override { nodejs = nodejs-slim_22; };
};
materialize = callPackage ../servers/sql/materialize {
inherit (buildPackages.darwin) bootstrap_cmds;
inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation;
};
micro-full = micro.wrapper.override {
extraPackages = [
wl-clipboard