pass self to package.nix

nais · Jun 4, 2024 · c2fb372 · c2fb372
1 parent 7c7f140
commit c2fb372
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/flake.nix b/flake.nix
@@ -22,10 +22,7 @@
         {
           packages.default = config.packages.naisdevice;
 
-          packages.naisdevice = pkgs.callPackage ./packaging/nix/naisdevice/package.nix {
-            version = builtins.substring 0 8 (self.lastModifiedDate or self.lastModified or "19700101");
-            rev = self.rev or "dirty";
-          };
+          packages.naisdevice = pkgs.callPackage ./packaging/nix/naisdevice/package.nix { inherit self; };
 
           checks.naisdevice = pkgs.callPackage ./packaging/nix/naisdevice/test.nix {
             naisdevice = config.packages.naisdevice;

diff --git a/packaging/nix/naisdevice/package.nix b/packaging/nix/naisdevice/package.nix
@@ -1,9 +1,8 @@
-{
-  pkgs,
-  version,
-  rev,
-  ...
-}:
+{ pkgs, self, ... }:
+let
+  version = builtins.substring 0 8 (self.lastModifiedDate or self.lastModified or "19700101");
+  rev = self.rev or "dirty";
+in
 pkgs.buildGoModule {
   pname = "naisdevice";
   subPackages = [
@@ -12,7 +11,7 @@ pkgs.buildGoModule {
     "cmd/naisdevice-agent"
   ];
   inherit version;
-  src = ../../../.;
+  src = self;
   vendorHash = "sha256-Sul8Bre6uvS9OSKa2Hqinlz51kvts6ZM76SAzttJ4tw=";
 
   ldflags = [