BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rustPackages.rls: Fix 1.55 build on Darwin (#140232)

Browse source 
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
This commit is contained in:
John Wiegley 2021-10-02 17:16:19 -07:00 committed by GitHub
parent 5ecc999aa9
commit 96c0f7e4dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/compilers/rust/1_45.nix
View file

@ -10,7 +10,7 @@
{ stdenv, lib
, buildPackages
, newScope, callPackage
, CoreFoundation, Security
, CoreFoundation, Security, SystemConfiguration
, pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost
, makeRustPlatform
, llvmPackages_5, llvm_10

2
pkgs/development/compilers/rust/1_55.nix
View file

@ -12,7 +12,7 @@
{ stdenv, lib
, buildPackages
, newScope, callPackage
, CoreFoundation, Security
, CoreFoundation, Security, SystemConfiguration
, pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost
, makeRustPlatform
, llvmPackages_11

4
pkgs/development/compilers/rust/default.nix
View file

@ -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; };
});
};
}

4
pkgs/development/compilers/rust/rls/default.nix
View file

@ -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;

4
pkgs/top-level/all-packages.nix
View file

@ -12407,11 +12407,11 @@ with pkgs;
#
# So this commit doesn't remove the 1.45.2 release.
rust_1_45 = callPackage ../development/compilers/rust/1_45.nix {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration;
llvm_10 = llvmPackages_10.libllvm;
};
rust_1_55 = callPackage ../development/compilers/rust/1_55.nix {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration;
llvm_12 = llvmPackages_12.libllvm;
};
rust = rust_1_55;