WIP: fix liburing

girlbossceo · May 26, 2024 · 971a8b1 · 971a8b1
1 parent 001138a
commit 971a8b1
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 21 deletions.
diff --git a/flake.nix b/flake.nix
@@ -42,6 +42,24 @@
             (builtins.fromJSON (builtins.readFile ./flake.lock))
               .nodes.rocksdb.original.ref;
         });
+        # TODO: remove once TODO is available in our nixpkgs
+        liburing = pkgs.liburing.overrideAttrs (old: {
+          # the configure script doesn't support these, and unconditionally
+          # builds both static and dynamic libraries.
+          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"
+            }
+          '';
+        });
       });
 
       scopeHost = mkScope pkgsHost;

diff --git a/nix/pkgs/main/default.nix b/nix/pkgs/main/default.nix
@@ -8,9 +8,7 @@
 , rocksdb
 , rust
 , rust-jemalloc-sys
-, snappy
 , stdenv
-, pkgsStatic
 
 # Options (keep sorted)
 , default_features ? true
@@ -48,6 +46,8 @@ features'' = lib.subtractLists disable_features' features';
 
 featureEnabled = feature : builtins.elem feature features'';
 
+enableLiburing = featureEnabled "io_uring" && stdenv.isLinux;
+
 # This derivation will set the JEMALLOC_OVERRIDE variable, causing the
 # tikv-jemalloc-sys crate to use the nixpkgs jemalloc instead of building it's
 # own. In order for this to work, we need to set flags on the build that match
@@ -61,15 +61,9 @@ rust-jemalloc-sys' = (rust-jemalloc-sys.override {
     # tikv-jemalloc-sys/profiling feature
     lib.optional (featureEnabled "jemalloc_prof") "--enable-prof";
 });
-liburing' = pkgsStatic.liburing.overrideAttrs {
-  configureFlags = []; # liburing's configure file is handwritten so the default assumptions don't apply
-  isStatic = true;
-};
 
 buildDepsOnlyEnv =
   let
-    uring = featureEnabled "io_uring" && stdenv.isLinux;
-    extraDeps = lib.optionals uring [ liburing'.dev liburing'.out];
     rocksdb' = (rocksdb.override {
       jemalloc = rust-jemalloc-sys';
       # rocksdb fails to build with prefixed jemalloc, which is required on
@@ -83,7 +77,8 @@ buildDepsOnlyEnv =
       # TODO: static rocksdb fails to build on darwin
       # build log at <https://girlboss.ceo/~strawberry/pb/JjGH>
       meta.broken = stdenv.hostPlatform.isStatic && stdenv.isDarwin;
-      propagatedBuildInputs = old.propagatedBuildInputs ++ extraDeps;
+      # TODO: switch to enableUring option once TODO is available in our nixpkgs
+      buildInputs = old.buildInputs ++ lib.optional enableLiburing liburing;
     });
   in
   {
@@ -104,18 +99,11 @@ buildDepsOnlyEnv =
 buildPackageEnv = {
   CONDUWUIT_VERSION_EXTRA = inputs.self.shortRev or inputs.self.dirtyShortRev or "";
 } // buildDepsOnlyEnv // {
-  CARGO_BUILD_RUSTFLAGS =
-     let
-       uring = featureEnabled "io_uring";
-       valid = (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isx86_64)
-              && stdenv.hostPlatform.isStatic
-              && !stdenv.isDarwin
-              && !stdenv.cc.bintools.isLLVM;
-     in
-       buildDepsOnlyEnv.CARGO_BUILD_RUSTFLAGS
-       + lib.optionalString (uring && valid) " -L${lib.getLib liburing'}/lib/ -luring"
-       + " -L${lib.getLib snappy}/lib/ -lsnappy";
-  };
+  # Only needed in static stdenv because these are transitive dependencies of rocksdb?
+  CARGO_BUILD_RUSTFLAGS = buildDepsOnlyEnv.CARGO_BUILD_RUSTFLAGS
+    + lib.optionalString (enableLiburing && stdenv.hostPlatform.isStatic)
+      " -L${lib.getLib liburing}/lib -luring";
+};