beenull/himalaya
1
0
Fork 0
mirror of https://github.com/soywod/himalaya.git synced 2024-11-22 11:00:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

clean namings

Browse source
This commit is contained in:
Clément DOUIN 2024-04-18 23:34:15 +02:00
parent c57988770a
commit a066774f22
No known key found for this signature in database
GPG key ID: 353E4A18EE0FAB72
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
flake.nix
View file

@ -23,6 +23,7 @@
outputs = { self, nixpkgs, gitignore, fenix, naersk, ... }: outputs = { self, nixpkgs, gitignore, fenix, naersk, ... }:
let let
inherit (nixpkgs) lib;
inherit (gitignore.lib) gitignoreSource; inherit (gitignore.lib) gitignoreSource;
staticRustFlags = [ "-Ctarget-feature=+crt-static" ]; staticRustFlags = [ "-Ctarget-feature=+crt-static" ];
@ -191,8 +192,9 @@
in in
rust.buildPackage package; rust.buildPackage package;
# TODO: move this to postInstall
buildArchives = targetSystem: buildArchives = targetSystem:
let himalaya = pkgs.lib.getExe self.apps.${buildSystem}.${targetSystem}; let himalaya = self.apps.${buildSystem}.${targetSystem}.program;
in pkgs.writeShellScriptBin "himalaya-archives" '' in pkgs.writeShellScriptBin "himalaya-archives" ''
export WINEPREFIX="$(mktemp -d)" export WINEPREFIX="$(mktemp -d)"
mkdir -p {man,completions} mkdir -p {man,completions}
@ -208,12 +210,10 @@
defaultPackage = buildPackage buildSystem crossSystems.${buildSystem}.${buildSystem}; defaultPackage = buildPackage buildSystem crossSystems.${buildSystem}.${buildSystem};
packages = builtins.mapAttrs buildPackage crossSystems.${buildSystem}; packages = builtins.mapAttrs buildPackage crossSystems.${buildSystem};
archives = pkgs.lib.foldlAttrs (p: k: _: p // { "${k}-archives" = buildArchives k; }) { } crossSystems.${buildSystem}; archives = lib.foldlAttrs (p: k: _: p // { "${k}-archives" = buildArchives k; }) { } crossSystems.${buildSystem};
in in
{ { default = defaultPackage; } // packages // archives;
default = defaultPackage;
} // packages // archives;
mkApps = buildSystem: mkApps = buildSystem:
let let
@ -237,12 +237,12 @@
in in
{ default = defaultApp; } // apps; { default = defaultApp; } // apps;
supportedSystems = builtins.attrNames crossSystems; eachSystem = lib.genAttrs (builtins.attrNames crossSystems);
mapSupportedSystem = nixpkgs.lib.genAttrs supportedSystems;
in in
{ {
apps = mapSupportedSystem mkApps; apps = eachSystem mkApps;
packages = mapSupportedSystem mkPackages; packages = eachSystem mkPackages;
devShells = mapSupportedSystem mkDevShells; devShells = eachSystem mkDevShells;
}; };
} }