Fix crane nixos issue
This commit is contained in:
1 parent
157989316e
commit
5d441b2b9a
2 files changed
+3
-7
No files matched your search
@@ -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;
|
||||
|
||||
@@ -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 ../..;
|
||||
|
||||
|
||||
Reference in new issue
Block a user