From 254f0536de575f6336cb7da5519fd55201a56d8c Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Fri, 16 Aug 2024 14:21:25 -0500 Subject: [PATCH] wip: 2024.08.16 14:21:25 --- flake.nix | 3 ++- meta.nix | 19 +++++++++---------- tunnel-go/default.nix | 5 ++++- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/flake.nix b/flake.nix index 6fb206d..c80afe8 100644 --- a/flake.nix +++ b/flake.nix @@ -19,8 +19,9 @@ in { packages = forAllSystems (pkgs: rec { - default = pkgs.callPackage ./meta.nix {inherit tunnel;}; + utils = pkgs.callPackage ./meta.nix { inherit tunnel; }; tunnel = pkgs.callPackage ./tunnel-go { }; + default = utils; }); devShells = forAllSystems (pkgs: { default = pkgs.mkShell { diff --git a/meta.nix b/meta.nix index d5bec21..739a65b 100644 --- a/meta.nix +++ b/meta.nix @@ -1,20 +1,19 @@ { -lib, -stdenvNoCC, + lib, + stdenvNoCC, -# packages -tunnel, -... -}:stdenvNoCC.mkDerivation (finalAttrs: { + # packages + tunnel, + ... +}: +stdenvNoCC.mkDerivation (finalAttrs: { pname = "meta"; version = "unstable"; # src = - buildInputs = [ - tunnel - ]; + buildInputs = [ tunnel ]; - phases = [ "installPhase"]; + phases = [ "installPhase" ]; installPhase = '' mkdir -p $out/bin diff --git a/tunnel-go/default.nix b/tunnel-go/default.nix index 8c7cf49..5a92e52 100644 --- a/tunnel-go/default.nix +++ b/tunnel-go/default.nix @@ -15,7 +15,10 @@ buildGoModule rec { src = cleanSource ./.; vendorHash = "sha256-PwZJMEVaPHqZs7bM+9XLxVA36GfV3EN6bja86hkfO90="; - nativeBuildInputs = [ installShellFiles makeWrapper ]; + nativeBuildInputs = [ + installShellFiles + makeWrapper + ]; postInstall = '' installShellCompletion --cmd ${pname} \