diff --git a/nix/package.nix b/nix/package.nix index de8bdf8..3892b41 100644 --- a/nix/package.nix +++ b/nix/package.nix @@ -1,22 +1,13 @@ { lib, - stdenv, - stdenvAdapters, rustPlatform, llvm, - useMold ? stdenv.isLinux, }: let toml = (lib.importTOML ../Cargo.toml).package; pname = toml.name; inherit (toml) version; - - # Select stdenv based on useMold flag - stdenv = - if useMold - then stdenvAdapters.useMoldLinker llvm.stdenv - else llvm.stdenv; in - rustPlatform.buildRustPackage.override {inherit stdenv;} { + rustPlatform.buildRustPackage.override {inherit (llvm) stdenv;} { inherit pname version; src = let fs = lib.fileset; @@ -25,10 +16,11 @@ in fs.toSource { root = s; fileset = fs.unions [ - (fs.fileFilter (file: builtins.any file.hasExt ["rs"]) (s + /src)) + (fs.fileFilter (file: builtins.any file.hasExt ["rs"]) (s + /crates)) + (fs.fileFilter (file: builtins.any file.hasExt ["rs"]) (s + /microfetch)) + (s + /.cargo) (s + /Cargo.lock) (s + /Cargo.toml) - (s + /benches) ]; }; @@ -37,12 +29,6 @@ in buildNoDefaultFeatures = true; doCheck = false; - # Only set RUSTFLAGS for mold if useMold is enabled - env = lib.optionalAttrs useMold { - CARGO_LINKER = "clang"; - RUSTFLAGS = "-C link-arg=-fuse-ld=mold"; - }; - meta = { description = "Microscopic fetch script in Rust, for NixOS systems"; homepage = "https://github.com/NotAShelf/microfetch";