added patched nixpkgs

This commit is contained in:
Julien Malka 2023-09-17 20:46:25 +02:00
parent ab66b30a82
commit 655ac53bfd
Signed by: Luj
GPG key ID: 6FC74C847011FD83

View file

@ -5,25 +5,34 @@ with builtins;
let let
overlay-unstable = arch: final: prev: overlay-unstable = arch: final: prev:
let let
master-patched-src = (import inputs.master { system = arch; }).applyPatches { nixpkgs-patched-src = (import inputs.nixpkgs { system = arch; }).applyPatches {
name = "nixpkgs-patches"; name = "nixpkgs-patches";
src = inputs.master; src = inputs.nixpkgs;
patches = [ ../patches/signal.patch ]; patches = [ ../patches/signal.patch ../patches/bcachefs-systemd-stage-1.patch ];
}; };
in in
{ {
unstable = inputs.unstable.legacyPackages."${arch}"; unstable = inputs.unstable.legacyPackages."${arch}";
master-patched = import master-patched-src { system = arch; }; nixpkgs-patched = import nixpkgs-patched-src { system = arch; };
stable = inputs.nixpkgs.legacyPackages."${arch}"; stable = inputs.nixpkgs.legacyPackages."${arch}";
}; };
in in
{ {
mkMachine = { host, host-config, modules, nixpkgs ? inputs.nixpkgs, system ? "x86_64-linux", home-manager ? inputs.home-manager }: nixpkgs.lib.nixosSystem { mkMachine = { host, host-config, modules, nixpkgs ? inputs.nixpkgs, system ? "x86_64-linux", home-manager ? inputs.home-manager }:
let
nixpkgs-patched-src = (import nixpkgs { inherit system; }).applyPatches {
name = "nixpkgs-patched";
src = nixpkgs;
patches = [ ../patches/signal.patch ../patches/bcachefs-systemd-stage-1.patch ];
};
in
nixpkgs.lib.nixosSystem {
lib = final; lib = final;
system = system; system = system;
specialArgs = { specialArgs = {
inherit inputs; inherit inputs;
nixpkgs-patched = nixpkgs-patched-src;
}; };
modules = builtins.attrValues modules ++ [ modules = builtins.attrValues modules ++ [
../machines/base.nix ../machines/base.nix
@ -43,7 +52,6 @@ in
{ {
hyprland = inputs.hyprland.packages.${system}.default.override { hyprland = inputs.hyprland.packages.${system}.default.override {
enableXWayland = true; enableXWayland = true;
hidpiXWayland = true;
nvidiaPatches = false; nvidiaPatches = false;
legacyRenderer = true; legacyRenderer = true;
}; };