axeman/pub-solar-os
1
0
Fork 0
forked from pub-solar/os
Code Issues Pull requests Packages Projects Releases Wiki Activity

flake: Fix overlays for nix flake check

Browse source 
It complains that:

	value is a list while a set was expected, at /nix/store/0qdcc831rj27wz07lrri6bnfmhvm4wrm-source/flake.nix:26:7

But nixpkgs still expects a list, so we need to pass it just the values.
This commit is contained in:
Jan Tojnar 2020-06-02 01:17:38 +02:00
parent 0b14dbbc2d
commit a7749005bc
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
flake.nix
View file

@ -6,7 +6,7 @@
outputs = inputs@{ self, home, nixpkgs }: outputs = inputs@{ self, home, nixpkgs }:
let let
inherit (builtins) listToAttrs baseNameOf attrNames readDir; inherit (builtins) listToAttrs baseNameOf attrNames attrValues readDir;
inherit (nixpkgs.lib) removeSuffix; inherit (nixpkgs.lib) removeSuffix;
system = "x86_64-linux"; system = "x86_64-linux";
@ -24,7 +24,7 @@
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
overlays = self.overlays; overlays = attrValues self.overlays;
config = { allowUnfree = true; }; config = { allowUnfree = true; };
}; };
@ -35,10 +35,12 @@
overlay = import ./pkgs; overlay = import ./pkgs;
overlays = let overlays =
overlays = map (name: import (./overlays + "/${name}")) let
(attrNames (readDir ./overlays)); overlayDir = ./overlays;
in overlays; fullPath = name: overlayDir + "/${name}";
overlayPaths = map fullPath (attrNames (readDir overlayDir));
in pathsToImportedAttrs overlayPaths;
packages.x86_64-linux = { packages.x86_64-linux = {
inherit (pkgs) sddm-chili dejavu_nerdfont purs pure; inherit (pkgs) sddm-chili dejavu_nerdfont purs pure;