feat: switch to crane
This commit is contained in:
parent
ed69a54524
commit
837ce3ab3e
3 changed files with 33 additions and 9 deletions
16
flake.lock
generated
16
flake.lock
generated
|
@ -1,5 +1,20 @@
|
|||
{
|
||||
"nodes": {
|
||||
"crane": {
|
||||
"locked": {
|
||||
"lastModified": 1746291859,
|
||||
"narHash": "sha256-DdWJLA+D5tcmrRSg5Y7tp/qWaD05ATI4Z7h22gd1h7Q=",
|
||||
"owner": "ipetkov",
|
||||
"repo": "crane",
|
||||
"rev": "dfd9a8dfd09db9aad544c4d3b6c47b12562544a5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "ipetkov",
|
||||
"repo": "crane",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
|
@ -38,6 +53,7 @@
|
|||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"crane": "crane",
|
||||
"flake-parts": "flake-parts",
|
||||
"nixpkgs": "nixpkgs"
|
||||
}
|
||||
|
|
14
flake.nix
14
flake.nix
|
@ -2,6 +2,8 @@
|
|||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-unstable";
|
||||
|
||||
crane.url = "github:ipetkov/crane";
|
||||
|
||||
flake-parts = {
|
||||
url = "github:hercules-ci/flake-parts";
|
||||
inputs.nixpkgs-lib.follows = "nixpkgs";
|
||||
|
@ -9,7 +11,12 @@
|
|||
};
|
||||
|
||||
outputs =
|
||||
{ self, flake-parts, ... }@inputs:
|
||||
{
|
||||
self,
|
||||
crane,
|
||||
flake-parts,
|
||||
...
|
||||
}@inputs:
|
||||
flake-parts.lib.mkFlake { inherit inputs; } {
|
||||
systems = [
|
||||
"x86_64-linux"
|
||||
|
@ -22,7 +29,10 @@
|
|||
{ self', pkgs, ... }:
|
||||
{
|
||||
packages = {
|
||||
tyrolienne = pkgs.callPackage ./package.nix { inherit self; };
|
||||
tyrolienne = pkgs.callPackage ./package.nix {
|
||||
inherit self;
|
||||
craneLib = crane.mkLib pkgs;
|
||||
};
|
||||
default = self'.packages.tyrolienne;
|
||||
};
|
||||
|
||||
|
|
12
package.nix
12
package.nix
|
@ -1,23 +1,21 @@
|
|||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
mold-wrapped,
|
||||
self,
|
||||
lib,
|
||||
craneLib,
|
||||
mold-wrapped,
|
||||
}:
|
||||
let
|
||||
cargoToml = lib.importTOML ./Cargo.toml;
|
||||
rev = self.shortRev or self.dirtyShortRev or "dirty";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
craneLib.buildPackage {
|
||||
pname = cargoToml.package.name;
|
||||
version = "${cargoToml.package.version}+git.${rev}";
|
||||
|
||||
src = self;
|
||||
src = craneLib.cleanCargoSource ./.;
|
||||
|
||||
nativeBuildInputs = [ mold-wrapped ];
|
||||
|
||||
cargoLock.lockFile = ./Cargo.lock;
|
||||
|
||||
RUSTFLAGS = "-C link-arg=-fuse-ld=mold";
|
||||
|
||||
doCheck = false;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue