packages/linux-lava: hack further to only overlay for linux-lava specifically
wowie wowzers, this is a terrible hack. All this is needed only because I couldn't for the life of me find a way to override rust-bindgen from buildLinux. Simply including the overlay would require rebuilding a crapton of things that depend on rust-bindgen, so well, this'll have to do for now.
This commit is contained in:
parent
24aa8d0174
commit
82839373bf
3 changed files with 14 additions and 5 deletions
15
flake.nix
15
flake.nix
|
|
@ -60,12 +60,21 @@
|
||||||
me = prev.callPackage ./packages { inherit inputs; } // { inherit inputs; };
|
me = prev.callPackage ./packages { inherit inputs; } // { inherit inputs; };
|
||||||
})];
|
})];
|
||||||
|
|
||||||
|
patchOverlaysWithLinuxLava = nixpkgs: arch: ([(self: super: {
|
||||||
|
linuxLavaNixpkgs = import nixpkgs {
|
||||||
|
overlays = [ (import ./overlays/linux-lava.nix) ] ++ overlays;
|
||||||
|
system = arch;
|
||||||
|
};
|
||||||
|
})] ++ overlays);
|
||||||
|
|
||||||
mkSystem =
|
mkSystem =
|
||||||
if !(self ? rev) then throw "Dirty git tree detected." else
|
if !(self ? rev) then throw "Dirty git tree detected." else
|
||||||
nixpkgs: name: arch: enableGUI: extraModules: nixpkgs.lib.nixosSystem {
|
nixpkgs: name: arch: enableGUI: extraModules: nixpkgs.lib.nixosSystem {
|
||||||
system = arch;
|
system = arch;
|
||||||
modules = [
|
modules = [
|
||||||
{ nixpkgs.overlays = overlays; }
|
({
|
||||||
|
nixpkgs.overlays = patchOverlaysWithLinuxLava nixpkgs arch;
|
||||||
|
})
|
||||||
agenix.nixosModules.age
|
agenix.nixosModules.age
|
||||||
catppuccin.nixosModules.catppuccin
|
catppuccin.nixosModules.catppuccin
|
||||||
(./hosts + "/${name}")
|
(./hosts + "/${name}")
|
||||||
|
|
@ -93,8 +102,8 @@
|
||||||
|
|
||||||
packages."x86_64-linux" =
|
packages."x86_64-linux" =
|
||||||
let
|
let
|
||||||
pkgs = import nixpkgs {
|
pkgs = import nixpkgs rec {
|
||||||
inherit overlays;
|
overlays = patchOverlaysWithLinuxLava nixpkgs system;
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,6 @@ builtins.map (path: import path) [
|
||||||
./android-studio.nix
|
./android-studio.nix
|
||||||
./ccache.nix
|
./ccache.nix
|
||||||
./eww.nix
|
./eww.nix
|
||||||
./linux-lava.nix
|
|
||||||
./material-icons.nix
|
./material-icons.nix
|
||||||
./rofi.nix
|
./rofi.nix
|
||||||
./steam.nix
|
./steam.nix
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,12 @@
|
||||||
{
|
{
|
||||||
callPackage,
|
callPackage,
|
||||||
|
linuxLavaNixpkgs,
|
||||||
inputs
|
inputs
|
||||||
}: rec {
|
}: rec {
|
||||||
discord-tokyonight = callPackage ./discord-tokyonight { inherit inputs; };
|
discord-tokyonight = callPackage ./discord-tokyonight { inherit inputs; };
|
||||||
discover-overlay = callPackage ./discover { inherit inputs; };
|
discover-overlay = callPackage ./discover { inherit inputs; };
|
||||||
epson-201112j = callPackage ./epson-201112j { };
|
epson-201112j = callPackage ./epson-201112j { };
|
||||||
linux-lava = callPackage ./linux-lava { inherit inputs; };
|
linux-lava = linuxLavaNixpkgs.callPackage ./linux-lava { inherit inputs; };
|
||||||
nvim-treesitter-nightly = callPackage ./nvim-treesitter-nightly { inherit inputs; };
|
nvim-treesitter-nightly = callPackage ./nvim-treesitter-nightly { inherit inputs; };
|
||||||
packwiz = callPackage ./packwiz { inherit inputs; };
|
packwiz = callPackage ./packwiz { inherit inputs; };
|
||||||
psensor = callPackage ./psensor { };
|
psensor = callPackage ./psensor { };
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue