Fix lambda-launcher

This commit is contained in:
Alexander Bantyev 2020-11-19 13:40:03 +03:00
parent c1fc5d0285
commit 32803f5c8f
Signed by: balsoft
GPG Key ID: E081FF12ADCB4AD5

View File

@ -10,33 +10,40 @@ let
in { in {
nixpkgs.overlays = [ nixpkgs.overlays = [
inputs.nix.overlay inputs.nix.overlay
(self: super: (self: super: rec {
rec { nix = super.nix // {
nix = super.nix // { meta = super.nix.meta // { platforms = lib.platforms.unix; };
meta = super.nix.meta // { platforms = lib.platforms.unix; }; };
};
nur = (import inputs.NUR { nur = (import inputs.NUR {
pkgs = old; pkgs = old;
nurpkgs = pkgs; nurpkgs = pkgs;
}).repos; }).repos;
inherit (nur.balsoft.pkgs) termNote nix-patch; inherit (nur.balsoft.pkgs) termNote nix-patch;
# inherit (old) mautrix-telegram; # inherit (old) mautrix-telegram;
inherit (inputs.lambda-launcher.packages.x86_64-linux) lambda-launcher; lambda-launcher = let
pkgs' =
inputs.lambda-launcher.inputs.nixpkgs.legacyPackages.x86_64-linux.extend (_: _: {
inherit (pkgs) glibc stdenv glibc-locales;
});
in pkgs'.callPackage "${inputs.lambda-launcher}/wrapper.nix" {
lambda-launcher-unwrapped =
pkgs'.haskellPackages.callPackage "${inputs.lambda-launcher}/lambda-launcher.nix" { };
};
simple-osd = inputs.simple-osd-daemons.packages.x86_64-linux; simple-osd = inputs.simple-osd-daemons.packages.x86_64-linux;
inherit old; inherit old;
yt-utilities = inputs.yt-utilities.defaultPackage.x86_64-linux; yt-utilities = inputs.yt-utilities.defaultPackage.x86_64-linux;
nerdfonts = nur.balsoft.pkgs.roboto-mono-nerd; nerdfonts = nur.balsoft.pkgs.roboto-mono-nerd;
# inherit (inputs.nixpkgs-mesa.legacyPackages.x86_64-linux) sway mesa_drivers; # inherit (inputs.nixpkgs-mesa.legacyPackages.x86_64-linux) sway mesa_drivers;
}) })
]; ];
nixpkgs.config = { nixpkgs.config = {
allowUnfree = true; allowUnfree = true;
@ -45,9 +52,7 @@ in {
}; };
environment.etc.nixpkgs.source = inputs.nixpkgs; environment.etc.nixpkgs.source = inputs.nixpkgs;
nix = rec { nix = rec {
nixPath = lib.mkForce [ nixPath = lib.mkForce [ "nixpkgs=/etc/nixpkgs" ];
"nixpkgs=/etc/nixpkgs"
];
binaryCaches = [ "https://cache.nixos.org" ]; binaryCaches = [ "https://cache.nixos.org" ];
registry.self.flake = inputs.self; registry.self.flake = inputs.self;