balsoft/nixos-config
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix lambda-launcher

Browse Source
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
1 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
modules/packages.nix
View File

@ -10,8 +10,7 @@ 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; };
}; };
@ -25,7 +24,15 @@ in {
# 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;
@ -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;