From 150c0640cf9872ace787581352b4466925f0ca97 Mon Sep 17 00:00:00 2001 From: Sapphire Date: Thu, 18 Jun 2026 21:13:44 -0500 Subject: [PATCH] Sync flake with main --- flake.nix | 85 +++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 67 insertions(+), 18 deletions(-) diff --git a/flake.nix b/flake.nix index a46b02838..1767af25b 100644 --- a/flake.nix +++ b/flake.nix @@ -8,31 +8,80 @@ flake-parts.url = "github:hercules-ci/flake-parts"; }; - outputs = inputs@{ self, nixpkgs, nixpkgs-jdk24, flake-parts, ... }: + outputs = + inputs@{ + self, + nixpkgs, + nixpkgs-jdk24, + flake-parts, + ... + }: flake-parts.lib.mkFlake { inherit inputs; } { systems = [ "x86_64-linux" ]; - perSystem = { pkgs, system, ... }: + perSystem = + { system, pkgs, ... }: let - jdkPkgs = import nixpkgs-jdk24 { inherit system; }; - java = jdkPkgs.javaPackages.compiler.temurin-bin.jdk-24; + java = (import nixpkgs-jdk24 { inherit system; }).jdk24; - runtimeLibs = pkgs: (with pkgs; [ - java + runtimeLibs = + pkgs: + (with pkgs; [ + java - alsa-lib at-spi2-atk at-spi2-core cairo cups dbus expat - gdk-pixbuf glib gtk3 libdrm libgbm libglvnd libnotify - libxkbcommon mesa nspr nss pango systemd vulkan-loader - wayland libx11 libxcomposite libxdamage - libxext libxfixes libxrandr libxcb - libxshmfence libusb1 udev libxcrypt-legacy - rpm fpm + alsa-lib + libpulseaudio + at-spi2-atk + at-spi2-core + cairo + cups + dbus + expat + gdk-pixbuf + glib + gtk3 + libdrm + libgbm + libglvnd + libnotify + libxkbcommon + mesa + nspr + nss + pango + systemd + vulkan-loader + wayland + libX11 + libXcomposite + libXdamage + libXext + libXfixes + libXrandr + libxcb + libxshmfence + libusb1 + udev + libxcrypt-legacy + rpm + fpm - wineWow64Packages.stable - zlib squashfsTools fakeroot libarchive icu - nodejs_22 pnpm pkg-config python3 gcc gnumake binutils git - node-gyp-build - ]); + wineWow64Packages.stable + zlib + squashfsTools + fakeroot + libarchive + icu + nodejs_22 + pnpm + pkg-config + python3 + gcc + gnumake + binutils + git + node-gyp-build + ]); slimeShell = pkgs.buildFHSEnv { name = "slimevr-env";