From 996715fe10590450743c7f8854bc07a4eb52b852 Mon Sep 17 00:00:00 2001
From: Rexiel Scarlet <37258415+Rexcrazy804@users.noreply.github.com>
Date: Thu, 13 Jun 2024 16:18:47 +0530
Subject: [PATCH] Signed-off-by: Rexiel Scarlet
 <37258415+Rexcrazy804@users.noreply.github.com> (#32468)

Shell.nix: cleaned up unused rec instances + tidied up LIBCLANG_PATH using
makeLibraryPath.
---
 etc/shell.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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