diff --git a/src/tools/nix-dev-shell/shell.nix b/src/tools/nix-dev-shell/shell.nix index 6ca8a7c4652d3..199b63e645230 100644 --- a/src/tools/nix-dev-shell/shell.nix +++ b/src/tools/nix-dev-shell/shell.nix @@ -2,7 +2,7 @@ pkgs ? import { }, }: let - inherit (pkgs.lib) lists attrsets; + inherit (pkgs.lib) lists attrsets makeLibraryPath; x = pkgs.callPackage ./x { }; inherit (x.passthru) cacert env; @@ -25,6 +25,6 @@ pkgs.mkShell { RUSTC_ICE = 0; SSL_CERT_FILE = cacert; # cargo seems to dlopen libcurl, so we need it in the ld library path - LD_LIBRARY_PATH = "${pkgs.lib.makeLibraryPath [pkgs.stdenv.cc.cc.lib pkgs.curl]}"; + LD_LIBRARY_PATH = "${makeLibraryPath [pkgs.stdenv.cc.cc.lib pkgs.curl]}"; }; } diff --git a/src/tools/nix-dev-shell/x/default.nix b/src/tools/nix-dev-shell/x/default.nix index 9573ddd2825d6..915158080e421 100644 --- a/src/tools/nix-dev-shell/x/default.nix +++ b/src/tools/nix-dev-shell/x/default.nix @@ -1,5 +1,4 @@ { - pkgs, lib, stdenv, rustc, @@ -16,7 +15,6 @@ # LLVM Deps ninja, cmake, - glibc, }: stdenv.mkDerivation (self: { strictDeps = true;