rust: remove obsolete darwin frameworks
This commit is contained in:
parent
0289aa115c
commit
b885ef3fa8
@ -14,9 +14,6 @@
|
|||||||
lib,
|
lib,
|
||||||
newScope,
|
newScope,
|
||||||
callPackage,
|
callPackage,
|
||||||
CoreFoundation,
|
|
||||||
Security,
|
|
||||||
SystemConfiguration,
|
|
||||||
pkgsBuildTarget,
|
pkgsBuildTarget,
|
||||||
pkgsBuildBuild,
|
pkgsBuildBuild,
|
||||||
pkgsBuildHost,
|
pkgsBuildHost,
|
||||||
|
|||||||
@ -1,7 +1,6 @@
|
|||||||
{ lib, stdenv, pkgsHostHost
|
{ lib, stdenv, pkgsHostHost
|
||||||
, file, curl, pkg-config, python3, openssl, cmake, zlib
|
, file, curl, pkg-config, python3, openssl, cmake, zlib
|
||||||
, installShellFiles, makeWrapper, rustPlatform, rustc
|
, installShellFiles, makeWrapper, rustPlatform, rustc
|
||||||
, CoreFoundation, Security
|
|
||||||
, auditable ? !cargo-auditable.meta.broken
|
, auditable ? !cargo-auditable.meta.broken
|
||||||
, cargo-auditable
|
, cargo-auditable
|
||||||
, pkgsBuildBuild
|
, pkgsBuildBuild
|
||||||
@ -32,8 +31,7 @@ rustPlatform.buildRustPackage.override {
|
|||||||
(lib.getDev pkgsHostHost.curl)
|
(lib.getDev pkgsHostHost.curl)
|
||||||
zlib
|
zlib
|
||||||
];
|
];
|
||||||
buildInputs = [ file curl python3 openssl zlib ]
|
buildInputs = [ file curl python3 openssl zlib ];
|
||||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Security ];
|
|
||||||
|
|
||||||
# cargo uses git-rs which is made for a version of libgit2 from recent master that
|
# cargo uses git-rs which is made for a version of libgit2 from recent master that
|
||||||
# is not compatible with the current version in nixpkgs.
|
# is not compatible with the current version in nixpkgs.
|
||||||
|
|||||||
@ -3,7 +3,6 @@
|
|||||||
lib,
|
lib,
|
||||||
rustPlatform,
|
rustPlatform,
|
||||||
rustc,
|
rustc,
|
||||||
Security,
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
rustPlatform.buildRustPackage {
|
rustPlatform.buildRustPackage {
|
||||||
@ -19,7 +18,7 @@ rustPlatform.buildRustPackage {
|
|||||||
# changes hash of vendor directory otherwise
|
# changes hash of vendor directory otherwise
|
||||||
dontUpdateAutotoolsGnuConfigScripts = true;
|
dontUpdateAutotoolsGnuConfigScripts = true;
|
||||||
|
|
||||||
buildInputs = [ rustc.llvm ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ];
|
buildInputs = [ rustc.llvm ];
|
||||||
|
|
||||||
# fixes: error: the option `Z` is only accepted on the nightly compiler
|
# fixes: error: the option `Z` is only accepted on the nightly compiler
|
||||||
RUSTC_BOOTSTRAP = 1;
|
RUSTC_BOOTSTRAP = 1;
|
||||||
|
|||||||
@ -13,7 +13,6 @@
|
|||||||
}:
|
}:
|
||||||
{ stdenv, lib
|
{ stdenv, lib
|
||||||
, newScope, callPackage
|
, newScope, callPackage
|
||||||
, CoreFoundation, Security, SystemConfiguration
|
|
||||||
, pkgsBuildBuild
|
, pkgsBuildBuild
|
||||||
, pkgsBuildHost
|
, pkgsBuildHost
|
||||||
, pkgsBuildTarget
|
, pkgsBuildTarget
|
||||||
@ -87,13 +86,11 @@ in
|
|||||||
sysroot = if fastCross then self.rustc-unwrapped else null;
|
sysroot = if fastCross then self.rustc-unwrapped else null;
|
||||||
};
|
};
|
||||||
rustfmt = self.callPackage ./rustfmt.nix {
|
rustfmt = self.callPackage ./rustfmt.nix {
|
||||||
inherit Security;
|
|
||||||
inherit (self.buildRustPackages) rustc;
|
inherit (self.buildRustPackages) rustc;
|
||||||
};
|
};
|
||||||
cargo = if (!fastCross) then self.callPackage ./cargo.nix {
|
cargo = if (!fastCross) then self.callPackage ./cargo.nix {
|
||||||
# Use boot package set to break cycle
|
# Use boot package set to break cycle
|
||||||
rustPlatform = bootRustPlatform;
|
rustPlatform = bootRustPlatform;
|
||||||
inherit CoreFoundation Security;
|
|
||||||
} else self.callPackage ./cargo_cross.nix {};
|
} else self.callPackage ./cargo_cross.nix {};
|
||||||
cargo-auditable = self.callPackage ./cargo-auditable.nix { };
|
cargo-auditable = self.callPackage ./cargo-auditable.nix { };
|
||||||
cargo-auditable-cargo-wrapper = self.callPackage ./cargo-auditable-cargo-wrapper.nix { };
|
cargo-auditable-cargo-wrapper = self.callPackage ./cargo-auditable-cargo-wrapper.nix { };
|
||||||
@ -102,7 +99,6 @@ in
|
|||||||
# buildPackages.clippy uses the cross compiler and supports
|
# buildPackages.clippy uses the cross compiler and supports
|
||||||
# linting for the target platform.
|
# linting for the target platform.
|
||||||
rustPlatform = makeRustPlatform self;
|
rustPlatform = makeRustPlatform self;
|
||||||
inherit Security;
|
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|||||||
@ -5,7 +5,6 @@
|
|||||||
makeWrapper,
|
makeWrapper,
|
||||||
rustPlatform,
|
rustPlatform,
|
||||||
rustc,
|
rustc,
|
||||||
Security,
|
|
||||||
asNightly ? false,
|
asNightly ? false,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
@ -26,7 +25,7 @@ rustPlatform.buildRustPackage {
|
|||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
rustc.llvm
|
rustc.llvm
|
||||||
] ++ lib.optional stdenv.hostPlatform.isDarwin Security;
|
];
|
||||||
|
|
||||||
# rustfmt uses the rustc_driver and std private libraries, and Rust's build process forces them to have
|
# rustfmt uses the rustc_driver and std private libraries, and Rust's build process forces them to have
|
||||||
# an install name of `@rpath/...` [0] [1] instead of the standard on macOS, which is an absolute path
|
# an install name of `@rpath/...` [0] [1] instead of the standard on macOS, which is an absolute path
|
||||||
|
|||||||
@ -6539,7 +6539,6 @@ with pkgs;
|
|||||||
wrapRustc = rustc-unwrapped: wrapRustcWith { inherit rustc-unwrapped; };
|
wrapRustc = rustc-unwrapped: wrapRustcWith { inherit rustc-unwrapped; };
|
||||||
|
|
||||||
rust_1_84 = callPackage ../development/compilers/rust/1_84.nix {
|
rust_1_84 = callPackage ../development/compilers/rust/1_84.nix {
|
||||||
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration;
|
|
||||||
llvm_19 = llvmPackages_19.libllvm;
|
llvm_19 = llvmPackages_19.libllvm;
|
||||||
};
|
};
|
||||||
rust = rust_1_84;
|
rust = rust_1_84;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user