diff --git a/examples/rust-complex/flake.nix b/examples/rust-complex/flake.nix index b42e311..71cbd50 100644 --- a/examples/rust-complex/flake.nix +++ b/examples/rust-complex/flake.nix @@ -13,24 +13,5 @@ clippy.workspace = true; test.allTargets = true; test.workspace = true; - - buildOverrides = { - pkgs, - pkgsCross ? pkgs, - ... - }: { - buildInputs ? [], - depsBuildBuild ? [], - ... - }: - with pkgs.lib; { - buildInputs = - buildInputs - ++ optional pkgs.stdenv.hostPlatform.isDarwin pkgs.libiconv; - - depsBuildBuild = - depsBuildBuild - ++ optional pkgsCross.stdenv.hostPlatform.isDarwin pkgsCross.xcbuild.xcrun; - }; }; } diff --git a/flake.lock b/flake.lock index 1a52af0..6a5f30c 100644 --- a/flake.lock +++ b/flake.lock @@ -323,32 +323,32 @@ }, "nixpkgs-darwin": { "locked": { - "lastModified": 1730891215, - "narHash": "sha256-i85DPrhDuvzgvIWCpJlbfM2UFtNYbapo20MtQXsvay4=", + "lastModified": 1733083064, + "narHash": "sha256-ecoaxl/YD0Rv2AI+J31DSEeE78DWEU2df3FKgBX6wC4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c128e44a249d6180740d0a979b6480d5b795c013", + "rev": "950be2f70336da3a3306e0cf0e48e42cbac8a24d", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixpkgs-24.05-darwin", + "ref": "nixpkgs-24.11-darwin", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-nixos": { "locked": { - "lastModified": 1732749044, - "narHash": "sha256-T38FQOg0BV5M8FN1712fovzNakSOENEYs+CSkg31C9Y=", + "lastModified": 1732981179, + "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0c5b4ecbed5b155b705336aa96d878e55acd8685", + "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 43f6540..bfb334b 100644 --- a/flake.nix +++ b/flake.nix @@ -27,8 +27,8 @@ inputs.nix-filter.url = "github:numtide/nix-filter"; inputs.nix-log.url = "github:rvolosatovs/nix-log"; inputs.nixlib.url = "github:nix-community/nixpkgs.lib"; - inputs.nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-24.05-darwin"; - inputs.nixpkgs-nixos.url = "github:nixos/nixpkgs/nixos-24.05"; + inputs.nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-24.11-darwin"; + inputs.nixpkgs-nixos.url = "github:nixos/nixpkgs/nixos-24.11"; inputs.rust-overlay.inputs.nixpkgs.follows = "nixpkgs-nixos"; inputs.rust-overlay.url = "github:oxalica/rust-overlay"; diff --git a/lib/rust/mkAttrs.nix b/lib/rust/mkAttrs.nix index ef645fb..7c3b14b 100644 --- a/lib/rust/mkAttrs.nix +++ b/lib/rust/mkAttrs.nix @@ -182,16 +182,13 @@ with self.lib.rust.targets; final hostRustToolchain; - mkHostArgs = {depsBuildBuild ? [], ...} @ craneArgs: + mkHostArgs = craneArgs: trace' "mkHostArgs" { inherit craneArgs; } { - craneArgs = - craneArgs - // { - depsBuildBuild = depsBuildBuild ++ optional final.stdenv.hostPlatform.isDarwin final.darwin.apple_sdk.frameworks.Security; - }; + inherit craneArgs; + craneLib = hostCraneLib; overrideArgs.pkgs = final; @@ -307,8 +304,6 @@ with self.lib.rust.targets; useRosetta = final.stdenv.buildPlatform.isDarwin && final.stdenv.buildPlatform.isAarch64 && pkgsCross.stdenv.hostPlatform.isDarwin && pkgsCross.stdenv.hostPlatform.isx86_64; useEmu = final.stdenv.buildPlatform.system != pkgsCross.stdenv.hostPlatform.system && !useRosetta && !pkgsCross.stdenv.hostPlatform.isDarwin; - buildInputs = optional final.stdenv.buildPlatform.isDarwin final.darwin.apple_sdk.frameworks.Security; - crossZigCC = let target' = if target == aarch64-apple-darwin @@ -328,10 +323,6 @@ with self.lib.rust.targets; targetArgs = { - inherit - buildInputs - ; - HOST_AR = "${final.stdenv.cc.targetPrefix}ar"; HOST_CC = "${final.stdenv.cc.targetPrefix}cc";