Static link libuv and luajit + minor changes

1 files changed, 25 insertions, 22 deletions

diff --git a/flake.nix b/flake.nix
index 34c8509..3626549 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,27 +7,25 @@
   outputs = { self, nixpkgs, flake-utils, ... }:
     flake-utils.lib.eachDefaultSystem (system:
       let
-        pkgs = import nixpkgs { inherit system; };
+        pkgs = import nixpkgs { inherit system; config.allowUnsupportedSystem = true; };
 
-        lua-libluv = with pkgs; luajitPackages.libluv.overrideAttrs (self: rec {
-          version = "1.50.0-1";
-          knownRockspec = (fetchurl {
-            url    = "mirror://luarocks/luv-${version}.rockspec";
-            sha256 = "sha256-IL2EejtmT0pw0cAupMz0gvP3a19NPsc45W1RaoeGJgY=";
-          }).outPath;
-          src = fetchurl {
-            url    = "https://github.com/luvit/luv/releases/download/${version}/luv-${version}.tar.gz";
-            sha256 = "sha256-2GfDAk2cmB1U8u3YPhP9bcEVjwYIY197HA9rVYa1vDQ=";
-          };
-        });
+        myPkgs = with pkgs; {
+          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;
+        };
 
-        dependencies = with pkgs; [
-          qt6.full
-          luajit
-          libuv
-          lua-libluv
-          # libcef
-          # nss
+        dependencies = [
+          myPkgs.qt.qtbase
+          myPkgs.qt.qtwebengine
+          myPkgs.luajit
+          myPkgs.libuv
+          myPkgs.lua-libluv
         ];
       in {
         devShells.default = pkgs.mkShell rec {
@@ -40,7 +38,10 @@
             valgrind
           ] ++ dependencies;
 
+          nativeBuildInputs = with pkgs; [gobject-introspection];
+
           LD_LIBRARY_PATH = "${pkgs.lib.makeLibraryPath buildInputs}";
+          FOOBARITY = "${lua-libluv}";
         };
 
         packages.default = pkgs.stdenv.mkDerivation {
@@ -48,13 +49,15 @@
           version = "0.0.0";
           src = ./.;
 
-          buildInputs = with pkgs; [
-            qt6.qtbase
+          buildInputs = [
+            myPkgs.qt.qtbase
           ] ++ dependencies;
 
+          NIX_CFLAGS_COMPILE = "-DRELEASE=1";
+
           nativeBuildInputs = with pkgs; [
             cmake
-            qt6.wrapQtAppsHook
+            myPkgs.qt.wrapQtAppsHook
             pkg-config
           ];
         };