xenia/home
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

prismlauncher, also give darwin a version of nixpkgs that allows packages with unsupported platform

Browse Source
This commit is contained in:
xenia 2024-07-26 11:59:44 +02:00
parent e78028c2d3
commit e89e30da99
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
darwin.nix
View File

@ -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 # TODO: nix options should be joint for darwin and nix-os
nix.gc = { nix.gc = {
@ -90,6 +92,8 @@
coreutils coreutils
git git
zulu8 # for minecraft
home-manager home-manager
keepassxc keepassxc
@ -102,6 +106,8 @@
hexfiend hexfiend
inkscape inkscape
pkgs-unsupported.prismlauncher
wireshark wireshark
]; ];

8
flake.nix
View File

@ -38,6 +38,7 @@
outputs = { self, nixpkgs, home-manager, nix-darwin, kak, unispect, ansi-utils, unambig-path, nixos-apple-silicon }: outputs = { self, nixpkgs, home-manager, nix-darwin, kak, unispect, ansi-utils, unambig-path, nixos-apple-silicon }:
let let
mkPkgs = system: import nixpkgs { system = system; config.allowUnfree = true; }; 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 { mkHome = {username, home-dir, prompt-color, system, pkgs} : import ./home/common.nix {
inherit username home-dir prompt-color pkgs; inherit username home-dir prompt-color pkgs;
@ -53,8 +54,8 @@
inherit pkgs; inherit pkgs;
}; };
mkDarwin = {system, pkgs}: import ./darwin.nix { mkDarwin = {system, pkgs, pkgs-unsupported}: import ./darwin.nix {
inherit system pkgs; inherit system pkgs pkgs-unsupported;
nixpkgs-flake = nixpkgs; nixpkgs-flake = nixpkgs;
}; };
@ -88,7 +89,8 @@
let let
system = "aarch64-darwin"; system = "aarch64-darwin";
pkgs = mkPkgs system; pkgs = mkPkgs system;
darwin = mkDarwin { inherit system pkgs; }; pkgs-unsupported = mkPkgsUnsupported system;
darwin = mkDarwin { inherit system pkgs pkgs-unsupported; };
in nix-darwin.lib.darwinSystem { in nix-darwin.lib.darwinSystem {
modules = [ darwin ]; modules = [ darwin ];
}; };