diff --git a/flake.nix b/flake.nix index 499d828d..b252193e 100644 --- a/flake.nix +++ b/flake.nix @@ -50,16 +50,6 @@ configureFlags = pkgs.lib.subtractLists [ "--enable-static" "--disable-shared" ] old.configureFlags; - - postInstall = old.postInstall + '' - # we remove the extra outputs - # - # we need to do this to prevent rocksdb from trying to link the - # static library in a dynamic stdenv - rm $out/lib/liburing*${ - if pkgs.stdenv.hostPlatform.isStatic then ".so*" else ".a" - } - ''; }); }); diff --git a/nix/pkgs/main/default.nix b/nix/pkgs/main/default.nix index f91a9cdd..5c8ade13 100644 --- a/nix/pkgs/main/default.nix +++ b/nix/pkgs/main/default.nix @@ -43,7 +43,7 @@ features'' = lib.subtractLists disable_features' features'; featureEnabled = feature : builtins.elem feature features''; -enableLiburing = featureEnabled "io_uring" && stdenv.isLinux; +enableLiburing = featureEnabled "io_uring" && !stdenv.isDarwin; # This derivation will set the JEMALLOC_OVERRIDE variable, causing the # tikv-jemalloc-sys crate to use the nixpkgs jemalloc instead of building it's @@ -74,8 +74,7 @@ buildDepsOnlyEnv = # TODO: static rocksdb fails to build on darwin # build log at meta.broken = stdenv.hostPlatform.isStatic && stdenv.isDarwin; - # TODO: switch to enableUring option once https://github.com/NixOS/nixpkgs/pull/314945 is available - buildInputs = old.buildInputs ++ lib.optional enableLiburing liburing; + enableLiburing = enableLiburing; }); in {