Do not use flake-utils Dependency just for just several lines is ridiculous.

Changes

2 changed files (+68/-91)

• flake.lock
  • @@ -1,23 +1,5 @@
    { "nodes": { - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1761236834,
  • @@ -36,23 +18,7 @@ }
    }, "root": { "inputs": { - "flake-utils": "flake-utils", "nixpkgs": "nixpkgs" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" } } },
• flake.nix
  • @@ -21,72 +21,83 @@ inputs = {
    nixpkgs = { url = "github:nixos/nixpkgs/nixpkgs-unstable"; }; - - flake-utils = { - url = "github:numtide/flake-utils"; - }; }; outputs = - { - self, - nixpkgs, - flake-utils, - }: - flake-utils.lib.eachDefaultSystem ( - system: - let - pkgs = nixpkgs.legacyPackages.${system}; - lib = pkgs.lib; - in - rec { - packages = { + { nixpkgs, ... }: + let + systems = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; + + forEachSystems = + f: + nixpkgs.lib.genAttrs systems ( + system: + f { + inherit system; + pkgs = nixpkgs.legacyPackages.${system}; + } + ); + in + rec { + packages = forEachSystems ( + { pkgs, ... }: + { default = pkgs.callPackage ./nix/package.nix { }; - }; + } + ); - devShell = pkgs.mkShell { - buildInputs = [ - (lib.lists.remove pkgs.zig_0_14.hook packages.default.nativeBuildInputs) - packages.default.buildInputs - ]; + devShells = forEachSystems ( + { pkgs, system }: + { + default = pkgs.mkShell { + buildInputs = [ + (pkgs.lib.lists.remove pkgs.zig_0_14.hook packages.${system}.default.nativeBuildInputs) + packages.${system}.default.buildInputs + ]; - packages = - with pkgs; - [ - # > Source Code Beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA - # https://uncrustify.sourceforge.net/ - uncrustify + packages = + with pkgs; + [ + # > Source Code Beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA + # https://uncrustify.sourceforge.net/ + uncrustify - # For text editors, optional. - # > ZLS is a non-official implementation of the Language Server Protocol for Zig - # https://github.com/zigtools/zls - zls_0_14 + # For text editors, optional. + # > ZLS is a non-official implementation of the Language Server Protocol for Zig + # https://github.com/zigtools/zls + zls_0_14 - # For text editors, optional. - # > Code Intelligence for Vala & Genie - # https://github.com/vala-lang/vala-language-server - vala-language-server + # For text editors, optional. + # > Code Intelligence for Vala & Genie + # https://github.com/vala-lang/vala-language-server + vala-language-server - # Code formatter - # https://dprint.dev/ - dprint + # Code formatter + # https://dprint.dev/ + dprint - # Copyright and license linter based on SPDX - # https://github.com/fsfe/reuse-tool - reuse + # Copyright and license linter based on SPDX + # https://github.com/fsfe/reuse-tool + reuse - # Official formatter for Nix code - # https://hackage.haskell.org/package/nixfmt - nixfmt-rfc-style - ] - # Non macOS packages (not supported, broken, etc.) - ++ (lib.optionals (!stdenv.isDarwin) [ - # For debugging, optional. - # > Valgrind is an instrumentation framework for building dynamic analysis tools - # https://valgrind.org/ - valgrind - ]); - }; - } - ); + # Official formatter for Nix code + # https://hackage.haskell.org/package/nixfmt + nixfmt-rfc-style + ] + # Non macOS packages (not supported, broken, etc.) + ++ (lib.optionals (!stdenv.isDarwin) [ + # For debugging, optional. + # > Valgrind is an instrumentation framework for building dynamic analysis tools + # https://valgrind.org/ + valgrind + ]); + }; + } + ); + }; }