omega restructuring + a bunch of changes i have made over the last weeks
This commit is contained in:
27
flake.nix
27
flake.nix
@@ -1,6 +1,5 @@
|
||||
{
|
||||
inputs = {
|
||||
# nixpkgs 35.11 still contains rust 1.73
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
|
||||
fenix = {
|
||||
@@ -30,7 +29,6 @@
|
||||
let
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
|
||||
#os
|
||||
osToolchain = fenix.packages.${system}.latest.toolchain;
|
||||
osCrane = (crane.mkLib pkgs).overrideToolchain osToolchain;
|
||||
|
||||
@@ -177,6 +175,10 @@ in {
|
||||
pkgs.pkg-config
|
||||
pkgs.gobject-introspection
|
||||
pkgs.gobject-introspection.dev
|
||||
pkgs.systemd
|
||||
pkgs.rsync
|
||||
pkgs.deno
|
||||
pkgs.openssh
|
||||
|
||||
# thanks to: https://github.com/NixOS/nixpkgs/pull/496279/changes
|
||||
(pkgs.buildWasmBindgenCli rec {
|
||||
@@ -233,7 +235,7 @@ in {
|
||||
];
|
||||
|
||||
};
|
||||
default = pkgs.mkShell {
|
||||
default = pkgs.mkShell rec {
|
||||
|
||||
MIZE_BUILD_CONFIG = let
|
||||
settingsFormat = pkgs.formats.toml { };
|
||||
@@ -252,6 +254,15 @@ in {
|
||||
pkgs.pkg-config
|
||||
pkgs.gobject-introspection
|
||||
pkgs.gobject-introspection.dev
|
||||
pkgs.systemd
|
||||
pkgs.rsync
|
||||
pkgs.openssh
|
||||
pkgs.git
|
||||
|
||||
# to build ../grid
|
||||
pkgs.rustPlatform.bindgenHook
|
||||
pkgs.pipewire.dev
|
||||
pkgs.alsa-lib.dev
|
||||
|
||||
# thanks to: https://github.com/NixOS/nixpkgs/pull/496279/changes
|
||||
(pkgs.buildWasmBindgenCli rec {
|
||||
@@ -305,7 +316,17 @@ in {
|
||||
harfbuzz
|
||||
librsvg
|
||||
libsoup_3
|
||||
|
||||
# to build ../grid
|
||||
libxkbcommon
|
||||
alsa-lib
|
||||
libgcc.lib
|
||||
libxcb
|
||||
pipewire
|
||||
wayland
|
||||
];
|
||||
|
||||
LIBRARY_PATH = LD_LIBRARY_PATH;
|
||||
|
||||
};
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user