Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-13 17:35:36 +01:00
Code Issues Projects Releases Packages Wiki Activity

Signed-off-by: Rexiel Scarlet <37258415+Rexcrazy804@users.noreply.github.com> (#32468)

Browse source 
Shell.nix: cleaned up unused rec instances + tidied up LIBCLANG_PATH using
makeLibraryPath.
This commit is contained in:
Rexiel Scarlet 2024-06-13 16:18:47 +05:30 • committed by GitHub
parent 1d048f4f6a
commit 996715fe10
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
etc/shell.nix
View file

@ -60,7 +60,7 @@ let
GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${ANDROID_SDK_ROOT}/build-tools/${buildToolsVersion}/aapt2"; GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${ANDROID_SDK_ROOT}/build-tools/${buildToolsVersion}/aapt2";
}; };
in in
stdenv.mkDerivation (androidEnvironment // rec { stdenv.mkDerivation (androidEnvironment // {
name = "servo-env"; name = "servo-env";
buildInputs = [ buildInputs = [
@ -111,7 +111,7 @@ stdenv.mkDerivation (androidEnvironment // rec {
''; '';
dontInstall = true; dontInstall = true;
}); });
in (rustPlatform.buildRustPackage rec { in (rustPlatform.buildRustPackage {
name = "crown"; name = "crown";
src = ../support/crown; src = ../support/crown;
doCheck = false; doCheck = false;
@ -145,7 +145,7 @@ stdenv.mkDerivation (androidEnvironment // rec {
androidSdk androidSdk
]); ]);
LIBCLANG_PATH = llvmPackages.clang-unwrapped.lib + "/lib/"; LIBCLANG_PATH = lib.makeLibraryPath [ llvmPackages.clang-unwrapped.lib ];
# Allow cargo to download crates # Allow cargo to download crates
SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";