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

Merge pull request #49 from nrdxp/app-support

Browse source 
Add an `apps` output attribute set
This commit is contained in:
Timothy DeHerrera 2020-12-28 21:47:29 -07:00 committed by GitHub
parent 2b41411802 da685a0fb1
commit 69308e6e71
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 48 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
flake.nix
View file

@ -11,10 +11,11 @@
outputs = inputs@{ self, home, nixos, master, flake-utils, nur }:
let
inherit (builtins) attrNames attrValues readDir elem;
inherit (flake-utils.lib) eachDefaultSystem;
inherit (builtins) attrNames attrValues readDir elem pathExists filter;
inherit (flake-utils.lib) eachDefaultSystem mkApp;
inherit (nixos) lib;
inherit (lib) all removeSuffix recursiveUpdate genAttrs filterAttrs;
inherit (lib) all removeSuffix recursiveUpdate genAttrs filterAttrs
mapAttrs;
inherit (utils) pathsToImportedAttrs genPkgset overlayPaths modules
genPackages pkgImport;
@ -50,21 +51,15 @@
defaultTemplate = self.templates.flk;
};
in
(eachDefaultSystem (system':
(eachDefaultSystem
(system':
let
pkgs' = pkgImport {
pkgs = nixos;
pkgs = master;
system = system';
overlays = [ ];
};
in
{
devShell = import ./shell.nix {
pkgs = pkgs';
};
packages =
let
packages' = genPackages {
overlay = self.overlay;
overlays = self.overlays;
@ -81,6 +76,25 @@
))
packages';
in
{
devShell = import ./shell.nix {
pkgs = pkgs';
};
apps =
let
validApps = attrNames (filterAttrs (_: drv: pathExists "${drv}/bin")
self.packages."${system}");
validSystems = attrNames filtered;
filterBins = filterAttrs
(n: _: elem n validSystems && elem n validApps)
filtered;
in
mapAttrs (_: drv: mkApp { inherit drv; }) filterBins;
packages =
filtered;
})) // outputs;
}