From 713dfd087ede73bb8b9131af54b8740e4fb33e28 Mon Sep 17 00:00:00 2001 From: Eli Ribble Date: Wed, 4 Mar 2026 03:41:41 +0000 Subject: [PATCH] Get proj build to work --- default.nix | 5 +++-- flake.nix | 6 +++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/default.nix b/default.nix index b40c0338..e4ad3a53 100644 --- a/default.nix +++ b/default.nix @@ -1,4 +1,4 @@ -{ pkgs ? import { } }: +{ pkgs ? import { }, proj ? pkgs.proj }: pkgs.buildGoModule rec { meta = { description = "Nidus Sync"; @@ -11,7 +11,8 @@ pkgs.buildGoModule rec { # Needs to be updated after every modification of go.mod/go.sum vendorHash = "sha256-FX9ZmllLpjsk5vN+dzHTjHaZSfDntJkKkAh5cXCfX5U="; - nativeBuildInputs = [ pkgs.dart-sass pkgs.pkg-config ]; + buildInputs = [ pkgs.proj ]; + nativeBuildInputs = [ pkgs.pkg-config pkgs.dart-sass ]; preBuild = '' diff --git a/flake.nix b/flake.nix index 6e5ddda0..2d07a9b1 100644 --- a/flake.nix +++ b/flake.nix @@ -11,11 +11,15 @@ flake-utils.lib.eachDefaultSystem (system: let pkgs = nixpkgs.legacyPackages.${system}; + projPkg = proj.packages.${system}.default; + # Override pkgs.proj with your custom proj customPkgs = pkgs // { proj = proj.packages.${system}.default; }; - package = import ./default.nix { pkgs = customPkgs; }; + package = pkgs.callPackage ./default.nix { + proj = projPkg; + }; in { packages.default = package;