From 85a2c290f922f648e5e9f0e69c03116f2d0aeaa6 Mon Sep 17 00:00:00 2001 From: Akshay Nair Date: Sun, 6 Apr 2025 20:23:55 +0530 Subject: Change build setup to install lua prefix correctly + static build libluv --- flake.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'flake.nix') diff --git a/flake.nix b/flake.nix index 3626549..3d06d0d 100644 --- a/flake.nix +++ b/flake.nix @@ -8,16 +8,15 @@ flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; config.allowUnsupportedSystem = true; }; + inherit (pkgs) pkgsStatic; - myPkgs = with pkgs; { + myPkgs = { libuv = pkgsStatic.libuv; luajit = pkgsStatic.luajit; - qt = qt6; # pkgsStatic.qt6 - lua-libluv = lua-libluv; - }; - - lua-libluv = pkgs.callPackage (import ./nix/libluv.nix) { - inherit (myPkgs) libuv luajit; + qt = pkgs.qt6; # pkgsStatic.qt6 + lua-libluv = pkgs.callPackage (import ./nix/libluv.nix) { + inherit (myPkgs) libuv luajit; + }; }; dependencies = [ @@ -41,7 +40,7 @@ nativeBuildInputs = with pkgs; [gobject-introspection]; LD_LIBRARY_PATH = "${pkgs.lib.makeLibraryPath buildInputs}"; - FOOBARITY = "${lua-libluv}"; + FOOBARITY = "${myPkgs.lua-libluv}"; }; packages.default = pkgs.stdenv.mkDerivation { -- cgit v1.3.1