Fix font atlas crash and make Nix build first-class
Defer edit-mode font switch to next frame via RequestLoadFont() to avoid modifying the locked ImFontAtlas between NewFrame() and Render(). Rework Nix packaging: split nativeBuildInputs/buildInputs correctly, add devShells for nix develop, desktop file for kge, per-variant pname and meta.mainProgram, and an overlay for NixOS configs. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
25
flake.nix
25
flake.nix
@@ -3,8 +3,7 @@
|
||||
|
||||
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
|
||||
outputs =
|
||||
inputs@{ self, nixpkgs, ... }:
|
||||
outputs = { self, nixpkgs, ... }:
|
||||
let
|
||||
eachSystem = nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed;
|
||||
pkgsFor = system: import nixpkgs { inherit system; };
|
||||
@@ -17,5 +16,27 @@
|
||||
kge = (pkgsFor system).callPackage ./default.nix { graphical = true; graphical-qt = false; };
|
||||
qt = (pkgsFor system).callPackage ./default.nix { graphical = true; graphical-qt = true; };
|
||||
});
|
||||
|
||||
devShells = eachSystem (system:
|
||||
let pkgs = pkgsFor system;
|
||||
in {
|
||||
default = pkgs.mkShell {
|
||||
inputsFrom = [ self.packages.${system}.kge ];
|
||||
packages = with pkgs; [ gdb valgrind ];
|
||||
};
|
||||
terminal = pkgs.mkShell {
|
||||
inputsFrom = [ self.packages.${system}.kte ];
|
||||
};
|
||||
qt = pkgs.mkShell {
|
||||
inputsFrom = [ self.packages.${system}.qt ];
|
||||
packages = with pkgs; [ gdb valgrind ];
|
||||
};
|
||||
}
|
||||
);
|
||||
|
||||
overlays.default = final: prev: {
|
||||
kte = self.packages.${final.system}.kte;
|
||||
kge = self.packages.${final.system}.kge;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user