Simplify and update Nix flake

i18n
Michal S 2 years ago
parent 93287b6d3f
commit 3093f4241e
No known key found for this signature in database
GPG Key ID: 52F8801FC912EB4F

@ -1,26 +1,5 @@
{ {
"nodes": { "nodes": {
"fenix": {
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1662272813,
"narHash": "sha256-aYTZCnaoW6A2m3mFMvTE8ywob9BmrauW7LBZmxMGceA=",
"owner": "nix-community",
"repo": "fenix",
"rev": "85494959e6b4a7c8e22d56df96a39f6756ca58b2",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "fenix",
"type": "github"
}
},
"naersk": { "naersk": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -59,29 +38,11 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"fenix": "fenix",
"naersk": "naersk", "naersk": "naersk",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"utils": "utils" "utils": "utils"
} }
}, },
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1662219201,
"narHash": "sha256-cuQJy5L6DNXIK2myVravMja+/Tj/BgyEO4VF33cQNg4=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "8ddb8b7e8ed9fd99f580503b5ee94e8452d57f5e",
"type": "github"
},
"original": {
"owner": "rust-lang",
"ref": "nightly",
"repo": "rust-analyzer",
"type": "github"
}
},
"utils": { "utils": {
"locked": { "locked": {
"lastModified": 1659877975, "lastModified": 1659877975,

@ -6,10 +6,6 @@
url = "github:nix-community/naersk"; url = "github:nix-community/naersk";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
fenix = {
url = "github:nix-community/fenix";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = { outputs = {
@ -17,21 +13,11 @@
nixpkgs, nixpkgs,
utils, utils,
naersk, naersk,
fenix, ...
}: }:
utils.lib.eachDefaultSystem (system: let utils.lib.eachDefaultSystem (system: let
pkgs = nixpkgs.legacyPackages."${system}"; pkgs = nixpkgs.legacyPackages."${system}";
toolchain = with fenix.packages."${system}"; naersk-lib = naersk.lib."${system}";
combine [
minimal.rustc
minimal.cargo
targets.x86_64-pc-windows-gnu.latest.rust-std
targets.x86_64-unknown-linux-gnu.latest.rust-std
];
naersk-lib = naersk.lib."${system}".override {
cargo = toolchain;
rustc = toolchain;
};
in rec in rec
{ {
packages.amethyst = naersk-lib.buildPackage { packages.amethyst = naersk-lib.buildPackage {
@ -39,29 +25,6 @@
root = ./.; root = ./.;
}; };
packages.amethyst-win = naersk-lib.buildPackage {
pname = "Amethyst";
root = ./.;
strictDeps = true;
depsBuildBuild = with pkgs; [
pkgsCross.mingwW64.stdenv.cc
pkgsCross.mingwW64.windows.pthreads
];
nativeBuildInputs = with pkgs; [
(
if system == "x86_64-linux"
then wineWowPackages.stable
else hello
)
];
CARGO_BUILD_TARGET = "x86_64-pc-windows-gnu";
CARGO_TARGET_X86_64_PC_WINDOWS_GNU_RUNNER = pkgs.writeScript "wine-wrapper" ''
export WINEPREFIX="$(mktemp -d)"
exec wine64 $@
'';
doCheck = true;
};
packages.default = packages.amethyst; packages.default = packages.amethyst;
apps.apod = utils.lib.mkApp { apps.apod = utils.lib.mkApp {
@ -77,11 +40,8 @@
cargo-audit cargo-audit
rustfmt rustfmt
clippy clippy
openssl
sqlite
pkg-config
]; ];
RUST_SRC_PATH = "${pkgs.rust.packages.stable.rustPlatform.rustLibSrc}";
}; };
formatter = pkgs.alejandra; formatter = pkgs.alejandra;

Loading…
Cancel
Save