From 30ab2d3e6e5779ad4af03e1e96471c2a903ca430 Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Sat, 27 Apr 2024 15:11:42 +0200 Subject: [PATCH] build/nix: Put runtime deps in rpath --- src/build/nix/default.nix | 60 ++++++++++++++++++++++++++++----------- 1 file changed, 44 insertions(+), 16 deletions(-) diff --git a/src/build/nix/default.nix b/src/build/nix/default.nix index c651b79..fe59ad9 100644 --- a/src/build/nix/default.nix +++ b/src/build/nix/default.nix @@ -1,20 +1,48 @@ { - rustPlatform - , pkg-config - , alsa-lib - , libcap + rustPlatform, + pkg-config, + alsa-lib, + libcap, + libxkbcommon, + wayland, + udev, + vulkan-loader, + xorg, + lib, }: rustPlatform.buildRustPackage rec { - src = ../../..; - pname = "outfly"; - version = "0.8.0"; - cargoLock = { - lockFile = "${src}/Cargo.lock"; - }; - nativeBuildInputs = [pkg-config]; - buildInputs = [ - alsa-lib - libcap - #libgcc - ]; + src = ../../..; + pname = "outfly"; + version = "0.8.1"; + cargoLock = { + lockFile = "${src}/Cargo.lock"; + }; + nativeBuildInputs = [ pkg-config ]; + + buildNoDefaultFeatures = true; + buildFeatures = [ + "x11" + "embed_assets" + ]; + buildInputs = [ + alsa-lib + libcap + ]; + postFixup = + let + runtimeDeps = [ + vulkan-loader + wayland + libxkbcommon + xorg.libX11 + xorg.libXrandr + xorg.libXi + xorg.libXcursor + ]; + libPath = lib.makeLibraryPath runtimeDeps; + in + '' + patchelf $out/bin/outfly \ + --add-rpath ${libPath} + ''; }