fix(nix): Rework cunicu derivation

Signed-off-by: Steffen Vogel <post@steffenvogel.de>

flake.nix

@@ -21,7 +21,7 @@
         };
 
         overlays = {
-          default = final: prev: { cunicu = import ./nix/default.nix { pkgs = final; }; };
+          default = final: prev: { cunicu = final.callPackage ./nix/cunicu.nix { }; };
         };
       };
 
@@ -53,8 +53,9 @@
           };
 
           packages = {
-            cunicu = import ./nix/default.nix { inherit pkgs; };
-            default = self'.packages.cunicu;
+            inherit (pkgs) cunicu;
+
+            default = pkgs.cunicu;
           };
         };
     };

nix/cunicu.nix

@@ -1,9 +1,9 @@
 # SPDX-FileCopyrightText: 2023 Philipp Jungkamp <p.jungkamp@gmx.net>
+# SPDX-FileCopyrightText: 2025 Steffen Vogel <post@steffenvogel.de>
 # SPDX-License-Identifier: Apache-2.0
 {
   lib,
   stdenv,
-  src,
   buildGoModule,
   installShellFiles,
   versionCheckHook,
@@ -14,15 +14,17 @@
 }:
 let
   version = "0.10.0";
+  src = ./..;
 in
 buildGoModule {
   pname = "cunicu";
-  inherit src version;
+  inherit version src;
 
   vendorHash = "sha256-yFpkYI6ue5LXwRCj4EqWDBaO3TYzZ3Ov/39PRQWMWzk=";
 
   nativeBuildInputs = [
     installShellFiles
+
     protobuf
     protoc-gen-go
     protoc-gen-go-grpc

nix/default.nix

@@ -1,6 +0,0 @@
-# SPDX-FileCopyrightText: 2023 Philipp Jungkamp <p.jungkamp@gmx.net>
-# SPDX-License-Identifier: Apache-2.0
-{
-  pkgs ? import <nixpkgs> { },
-}:
-pkgs.callPackage ./cunicu.nix { src = ./..; }

nix/shell.nix

@@ -1,4 +1,5 @@
 # SPDX-FileCopyrightText: 2023 Philipp Jungkamp <p.jungkamp@gmx.net>
+# SPDX-FileCopyrightText: 2025 Steffen Vogel <post@steffenvogel.de>
 # SPDX-License-Identifier: Apache-2.0
 { self', pkgs, ... }:
 pkgs.mkShell {