diff --git a/flake.lock b/flake.lock index 3626fab..ecc0953 100644 --- a/flake.lock +++ b/flake.lock @@ -1,26 +1,5 @@ { "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": { "inputs": { "nixpkgs": [ @@ -59,29 +38,11 @@ }, "root": { "inputs": { - "fenix": "fenix", "naersk": "naersk", "nixpkgs": "nixpkgs", "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": { "locked": { "lastModified": 1659877975, diff --git a/flake.nix b/flake.nix index d362ddc..9516f50 100644 --- a/flake.nix +++ b/flake.nix @@ -6,10 +6,6 @@ url = "github:nix-community/naersk"; inputs.nixpkgs.follows = "nixpkgs"; }; - fenix = { - url = "github:nix-community/fenix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = { @@ -17,21 +13,11 @@ nixpkgs, utils, naersk, - fenix, + ... }: utils.lib.eachDefaultSystem (system: let pkgs = nixpkgs.legacyPackages."${system}"; - toolchain = with fenix.packages."${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; - }; + naersk-lib = naersk.lib."${system}"; in rec { packages.amethyst = naersk-lib.buildPackage { @@ -39,29 +25,6 @@ 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; apps.apod = utils.lib.mkApp { @@ -77,11 +40,8 @@ cargo-audit rustfmt clippy - - openssl - sqlite - pkg-config ]; + RUST_SRC_PATH = "${pkgs.rust.packages.stable.rustPlatform.rustLibSrc}"; }; formatter = pkgs.alejandra;