From e7eb35626cf4b817c8b23c656bd3cffd49b1ebb6 Mon Sep 17 00:00:00 2001 From: Kyle Isom Date: Sun, 30 Nov 2025 21:07:41 -0800 Subject: [PATCH] NixOS build --- GUIRenderer.cc | 3 ++- default-gui.nix | 2 ++ default.nix | 3 +++ flake.lock | 10 +++++----- flake.nix | 29 +++++++++++++---------------- 5 files changed, 25 insertions(+), 22 deletions(-) diff --git a/GUIRenderer.cc b/GUIRenderer.cc index 2bbf4e5..894c257 100644 --- a/GUIRenderer.cc +++ b/GUIRenderer.cc @@ -1,8 +1,9 @@ +#include #include #include +#include #include #include -#include #include #include diff --git a/default-gui.nix b/default-gui.nix index e91ee77..4d93678 100644 --- a/default-gui.nix +++ b/default-gui.nix @@ -45,6 +45,8 @@ stdenv.mkDerivation { installManPage ../docs/kte.1 installManPage ../docs/kge.1 + mkdir -p $out/share/icons + cp ../kge.png $out/share/icons/ runHook postInstall ''; diff --git a/default.nix b/default.nix index fb2d6a4..4d93678 100644 --- a/default.nix +++ b/default.nix @@ -45,6 +45,9 @@ stdenv.mkDerivation { installManPage ../docs/kte.1 installManPage ../docs/kge.1 + mkdir -p $out/share/icons + cp ../kge.png $out/share/icons/ + runHook postInstall ''; } diff --git a/flake.lock b/flake.lock index ee50fc6..a7457cc 100644 --- a/flake.lock +++ b/flake.lock @@ -2,15 +2,15 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1764242076, - "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", - "owner": "nixos", + "lastModified": 1764517877, + "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", + "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" diff --git a/flake.nix b/flake.nix index 3f1790d..5f8be84 100644 --- a/flake.nix +++ b/flake.nix @@ -1,21 +1,18 @@ { - description = "Kyle's Text Editor"; + description = "kyle's text editor"; - inputs = { - nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; - }; + inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - outputs = - { self, nixpkgs }: + outputs = inputs @ { self, nixpkgs, ... }: let - pkgs = import nixpkgs { system = "x86_64-linux"; }; - in - { - packages.x86_64-linux = { - default = pkgs.callPackage ./default-nogui.nix { }; - kge = pkgs.callPackage ./default-gui.nix { }; - kte = pkgs.callPackage ./default-nogui.nix { }; - full = pkgs.callPackage ./default.nix { }; - }; + eachSystem = nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed; + pkgsFor = system: import nixpkgs { inherit system; }; + in { + packages = eachSystem (system: { + default = (pkgsFor system).callPackage ./default-nogui.nix { }; + kge = (pkgsFor system).callPackage ./default-gui.nix { }; + kte = (pkgsFor system).callPackage ./default-nogui.nix { }; + full = (pkgsFor system).callPackage ./default.nix { }; + }); }; -} +} \ No newline at end of file