foodogsquared/nixos-config
1
0
Fork 0
mirror of https://github.com/foo-dogsquared/nixos-config.git synced 2025-02-23 12:19:00 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

lib: add the builders to top-level attrset

Browse Source
This commit is contained in:
Gabriel Arazas 2024-10-26 19:35:54 +08:00
parent 3bd5f26e76
commit 2273aa0f7f
No known key found for this signature in database
GPG Key ID: 62104B43D00AA360
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/builders/build-fds-env.nix
View File

@ -1,8 +1,8 @@
{ buildEnv, extendedStdenv }: { buildEnv, extendedStdenv }:
{ paths ? [ ], pathsToLink ? [ ], }@args: { paths ? [ ], pathsToLink ? [ ], ... }@args:
buildEnv (args // { buildEnv (args // {
paths = paths ++ [ extendedStdenv ]; paths = extendedStdenv ++ paths;
pathsToLink = pathsToLink ++ [ "/bin" "/etc" "/share" "/lib" ]; pathsToLink = [ "/bin" "/etc" "/share" "/lib" "/libexec" ] ++ pathsToLink;
}) })

13
lib/default.nix
View File

@ -24,8 +24,8 @@ pkgs.lib.makeExtensible
# extended version of nixpkgs' version that went overboard with # extended version of nixpkgs' version that went overboard with
# developer-oriented dependencies. # developer-oriented dependencies.
stdenv = with pkgs; stdenv = with pkgs;
[ stdenv direnv cookiecutter oils-for-unix nushell ipcalc ] [ direnv cookiecutter oils-for-unix nushell ipcalc ]
++ lib.optional pkgs.isLinux [ ++ lib.optional stdenv.isLinux [
gdb gdb
moreutils moreutils
meson meson
@ -33,10 +33,13 @@ pkgs.lib.makeExtensible
pkg-config pkg-config
man-pages man-pages
man-pages-posix man-pages-posix
]; ] ++ (import "${pkgs.path}/pkgs/stdenv/generic/common-path.nix" {
inherit pkgs;
});
inherit (self.builders) makeXDGMimeAssociationList inherit (self.builders)
makeXDGPortalConfiguration makeXDGDesktopEntry; makeXDGMimeAssociationList makeXDGPortalConfiguration makeXDGDesktopEntry
buildHugoSite buildFDSEnv;
inherit (self.trivial) countAttrs filterAttrs'; inherit (self.trivial) countAttrs filterAttrs';
inherit (self.data) importYAML renderTeraTemplate renderMustacheTemplate; inherit (self.data) importYAML renderTeraTemplate renderMustacheTemplate;
inherit (self.fetchers) fetchInternetArchive; inherit (self.fetchers) fetchInternetArchive;