diff options
author | John Wiegley <johnw@newartisans.com> | 2021-10-02 17:16:19 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-03 02:16:19 +0200 |
commit | 96c0f7e4ddf2104da88ff5a098163b73677d5b2d (patch) | |
tree | 9ff94ab636e7c8c21e9815511b8ae3c5dd8f6b24 /pkgs/development/compilers/rust | |
parent | 5ecc999aa9fff50b60413babebecb0e40646bf69 (diff) |
rustPackages.rls: Fix 1.55 build on Darwin (#140232)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Diffstat (limited to 'pkgs/development/compilers/rust')
-rw-r--r-- | pkgs/development/compilers/rust/1_45.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/rust/1_55.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/rust/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/rust/rls/default.nix | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/compilers/rust/1_45.nix b/pkgs/development/compilers/rust/1_45.nix index f499fc9e9b080..2c695f1844dc6 100644 --- a/pkgs/development/compilers/rust/1_45.nix +++ b/pkgs/development/compilers/rust/1_45.nix @@ -10,7 +10,7 @@ { stdenv, lib , buildPackages , newScope, callPackage -, CoreFoundation, Security +, CoreFoundation, Security, SystemConfiguration , pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost , makeRustPlatform , llvmPackages_5, llvm_10 diff --git a/pkgs/development/compilers/rust/1_55.nix b/pkgs/development/compilers/rust/1_55.nix index 715a82de5adf3..edd1f538e398a 100644 --- a/pkgs/development/compilers/rust/1_55.nix +++ b/pkgs/development/compilers/rust/1_55.nix @@ -12,7 +12,7 @@ { stdenv, lib , buildPackages , newScope, callPackage -, CoreFoundation, Security +, CoreFoundation, Security, SystemConfiguration , pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost , makeRustPlatform , llvmPackages_11 diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 3e6f3a044fb42..7912055db6247 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -14,7 +14,7 @@ { stdenv, lib , buildPackages , newScope, callPackage -, CoreFoundation, Security +, CoreFoundation, Security, SystemConfiguration , pkgsBuildTarget, pkgsBuildBuild , makeRustPlatform }: rec { @@ -104,7 +104,7 @@ inherit CoreFoundation Security; }; clippy = self.callPackage ./clippy.nix { inherit Security; }; - rls = self.callPackage ./rls { inherit CoreFoundation Security; }; + rls = self.callPackage ./rls { inherit CoreFoundation Security SystemConfiguration; }; }); }; } diff --git a/pkgs/development/compilers/rust/rls/default.nix b/pkgs/development/compilers/rust/rls/default.nix index aa55866def515..036031d98faef 100644 --- a/pkgs/development/compilers/rust/rls/default.nix +++ b/pkgs/development/compilers/rust/rls/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, makeWrapper, fetchFromGitHub, rustPlatform , openssh, openssl, pkg-config, cmake, zlib, curl, libiconv -, CoreFoundation, Security }: +, CoreFoundation, Security, SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "rls"; @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config cmake makeWrapper ]; buildInputs = [ openssh openssl curl zlib libiconv rustPlatform.rust.rustc.llvm ] - ++ (lib.optionals stdenv.isDarwin [ CoreFoundation Security ]); + ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security SystemConfiguration ]; doCheck = true; |