This commit is contained in:
atagen 2024-08-20 11:50:17 +10:00
parent 7f3dc64568
commit d4a800971f
6 changed files with 65 additions and 34 deletions

10
flakes/meat/flake.lock generated
View file

@ -2,10 +2,10 @@
"nodes": {
"nixpkgs": {
"locked": {
"lastModified": 1723362943,
"narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=",
"path": "/nix/store/h60m1fwahjd2mv6gsg77ji3vb4gpj4dk-source",
"rev": "a58bc8ad779655e790115244571758e8de055e3d",
"lastModified": 1723637854,
"narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=",
"path": "/nix/store/sfycwi72zfjsspidinx56ajaiffpyh17-source",
"rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9",
"type": "path"
},
"original": {
@ -23,7 +23,7 @@
"flake": false,
"locked": {
"lastModified": 1,
"narHash": "sha256-driDd0H33lcvEb5fnsUnLZ9Df+m7MNJvBvqQ7KB4+iA=",
"narHash": "sha256-5ERbpb0KT/FE7MEk0l6cdcoMVN+8w31tCHWzCnRjlZQ=",
"path": "src",
"type": "path"
},

View file

@ -6,7 +6,6 @@
nix,
nh,
git,
sudo,
makeWrapper,
}: let
deps = [
@ -14,7 +13,6 @@
nix
nh
git
sudo
];
in
stdenvNoCC.mkDerivation {
@ -31,7 +29,7 @@ in
'';
postFixup = ''
wrapProgram $out/bin/meat \
--set PATH ${lib.makeBinPath deps}
--set PATH /run/wrappers/bin:${lib.makeBinPath deps}
'';
meta = {
mainProgram = "meat";

View file

@ -1,5 +1,6 @@
#!/usr/bin/env bash
cmd=${1:help}
shift
@ -13,6 +14,7 @@ call_nix() {
env NIX_PATH="${nix_path}" nixos-rebuild "$cmd" --fast "$@"
}
cd $FLAKE
case $cmd in
look)
@ -20,21 +22,21 @@ case $cmd in
;;
fresh)
nix flake update "$@"
nix flake update $@
;;
yum)
nh os switch -- "$@"
nh os switch -- $@
# call_nix switch "$@"
;;
cook)
nh os build "$@"
nh os build $@
# call_nix build "$@"
;;
poke)
nh os build -- --show-trace "$@"
nh os build -- --show-trace $@
# call_nix build --show-trace "$@"
;;