magic_rb/dotfiles
1
0
Fork 0
mirror of https://git.sr.ht/~magic_rb/dotfiles synced 2024-11-25 09:36:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve Nix wrapper

Browse source 
Signed-off-by: magic_rb <richard@brezak.sk>
This commit is contained in:
magic_rb 2023-10-22 00:34:43 +02:00
parent 0443c69a77
commit 3ad614d4a5
No known key found for this signature in database
GPG key ID: 08D5287CC5DDCA0E
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
flake.nix
View file

@ -284,31 +284,32 @@
esac
done
${pkgs.lib.getExe pkgs.nixUnstable} "''${new_args[@]}"
( exec -a $0 .nix-unwrapped "''${new_args[@]}" )
post_lock_hash="$(sha256sum flake-secret.lock | cut -f1 -d' ')"
if ! [[ "$pre_lock_hash" == "$post_lock_hash" ]] ; then
cp flake-secret.lock flake.lock
${pkgs.lib.getExe pkgs.nixUnstable} flake lock --override-input secret path:///var/empty
.nix-unwrapped flake lock --override-input secret path:///var/empty
fi
'';
nix-unwrapped = pkgs.writeShellScriptBin "nix-unwrapped" ''
exec ${pkgs.lib.getExe pkgs.nixUnstable} "$@"
'';
nix-with-wrapper = pkgs.symlinkJoin {
name = "nix";
paths = [ # pkgs.nixUnstable
nix-unwrapped
nix-wrapped ];
paths = [ pkgs.nixUnstable ];
buildInputs = [ pkgs.makeWrapper ];
postBuild = ''
mv $out/bin/nix $out/bin/.nix-unwrapped
cp ${nix-wrapped}/bin/nix $out/bin/nix
'';
};
nixos-rebuild = pkgs.nixos-rebuild.override { nix = nix-with-wrapper; };
in
pkgs.mkShell {
nativeBuildInputs = with pkgs; [
(pkgs.writeShellScriptBin "update-secret" ''
nix flake lock --update-input secret
'')
nil nix-with-wrapper
nil nix-with-wrapper nixos-rebuild
nomad consul vault
haskell.compiler.ghc946