From 5d441b2b9ad28c4eccc2736e2d8f1be587f2715c Mon Sep 17 00:00:00 2001 From: Icedsoda <29167146+1cedsoda@users.noreply.github.com> Date: Sat, 28 Jun 2025 11:24:10 +0200 Subject: [PATCH] Fix crane nixos issue --- flake.nix | 5 ++--- nixos/packages/server.nix | 5 +---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/flake.nix b/flake.nix index a971ba1d..19ebcccb 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,6 @@ # Crane for Rust builds with dependency caching crane = { url = "github:ipetkov/crane"; - inputs.nixpkgs.follows = "nixpkgs"; }; home-manager = { @@ -40,7 +39,7 @@ qitechPackages = { server = final.callPackage ./nixos/packages/server.nix { commitHash = builtins.getEnv "QITECH_COMMIT_HASH"; - inherit crane; + craneLib = crane.mkLib final; }; electron = final.callPackage ./nixos/packages/electron.nix { commitHash = builtins.getEnv "QITECH_COMMIT_HASH"; @@ -98,7 +97,7 @@ qitechPackages = { server = final.callPackage ./nixos/packages/server.nix { commitHash = installInfo.gitCommit; - inherit crane; + craneLib = crane.mkLib final; }; electron = final.callPackage ./nixos/packages/electron.nix { commitHash = installInfo.gitCommit; diff --git a/nixos/packages/server.nix b/nixos/packages/server.nix index e953450b..82e939c2 100644 --- a/nixos/packages/server.nix +++ b/nixos/packages/server.nix @@ -4,13 +4,10 @@ , libudev-zero , libpcap , commitHash -, crane +, craneLib }: let - # Create crane lib properly - craneLib = crane.mkLib pkgs; - # Use crane's source cleaning which is more intelligent for Cargo projects src = craneLib.cleanCargoSource ../..;