From 0d728071e3287a71ce7928640e63c19f4d0ab00f Mon Sep 17 00:00:00 2001 From: Akshay Nair Date: Sat, 22 Mar 2025 17:17:15 +0530 Subject: Build fixes + formatting --- flake.nix | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) (limited to 'flake.nix') diff --git a/flake.nix b/flake.nix index 49cfb14..5834f8b 100644 --- a/flake.nix +++ b/flake.nix @@ -2,14 +2,9 @@ inputs = { flake-utils.url = "github:numtide/flake-utils"; nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - - lua-luv-source = { - url = "git+https://github.com/luvit/luv?submodules=1"; - flake = false; - }; }; - outputs = { self, nixpkgs, flake-utils, lua-luv-source, ... }: + outputs = { self, nixpkgs, flake-utils, ... }: flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; }; @@ -19,32 +14,32 @@ luajit libuv luajitPackages.libluv - # luajitPackages.luv # libcef # nss ]; in { - packages.default = pkgs.stdenv.mkDerivation { - pname = "null-browser"; - version = "0.0.0"; - src = ./.; - - buildInputs = with pkgs; [ - qt6.qtbase - ] ++ dependencies; - nativeBuildInputs = with pkgs; [ cmake qt6.wrapQtAppsHook pkg-config ]; - }; - devShells.default = pkgs.mkShell rec { buildInputs = with pkgs; [ cmake gnumake clang-tools pkg-config + gdb # vcpkg ] ++ dependencies; LD_LIBRARY_PATH = "${pkgs.lib.makeLibraryPath buildInputs}"; }; + + packages.default = pkgs.stdenv.mkDerivation { + pname = "null-browser"; + version = "0.0.0"; + src = ./.; + + buildInputs = with pkgs; [ + qt6.qtbase + ] ++ dependencies; + nativeBuildInputs = with pkgs; [ cmake qt6.wrapQtAppsHook pkg-config ]; + }; }); } -- cgit v1.3.1