I managed to fix nixpkgs-master, thanks NobbZ!

Signed-off-by: Alex Stan <stan.alexandru@ichb.ro>
This commit is contained in:
Alex Stan 2023-05-13 16:40:29 +03:00
parent f00e202523
commit 9a7264ddca

View file

@ -1,12 +1,16 @@
{ pkgs, inputs, lib, ... }: { pkgs, inputs, lib, config, ... }:
let let
nix-software-center = inputs.nix-software-center.packages.${pkgs.system}.nix-software-center; nix-software-center = inputs.nix-software-center.packages.${pkgs.system}.nix-software-center;
doom-emacs = inputs.nix-doom-emacs.packages.${pkgs.system}.default.override { doom-emacs = inputs.nix-doom-emacs.packages.${pkgs.system}.default.override {
doomPrivateDir = ./doom.d; doomPrivateDir = ./doom.d;
}; };
helix = inputs.helix.packages.${pkgs.system}.default; helix = inputs.helix.packages.${pkgs.system}.default;
nixpkgs-master-pkgs = inputs.nixpkgs-master.legacyPackages.${pkgs.system}; # nixpkgs-master-pkgs = inputs.nixpkgs-master.legacyPackages.${pkgs.system};
nixpkgs-master = inputs.nixpkgs-master; # nixpkgs-master = inputs.nixpkgs-master;
nixpkgs-master = import inputs.nixpkgs-master {
inherit (config.nixpkgs) config overlays;
inherit (pkgs) system;
};
in { in {
imports = [ inputs.nix-doom-emacs.hmModule ]; imports = [ inputs.nix-doom-emacs.hmModule ];
# Allow unfree packages # Allow unfree packages
@ -15,6 +19,7 @@ in {
nixpkgs.config.permittedInsecurePackages = [ nixpkgs.config.permittedInsecurePackages = [
"electron-21.4.0" "electron-21.4.0"
]; ];
/*
nixpkgs-master.config = { nixpkgs-master.config = {
allowUnfree = true; allowUnfree = true;
allowUnfreePredicate = (pkg: true); allowUnfreePredicate = (pkg: true);
@ -22,6 +27,7 @@ in {
"electron-21.4.0" "electron-21.4.0"
]; ];
}; };
*/
home = { home = {
username = "ultra"; username = "ultra";
homeDirectory = "/home/ultra/"; homeDirectory = "/home/ultra/";
@ -82,7 +88,7 @@ in {
spotify spotify
appimage-run appimage-run
# xivlauncher # Still fails to build :( # xivlauncher # Still fails to build :(
nixpkgs-master-pkgs.xivlauncher # It's fixed on master nixpkgs-master.xivlauncher # It's fixed on master
prismlauncher prismlauncher
ghostwriter ghostwriter
skypeforlinux skypeforlinux