Update flake inputs
1. Use `stdenv.hostPlatform.system` instead of `system`. 2. Use `runCommand` instead of `runCommandNoCC`. 3. Add new nixpkgs instance for neochat. 4. Set niri config to null when other GUI module.
This commit is contained in:
parent
0db7c6ec72
commit
1319168f0b
10 changed files with 186 additions and 269 deletions
|
|
@ -1,11 +1,12 @@
|
|||
{
|
||||
inputs,
|
||||
system,
|
||||
stdenv,
|
||||
editor-runtime,
|
||||
symlinkJoin,
|
||||
makeWrapper,
|
||||
}:
|
||||
let
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
inherit (inputs) nixpkgs emacs-overlay nix-doom;
|
||||
pkgs = import nixpkgs {
|
||||
localSystem = { inherit system; };
|
||||
|
|
@ -31,9 +32,10 @@ let
|
|||
git
|
||||
ripgrep
|
||||
fd
|
||||
imagemagick
|
||||
])
|
||||
++ [ editor-runtime ];
|
||||
++ [
|
||||
editor-runtime
|
||||
];
|
||||
};
|
||||
in
|
||||
symlinkJoin {
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
{
|
||||
inputs,
|
||||
system,
|
||||
stdenv,
|
||||
callPackage,
|
||||
buildEnv,
|
||||
lib,
|
||||
}:
|
||||
let
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
inherit (inputs.helix.packages."${system}") helix;
|
||||
runtime = callPackage ./runtime.nix { };
|
||||
helix' = helix.overrideAttrs (
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
lib,
|
||||
srcs,
|
||||
stdenv,
|
||||
runCommandNoCCLocal,
|
||||
runCommandLocal,
|
||||
}:
|
||||
let
|
||||
buildGrammar =
|
||||
|
|
@ -80,18 +80,18 @@ let
|
|||
}
|
||||
)
|
||||
|> lib.mapAttrsToList (_: value: "ln -s ${value.value}/${value.name}.so $out/${value.name}.so");
|
||||
grammarDir = runCommandNoCCLocal "helix-grammars" { } ''
|
||||
grammarDir = runCommandLocal "helix-grammars" { } ''
|
||||
mkdir -p $out
|
||||
|
||||
${builtins.concatStringsSep "\n" grammarLinks}
|
||||
'';
|
||||
queryDir = runCommandNoCCLocal "helix-query" { } ''
|
||||
queryDir = runCommandLocal "helix-query" { } ''
|
||||
mkdir -p $out
|
||||
|
||||
${builtins.concatStringsSep "\n" queries}
|
||||
'';
|
||||
in
|
||||
runCommandNoCCLocal "helix-runtime" { } ''
|
||||
runCommandLocal "helix-runtime" { } ''
|
||||
mkdir -p $out
|
||||
|
||||
ln -s ${grammarDir} $out/grammars
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
srcs,
|
||||
runCommandNoCCLocal,
|
||||
runCommandLocal,
|
||||
rootPath,
|
||||
lib,
|
||||
}:
|
||||
|
|
@ -11,7 +11,7 @@ let
|
|||
|> filterAttrs (name: _value: hasPrefix "wallpaper" name)
|
||||
|> concatMapAttrsStringSep "\n" (name: value: "ln -s ${value.src} $out/${name}");
|
||||
in
|
||||
runCommandNoCCLocal "wallpapers" { } ''
|
||||
runCommandLocal "wallpapers" { } ''
|
||||
mkdir -p $out
|
||||
|
||||
${wallpapers}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue