fix(build): compile w/o nix again

youwen5 · Nov 17, 2024 · ac095ce · ac095ce
1 parent 0d4159e
commit ac095ce
Show file tree

Hide file tree

Showing 7 changed files with 1,136 additions and 927 deletions.
diff --git a/.envrc b/.envrc
@@ -0,0 +1 @@
+use flake
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,6 @@ client/public/static/external-apps/*
 target
 
 result
+
+stats.html
+splashscreen.html
diff --git a/client/default.nix b/client/default.nix
@@ -8,7 +8,7 @@
   cargo-tauri,
   pkg-config,
   gtk4,
-  webkitgtk_4_0,
+  webkitgtk_4_1,
   libsoup,
   wrapGAppsHook4,
   splashscreen,
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
     [
       splashscreen
     ]
-    ++ lib.optional stdenv.targetPlatform.isLinux webkitgtk_4_0
+    ++ lib.optional stdenv.targetPlatform.isLinux webkitgtk_4_1
     ++ lib.optional stdenv.targetPlatform.isLinux gst_all_1.gstreamer
     ++ lib.optional stdenv.targetPlatform.isLinux gst_all_1.gst-plugins-good
     ++ lib.optional stdenv.targetPlatform.isLinux gst_all_1.gst-plugins-base

diff --git a/client/package.json b/client/package.json
@@ -5,10 +5,11 @@
   "type": "module",
   "scripts": {
     "dev": "vite dev",
-    "build": "vite build",
+    "build": "pnpm run build-splash && vite build",
     "preview": "vite preview",
     "check": "svelte-check --tsconfig ./tsconfig.json",
-    "tauri": "tauri"
+    "tauri": "tauri",
+    "build-splash": "cd ../splash-screen && pnpm install && pnpm build && cp dist/index.html ../client/public/splashscreen.html"
   },
   "devDependencies": {
     "@svelte-plugins/tooltips": "^3.0.0",

diff --git a/client/src-tauri/Cargo.lock b/client/src-tauri/Cargo.lock
diff --git a/flake.nix b/flake.nix
@@ -20,12 +20,40 @@
           pkgs,
           ...
         }:
-        {
+        rec {
           packages = rec {
             default = jankboard;
             jankboard = pkgs.callPackage ./client { inherit splashscreen; };
             splashscreen = pkgs.callPackage ./splash-screen { };
           };
+          devShells.default =
+            let
+              libraries = with pkgs; [
+                gtk3
+                cairo
+                gdk-pixbuf
+                glib
+                dbus
+                openssl_3
+                librsvg
+              ];
+            in
+            pkgs.mkShell {
+              # import dependencies from packages
+              inputsFrom = pkgs.lib.attrsToList packages;
+
+              # additional build inputs required for various rust crates
+              buildInputs = with pkgs; [
+                curl
+                wget
+              ];
+
+              shellHook = ''
+                export LD_LIBRARY_PATH=${pkgs.lib.makeLibraryPath libraries}:$LD_LIBRARY_PATH
+                export XDG_DATA_DIRS=${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}:${pkgs.gtk4}/share/gsettings-schemas/${pkgs.gtk4.name}:$XDG_DATA_DIRS
+              '';
+            };
+
         };
     };
 }