diff --git a/flake.nix b/flake.nix index b80df88..562a280 100644 --- a/flake.nix +++ b/flake.nix @@ -161,7 +161,7 @@ inherit nodeName; repoFlake = self; repoFlakeWithSystem = withSystem; - nodeFlake = self.inputs.get-flake ./nix/os/devices/${nodeName}; + nodeFlake = self.inputs.get-flake (self + "/nix/os/devices/${nodeName}"); } ) [ @@ -190,7 +190,7 @@ flake.nixosConfigurations = let colmenaHive = (inputs.colmena.lib.makeHive self.outputs.colmena).nodes; - router0-dmz0 = (inputs.get-flake ./nix/os/devices/router0-dmz0).nixosConfigurations; + router0-dmz0 = (inputs.get-flake (self + "/nix/os/devices/router0-dmz0")).nixosConfigurations; in colmenaHive // { @@ -200,7 +200,7 @@ # nixos-rebuild switch --flake .\#router0-dmz0_cross --build-host localhost --target-host root@192.168.10.1 router0-dmz0_cross = router0-dmz0.cross; - steveej-x13s_cross = (inputs.get-flake ./nix/os/devices/steveej-x13s).nixosConfigurations.cross; + steveej-x13s_cross = (inputs.get-flake (self + "./nix/os/devices/steveej-x13s")).nixosConfigurations.cross; steveej-x13s-rmvbl_cross = (inputs.get-flake ./nix/os/devices/steveej-x13s-rmvbl).nixosConfigurations.cross; }; @@ -234,47 +234,10 @@ inherit (inputs'.colmena.packages) colmena; - prs = pkgs.callPackage ( - { - dbus, - glib, - gpgme, - gtk3, - libxcb, - libxkbcommon, - installShellFiles, - pkg-config, - python3, - }: - craneLib.buildPackage { - pname = "prs"; - version = inputs.prs.shortRev; - src = inputs.prs; - nativeBuildInputs = [ - gpgme - installShellFiles - pkg-config - python3 - ]; - - buildInputs = [ - dbus - glib - gpgme - gtk3 - libxcb - libxkbcommon - ]; - - cargoExtraArgs = "--features backend-gpgme"; - - postInstall = '' - for shell in bash fish zsh; do - installShellCompletion --cmd prs --$shell <($out/bin/prs internal completions $shell --stdout) - done - ''; - } - ) { }; + prs = pkgs.prs.overrideAttrs(_: { + src = inputs.prs; + version = inputs.prs.shortRev; + }); nomad = inputs'.nixpkgs-unstable.legacyPackages.nomad_1_6;