From 8caba9164964224dd913786c88c685b1eb529296 Mon Sep 17 00:00:00 2001 From: Manuel Palenzuela Date: Mon, 20 Jun 2022 18:14:28 +0200 Subject: Move minecraft override to the base overlay --- hosts/phobos/home.nix | 4 ++-- overlays/base/default.nix | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hosts/phobos/home.nix b/hosts/phobos/home.nix index 4158316..a697850 100644 --- a/hosts/phobos/home.nix +++ b/hosts/phobos/home.nix @@ -1,14 +1,14 @@ { config, lib, pkgs, inputs, user, hostname, secrets, ... }: { home.packages = with pkgs; [ - (minecraft.override { jre = pkgs.jdk8; }) + minecraft jetbrains.idea-community calibre qtcreator custom.anime-downloader custom.adl custom.trackma - kcc custom.kindlegen + kcc ]; } diff --git a/overlays/base/default.nix b/overlays/base/default.nix index 46eb48c..a62356f 100644 --- a/overlays/base/default.nix +++ b/overlays/base/default.nix @@ -46,6 +46,8 @@ final: prev: }; }; + minecraft = prev.minecraft.override { jre = prev.jdk8; }; + xwinwrap = prev.xwinwrap.overrideAttrs (old: { src = prev.fetchFromGitHub { owner = "Baitinq"; -- cgit 1.4.1