diff --git a/darwin.nix b/darwin.nix index bcb69013..b6ffe32c 100644 --- a/darwin.nix +++ b/darwin.nix @@ -1,5 +1,7 @@ -{ system, pkgs, nixpkgs-flake, ... }: +{ system, pkgs, pkgs-unsupported, nixpkgs-flake, ... }: +let prismlauncher = pkgs-unsupported.prismlauncher.override { jdks = [ pkgs.jdk8 pkgs.jdk21 ]; }; +in { # TODO: nix options should be joint for darwin and nix-os nix.gc = { @@ -90,6 +92,8 @@ coreutils git + zulu8 # for minecraft + home-manager keepassxc @@ -102,6 +106,8 @@ hexfiend inkscape + pkgs-unsupported.prismlauncher + wireshark ]; diff --git a/flake.nix b/flake.nix index d3b36f1c..2869f32e 100644 --- a/flake.nix +++ b/flake.nix @@ -38,6 +38,7 @@ outputs = { self, nixpkgs, home-manager, nix-darwin, kak, unispect, ansi-utils, unambig-path, nixos-apple-silicon }: let mkPkgs = system: import nixpkgs { system = system; config.allowUnfree = true; }; + mkPkgsUnsupported = system: import nixpkgs { system = system; config.allowUnfree = true; config.allowUnsupportedSystem = true; }; mkHome = {username, home-dir, prompt-color, system, pkgs} : import ./home/common.nix { inherit username home-dir prompt-color pkgs; @@ -53,8 +54,8 @@ inherit pkgs; }; - mkDarwin = {system, pkgs}: import ./darwin.nix { - inherit system pkgs; + mkDarwin = {system, pkgs, pkgs-unsupported}: import ./darwin.nix { + inherit system pkgs pkgs-unsupported; nixpkgs-flake = nixpkgs; }; @@ -88,7 +89,8 @@ let system = "aarch64-darwin"; pkgs = mkPkgs system; - darwin = mkDarwin { inherit system pkgs; }; + pkgs-unsupported = mkPkgsUnsupported system; + darwin = mkDarwin { inherit system pkgs pkgs-unsupported; }; in nix-darwin.lib.darwinSystem { modules = [ darwin ]; };