treewide: use getLib when accessing clang / libclang / stdenv.cc.cc (#354197)

nixos/tests/vscode-remote-ssh.nix

···
       networking.interfaces.eth1.ipv4.addresses = [ { address = serverAddress; prefixLength = 24; } ];
       services.openssh.enable = true;
       users.users.root.openssh.authorizedKeys.keys = [ snakeOilPublicKey ];
-      virtualisation.additionalPaths = with pkgs; [ patchelf bintools stdenv.cc.cc.lib ];
+      virtualisation.additionalPaths = with pkgs; [ patchelf bintools (lib.getLib stdenv.cc.cc) ];
     };
     client = { ... }: {
       imports = [ ./common/x11.nix ./common/user-account.nix ];

pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix

···
   dontWrapGApps = true; # we only want $gappsWrapperArgs here
 
   buildInputs = with xorg; [
-    alsa-lib cairo freetype gdk-pixbuf glib gtk3 libxcb xcbutil xcbutilwm zlib libXtst libxkbcommon pulseaudio libjack2 libX11 libglvnd libXcursor stdenv.cc.cc.lib
+    alsa-lib cairo freetype gdk-pixbuf glib gtk3 libxcb xcbutil xcbutilwm zlib libXtst libxkbcommon pulseaudio libjack2 libX11 libglvnd libXcursor (lib.getLib stdenv.cc.cc)
   ];
 
   ldLibraryPath = lib.strings.makeLibraryPath buildInputs;

pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix

···
     libxkbcommon
     pipewire
     pulseaudio
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     xcbutil
     xcbutilwm
     zlib

pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix

···
     pango
     pipewire
     pulseaudio
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     vulkan-loader
     xcb-imdkit
     xcbutil

pkgs/applications/audio/galaxy-buds-client/default.nix

···
     graphicsmagick
   ];
 
-  buildInputs = [ stdenv.cc.cc.lib fontconfig ];
+  buildInputs = [ (lib.getLib stdenv.cc.cc) fontconfig ];
 
   runtimeDeps = [
     libglvnd

pkgs/applications/audio/midas/generic.nix

···
       libXext          # libXext.so.6
       alsa-lib          # libasound.so.2
       freetype         # libfreetype.so.6
-      stdenv.cc.cc.lib # libstdc++.so.6
+      (lib.getLib stdenv.cc.cc) # libstdc++.so.6
     ];
   in ''
     patchelf \

pkgs/applications/audio/pianoteq/default.nix

···
       ];
 
       buildInputs = [
-        stdenv.cc.cc.lib
+        (lib.getLib stdenv.cc.cc)
         xorg.libX11 # libX11.so.6
         xorg.libXext # libXext.so.6
         alsa-lib # libasound.so.2

pkgs/applications/audio/reaper/default.nix

···
   sourceRoot = lib.optionalString stdenv.hostPlatform.isDarwin "Reaper.app";
 
   buildInputs = [
-    stdenv.cc.cc.lib # reaper and libSwell need libstdc++.so.6
+    (lib.getLib stdenv.cc.cc) # reaper and libSwell need libstdc++.so.6
   ] ++ lib.optionals stdenv.hostPlatform.isLinux [
     gtk3
     alsa-lib
···
     # We opt for wrapping the executable with LD_LIBRARY_PATH prefix.
     # Note that libcurl and libxml2 are needed for ReaPack to run.
     wrapProgram $out/opt/REAPER/reaper \
-      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ curl lame libxml2 ffmpeg vlc xdotool stdenv.cc.cc.lib ]}"
+      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ curl lame libxml2 ffmpeg vlc xdotool stdenv.cc.cc ]}"
 
     mkdir $out/bin
     ln -s $out/opt/REAPER/reaper $out/bin/

pkgs/applications/audio/redux/default.nix

···
     libX11
     libXext
     alsa-lib
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
   ];
 
   installPhase = ''

pkgs/applications/audio/renoise/default.nix

···
       ln -s $path/lib/*.so* $out/lib/
     done
 
-    ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/
+    ln -s ${lib.getLib stdenv.cc.cc}/lib/libstdc++.so.6 $out/lib/
 
     mkdir $out/bin
     ln -s $out/renoise $out/bin/renoise

pkgs/applications/audio/rymcast/default.nix

···
 
   nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
 
-  buildInputs = [ alsa-lib curl gtk3 stdenv.cc.cc.lib webkitgtk_4_0 zenity ];
+  buildInputs = [ alsa-lib curl gtk3 (lib.getLib stdenv.cc.cc) webkitgtk_4_0 zenity ];
 
   installPhase = ''
     mkdir -p "$out/bin"

pkgs/applications/audio/tonelib-gfx/default.nix

···
   ];
 
   buildInputs = [
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     alsa-lib
     freetype
     libglvnd

pkgs/applications/audio/tonelib-jam/default.nix

···
   ];
 
   buildInputs = [
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     alsa-lib
     freetype
     libglvnd

pkgs/applications/audio/tonelib-metal/default.nix

···
   nativeBuildInputs = [ autoPatchelfHook dpkg ];
 
   buildInputs = [
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     alsa-lib
     freetype
     libglvnd

pkgs/applications/audio/tonelib-noisereducer/default.nix

···
   nativeBuildInputs = [ autoPatchelfHook dpkg ];
 
   buildInputs = [
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     alsa-lib
     freetype
     libglvnd

pkgs/applications/audio/tonelib-zoom/default.nix

···
   ];
 
   buildInputs = [
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     alsa-lib
     freetype
     libglvnd

pkgs/applications/audio/touchosc/default.nix

···
   ];
 
   buildInputs = [
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     alsa-lib
   ];
 

pkgs/applications/audio/virtual-ans/default.nix

···
   ];
 
   buildInputs = [
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     libX11
     libXi
     libGL

pkgs/applications/audio/vital/default.nix

···
 
   buildInputs = [
     alsa-lib
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     libGL
     xorg.libSM
     xorg.libICE

pkgs/applications/blockchains/sparrow/default.nix

···
   sparrow-modules = stdenvNoCC.mkDerivation {
     pname = "sparrow-modules";
     inherit version src;
-    nativeBuildInputs = [ makeWrapper gzip gnugrep openjdk autoPatchelfHook stdenv.cc.cc.lib zlib ];
+    nativeBuildInputs = [ makeWrapper gzip gnugrep openjdk autoPatchelfHook (lib.getLib stdenv.cc.cc) zlib ];
 
     buildPhase = ''
       # Extract Sparrow's JIMAGE and generate a list of them.

pkgs/applications/blockchains/terra-station/default.nix

···
     # patch pre-built node modules
     asar e $out/share/${pname}/resources/app.asar asar-unpacked
     find asar-unpacked -name '*.node' -exec patchelf \
-      --add-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}" \
+      --add-rpath "${lib.makeLibraryPath [ stdenv.cc.cc ]}" \
       {} \;
     asar p asar-unpacked $out/share/${pname}/resources/app.asar
 

pkgs/applications/blockchains/wasabibackend/default.nix

···
   dotnet-sdk = dotnetCorePackages.sdk_7_0;
   dotnet-runtime = dotnetCorePackages.aspnetcore_7_0;
 
-  buildInputs = [stdenv.cc.cc.lib zlib];
+  buildInputs = [(lib.getLib stdenv.cc.cc) zlib];
 
   runtimeDeps = [openssl zlib];
 

pkgs/applications/blockchains/wasabiwallet/default.nix

···
   runtimeLibs = [
     fontconfig.lib
     openssl
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     xorg.libX11
     xorg.libICE
     xorg.libSM

pkgs/applications/editors/android-studio/common.nix

···
           e2fsprogs
 
           # Gradle wants libstdc++.so.6
-          stdenv.cc.cc.lib
+          (lib.getLib stdenv.cc.cc)
           # mksdcard wants 32 bit libstdc++.so.6
           pkgsi686Linux.stdenv.cc.cc.lib
 

pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix

···
         # https://github.com/Golevka/emacs-clang-complete-async/issues/90
         auto-complete-clang-async = (addPackageRequires super.auto-complete-clang-async [ self.auto-complete ]).overrideAttrs (old: {
           buildInputs = old.buildInputs ++ [ pkgs.llvmPackages.llvm ];
-          CFLAGS = "-I${pkgs.llvmPackages.libclang.lib}/include";
-          LDFLAGS = "-L${pkgs.llvmPackages.libclang.lib}/lib";
+          CFLAGS = "-I${lib.getLib pkgs.llvmPackages.libclang}/include";
+          LDFLAGS = "-L${lib.getLib pkgs.llvmPackages.libclang}/lib";
         });
 
         # part of a larger package

pkgs/applications/editors/jetbrains/plugins/specialPlugins.nix

···
   "631" = {
     # Python
     nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook;
-    buildInputs = [ stdenv.cc.cc.lib ];
+    buildInputs = [ (lib.getLib stdenv.cc.cc) ];
   };
   "7322" = {
     # Python community edition
     nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook;
-    buildInputs = [ stdenv.cc.cc.lib ];
+    buildInputs = [ (lib.getLib stdenv.cc.cc) ];
   };
   "8182" = {
     # Rust (deprecated)
     nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook;
-    buildInputs = [ stdenv.cc.cc.lib ];
+    buildInputs = [ (lib.getLib stdenv.cc.cc) ];
     buildPhase = ''
       runHook preBuild
       chmod +x -R bin
···
   "22407" = {
     # Rust
     nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook;
-    buildInputs = [ stdenv.cc.cc.lib ];
+    buildInputs = [ (lib.getLib stdenv.cc.cc) ];
     buildPhase = ''
       runHook preBuild
       chmod +x -R bin

pkgs/applications/editors/rstudio/default.nix

···
         --replace-fail '@node@' ${nodejs}
 
       substituteInPlace src/cpp/core/libclang/LibClang.cpp \
-        --replace-fail '@libclang@' ${llvmPackages.libclang.lib} \
-        --replace-fail '@libclang.so@' ${llvmPackages.libclang.lib}/lib/libclang.so
+        --replace-fail '@libclang@' ${lib.getLib llvmPackages.libclang} \
+        --replace-fail '@libclang.so@' ${lib.getLib llvmPackages.libclang}/lib/libclang.so
 
       substituteInPlace src/cpp/session/CMakeLists.txt \
         --replace-fail '@pandoc@' ${pandoc} \

pkgs/applications/editors/standardnotes/default.nix

···
     libPath = lib.makeLibraryPath [
       libsecret
       glib
-      stdenv.cc.cc.lib
+      (lib.getLib stdenv.cc.cc)
     ];
   in
     ''

pkgs/applications/editors/sublime/2/default.nix

···
     echo ${libPath}
     patchelf \
       --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"} \
+      --set-rpath ${libPath}:${lib.getLib stdenv.cc.cc}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"} \
       $out/sublime/sublime_text
 
     mkdir -p $out/share/icons

pkgs/applications/editors/sublime/3/common.nix

···
       for binary in ${ builtins.concatStringsSep " " binaries }; do
         patchelf \
           --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-          --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"} \
+          --set-rpath ${libPath}:${lib.getLib stdenv.cc.cc}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"} \
           $binary
       done
 
···
 
     postFixup = ''
       wrapProgram $out/sublime_bash \
-        --set LD_PRELOAD "${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"}/libgcc_s.so.1"
+        --set LD_PRELOAD "${lib.getLib stdenv.cc.cc}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"}/libgcc_s.so.1"
 
       wrapProgram $out/${primaryBinary} \
         --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
···
         "''${gappsWrapperArgs[@]}"
 
       # Without this, plugin_host crashes, even though it has the rpath
-      wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"}/libgcc_s.so.1:${lib.getLib openssl}/lib/libssl.so:${bzip2.out}/lib/libbz2.so
+      wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${lib.getLib stdenv.cc.cc}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"}/libgcc_s.so.1:${lib.getLib openssl}/lib/libssl.so:${bzip2.out}/lib/libbz2.so
     '';
   };
 in stdenv.mkDerivation (rec {

pkgs/applications/editors/sublime/4/common.nix

···
       for binary in ${builtins.concatStringsSep " " binaries}; do
         patchelf \
           --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-          --set-rpath ${lib.makeLibraryPath neededLibraries}:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"} \
+          --set-rpath ${lib.makeLibraryPath neededLibraries}:${lib.getLib stdenv.cc.cc}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"} \
           $binary
       done
 

pkgs/applications/editors/vim/plugins/overrides.nix

···
           --replace "let g:clang_library_path = ''
       + "''"
       + ''
-        " "let g:clang_library_path='${llvmPackages.libclang.lib}/lib/libclang.so'"
+        " "let g:clang_library_path='${lib.getLib llvmPackages.libclang}/lib/libclang.so'"
 
               substituteInPlace "$out"/plugin/libclang.py \
                 --replace "/usr/lib/clang" "${llvmPackages.clang.cc}/lib/clang"
···
 
   clighter8 = super.clighter8.overrideAttrs {
     preFixup = ''
-      sed "/^let g:clighter8_libclang_path/s|')$|${llvmPackages.clang.cc.lib}/lib/libclang.so')|" \
+      sed "/^let g:clighter8_libclang_path/s|')$|${lib.getLib llvmPackages.clang.cc}/lib/libclang.so')|" \
         -i "$out"/plugin/clighter8.vim
     '';
   };

pkgs/applications/editors/vscode/extensions/default.nix

···
           }
           // sources.${stdenv.system};
         nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
-        buildInputs = [ stdenv.cc.cc.lib ];
+        buildInputs = [ (lib.getLib stdenv.cc.cc) ];
         meta = {
           description = "Open-source autopilot for software development - bring the power of ChatGPT to your IDE";
           downloadPage = "https://marketplace.visualstudio.com/items?itemName=Continue.continue";
···
 
         buildInputs = [
           zlib
-          stdenv.cc.cc.lib
+          (lib.getLib stdenv.cc.cc)
         ];
 
         postInstall = ''
···
           // sources.${stdenv.system};
         nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
         buildInputs = [
-          stdenv.cc.cc.lib
+          (lib.getLib stdenv.cc.cc)
           zlib
         ];
         meta = {

pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix

···
     lttng-ust
     libkrb5
     zlib
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
   ];
 
   dontAutoPatchelf = isx86Linux;

pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix

···
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
 
   buildInputs = [
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     zlib
   ];
 

pkgs/applications/graphics/avocode/default.nix

···
   };
 
   libPath = lib.makeLibraryPath (with xorg; [
-    stdenv.cc.cc.lib
+    stdenv.cc.cc
     at-spi2-core.out
     gdk-pixbuf
     glib

pkgs/applications/graphics/fiji/default.nix

···
   dontBuild = true;
 
   nativeBuildInputs = [ autoPatchelfHook makeWrapper copyDesktopItems unzip ];
-  buildInputs = [ stdenv.cc.cc.lib ];
+  buildInputs = [ (lib.getLib stdenv.cc.cc) ];
 
   desktopItems = [
     (makeDesktopItem {

pkgs/applications/graphics/kodelife/default.nix

···
   ];
 
   buildInputs = [
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     alsa-lib
     gstreamer
     gst-plugins-base

pkgs/applications/graphics/pencil/default.nix

···
     xorg.libXrandr
     xorg.libXrender
     xorg.libXtst
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     stdenv.cc.cc
   ];
 

pkgs/applications/graphics/pixinsight/default.nix

···
   ];
 
   buildInputs = [
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     stdenv.cc
     libGL
     libpulseaudio
···
   postPatch = ''
     patchelf ./installer \
       --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      --set-rpath ${stdenv.cc.cc.lib}/lib
+      --set-rpath ${lib.getLib stdenv.cc.cc}/lib
   '';
 
   dontConfigure = true;

pkgs/applications/graphics/sane/backends/dsseries/default.nix

···
   preFixup = ''
     for f in `find $out/lib/sane/ -type f`; do
       # Make it possible to find libstdc++.so.6
-      patchelf --set-rpath ${stdenv.cc.cc.lib}/lib:$out/lib/sane $f
+      patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib:$out/lib/sane $f
 
       # Horrible kludge: The driver hardcodes /usr/lib/sane/ as a dlopen path.
       # We can directly modify the binary to force a relative lookup instead.

pkgs/applications/kde/kdevelop/kdevelop.nix

···
   # https://cgit.kde.org/kdevelop.git/commit/?id=716372ae2e8dff9c51e94d33443536786e4bd85b
   # required as nixos seems to be unable to find CLANG_BUILTIN_DIR
   cmakeFlags = [
-    "-DCLANG_BUILTIN_DIR=${llvmPackages.libclang.lib}/lib/clang/${lib.getVersion llvmPackages.clang}/include"
+    "-DCLANG_BUILTIN_DIR=${lib.getLib llvmPackages.libclang}/lib/clang/${lib.getVersion llvmPackages.clang}/include"
   ];
 
   dontWrapQtApps = true;

pkgs/applications/misc/1password-gui/linux.nix

···
           pango
           systemd
         ]
-        + ":${stdenv.cc.cc.lib}/lib64";
+        + ":${lib.getLib stdenv.cc.cc}/lib64";
     in
     ''
       runHook preInstall

pkgs/applications/misc/avalonia-ilspy/default.nix

···
 
   buildInputs = [
     # Dependencies of nuget packages w/ native binaries
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     fontconfig
   ];
 

pkgs/applications/misc/azuredatastudio/default.nix

···
       libxkbcommon
       xorg.libxkbfile
       pango
-      stdenv.cc.cc.lib
+      stdenv.cc.cc
       systemd
     ])
     targetPath

pkgs/applications/misc/bloodhound/default.nix

···
     nss
     pango
     systemd
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     udev
     xorg.libX11
     xorg.libXScrnSaver

pkgs/applications/misc/hubstaff/default.nix

···
 
   rpath = lib.makeLibraryPath
     [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft
-      libXinerama stdenv.cc.cc.lib libnotify glib gtk3 libappindicator-gtk3
+      libXinerama stdenv.cc.cc libnotify glib gtk3 libappindicator-gtk3
       curl libXfixes libXScrnSaver ];
 
 in

pkgs/applications/misc/koreader/default.nix

···
     find ${src_repo}/resources/fonts -type d -execdir cp -r '{}' $out/lib/koreader/fonts \;
     find $out -xtype l -print -delete
     wrapProgram $out/bin/koreader --prefix LD_LIBRARY_PATH : ${
-      lib.makeLibraryPath [ gtk3-x11 SDL2 glib stdenv.cc.cc.lib ]
+      lib.makeLibraryPath [ gtk3-x11 SDL2 glib stdenv.cc.cc ]
     }
   '';
 

pkgs/applications/misc/sidequest/default.nix

···
           libxkbcommon
           xorg.libxkbfile
           pango
-          stdenv.cc.cc.lib
+          (lib.getLib stdenv.cc.cc)
           systemd
         ];
       in ''

pkgs/applications/networking/browsers/firefox/common.nix

···
     "--enable-default-toolkit=cairo-gtk3${lib.optionalString waylandSupport "-wayland"}"
     "--enable-system-pixman"
     "--with-distribution-id=org.nixos"
-    "--with-libclang-path=${llvmPackagesBuildBuild.libclang.lib}/lib"
+    "--with-libclang-path=${lib.getLib llvmPackagesBuildBuild.libclang}/lib"
     "--with-system-ffi"
     "--with-system-icu"
     "--with-system-jpeg"

pkgs/applications/networking/browsers/opera/default.nix

···
     nspr
     nss
     pango
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     qt6.qtbase
   ];
 

pkgs/applications/networking/browsers/palemoon/bin.nix

···
     dbus-glib
     gtk2-x11
     libXt
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
   ] ++ lib.optionals withGTK3 [
     gtk3
   ];

pkgs/applications/networking/browsers/yandex-browser/default.nix

···
     nspr
     nss
     pango
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     libqt5pas
     qt6.qtbase
   ];

pkgs/applications/networking/cluster/hadoop/default.nix

···
 
       nativeBuildInputs = [ makeWrapper ]
                           ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
-      buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.cc.lib openssl protobuf zlib snappy libtirpc ];
+      buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ (lib.getLib stdenv.cc.cc) openssl protobuf zlib snappy libtirpc ];
 
       installPhase = ''
         mkdir $out

pkgs/applications/networking/instant-messengers/bluejeans/default.nix

···
         freetype
         nspr
         glib
-        stdenv.cc.cc.lib
+        stdenv.cc.cc
         nss
         libX11
         libXrandr

pkgs/applications/networking/instant-messengers/franz/generic.nix

···
     expat
     stdenv.cc.cc
   ];
-  runtimeDependencies = [ libglvnd stdenv.cc.cc.lib (lib.getLib udev) libnotify libappindicator-gtk3 ];
+  runtimeDependencies = [ libglvnd (lib.getLib stdenv.cc.cc) (lib.getLib udev) libnotify libappindicator-gtk3 ];
 
   unpackPhase = "dpkg-deb -x $src .";
 

pkgs/applications/networking/instant-messengers/slack/default.nix

···
       xorg.libXtst
       xorg.libxkbfile
       xorg.libxshmfence
-    ] + ":${stdenv.cc.cc.lib}/lib64";
+    ] + ":${lib.getLib stdenv.cc.cc}/lib64";
 
     buildInputs = [
       gtk3 # needed for GSETTINGS_SCHEMAS_PATH

pkgs/applications/networking/p2p/transgui/default.nix

···
   ];
 
   NIX_LDFLAGS = ''
-    -L${stdenv.cc.cc.lib}/lib -lX11 -lglib-2.0 -lgtk-x11-2.0
+    -L${lib.getLib stdenv.cc.cc}/lib -lX11 -lglib-2.0 -lgtk-x11-2.0
     -lgdk-x11-2.0 -lgdk_pixbuf-2.0 -lpango-1.0 -latk-1.0 -lcairo
     -lc -lcrypto
   '';

pkgs/applications/networking/scaleft/default.nix

···
 
   libPath =
     lib.makeLibraryPath
-       [ stdenv.cc stdenv.cc.cc.lib ];
+       [ stdenv.cc stdenv.cc.cc ];
 
   buildCommand = ''
     mkdir -p $out/bin/

pkgs/applications/office/banana-accounting/default.nix

···
     e2fsprogs
     gmp
     gtk3
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     libGL
     libX11
     libgcrypt

pkgs/applications/office/softmaker/generic.nix

···
     libXmu
     libXrandr
     libXrender
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
   ];
 
   dontBuild = true;

pkgs/applications/office/trilium/server.nix

···
-{ stdenv, autoPatchelfHook, fetchurl, nixosTests
+{ lib, stdenv, autoPatchelfHook, fetchurl, nixosTests
 , metaCommon }:
 
 let
···
   ];
 
   buildInputs = [
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
   ];
 
   patches = [

pkgs/applications/radio/sdrplay/default.nix

···
 
   nativeBuildInputs = [ autoPatchelfHook ];
 
-  buildInputs = [ libusb1 udev stdenv.cc.cc.lib ];
+  buildInputs = [ libusb1 udev (lib.getLib stdenv.cc.cc) ];
 
   unpackPhase = ''
     sh "$src" --noexec --target source

pkgs/applications/science/biology/quast/default.nix

···
    postFixup = ''
    for file in $(find $out -type f -type f -perm /0111); do
        old_rpath=$(patchelf --print-rpath $file) && \
-       patchelf --set-rpath $old_rpath:${stdenv.cc.cc.lib}/lib $file || true
+       patchelf --set-rpath $old_rpath:${lib.getLib stdenv.cc.cc}/lib $file || true
    done
    # Link to the master program
    ln -s $out/bin/quast.py $out/bin/quast

pkgs/applications/science/electronics/eagle/eagle.nix

···
 
       patchelf \
         --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-        --set-rpath "${libPath}:$out/eagle-${version}/lib:${stdenv.cc.cc.lib}/lib" \
+        --set-rpath "${libPath}:$out/eagle-${version}/lib:${lib.getLib stdenv.cc.cc}/lib" \
         "$out"/eagle-${version}/eagle
 
       mkdir -p "$out"/bin

pkgs/applications/science/electronics/picoscope/default.nix

···
       inherit (sources.libpicoipp) version;
       src = fetchurl { inherit (sources.libpicoipp) url sha256; };
       nativeBuildInputs = [ dpkg autoPatchelfHook ];
-      buildInputs = [ stdenv.cc.cc.lib ];
+      buildInputs = [ (lib.getLib stdenv.cc.cc) ];
       sourceRoot = ".";
       unpackCmd = "dpkg-deb -x $src .";
       installPhase = ''

pkgs/applications/science/logic/saw-tools/default.nix

···
       gmp4
       ncurses
       zlib
-    ] + ":${stdenv.cc.cc.lib}/lib64";
+    ] + ":${lib.getLib stdenv.cc.cc}/lib64";
 
   url = "https://github.com/GaloisInc/saw-script/releases/download";
 

pkgs/applications/science/logic/verifast/default.nix

···
   libPath = lib.makeLibraryPath
     [ stdenv.cc.libc stdenv.cc.cc gtk2 gdk-pixbuf atk pango glib cairo
       freetype fontconfig libxml2 gnome2.gtksourceview
-    ] + ":${stdenv.cc.cc.lib}/lib64:$out/libexec";
+    ] + ":${lib.getLib stdenv.cc.cc}/lib64:$out/libexec";
 
   patchExe = x: ''
     patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

pkgs/applications/science/math/wolfram-engine/default.nix

···
     ncurses
     opencv4
     openssl
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     unixODBC
     xkeyboard_config
     libxml2
···
     # Fix library paths
     cd $out/libexec/${dirName}/Executables
     for path in MathKernel math mcc wolfram; do
-      makeWrapper $out/libexec/${dirName}/Executables/$path $out/bin/$path --set LD_LIBRARY_PATH "${zlib}/lib:${stdenv.cc.cc.lib}/lib:${libssh2}/lib:\''${LD_LIBRARY_PATH}"
+      makeWrapper $out/libexec/${dirName}/Executables/$path $out/bin/$path --set LD_LIBRARY_PATH "${zlib}/lib:${lib.getLib stdenv.cc.cc}/lib:${libssh2}/lib:\''${LD_LIBRARY_PATH}"
     done
 
     for path in WolframKernel wolframscript; do
-      makeWrapper $out/libexec/${dirName}/SystemFiles/Kernel/Binaries/Linux-x86-64/$path $out/bin/$path --set LD_LIBRARY_PATH "${zlib}/lib:${stdenv.cc.cc.lib}/lib:${libssh2}/lib:\''${LD_LIBRARY_PATH}"
+      makeWrapper $out/libexec/${dirName}/SystemFiles/Kernel/Binaries/Linux-x86-64/$path $out/bin/$path --set LD_LIBRARY_PATH "${zlib}/lib:${lib.getLib stdenv.cc.cc}/lib:${libssh2}/lib:\''${LD_LIBRARY_PATH}"
     done
 
     wrapQtApp "$out/libexec/${dirName}/SystemFiles/FrontEnd/Binaries/Linux-x86-64/WolframPlayer" \
-      --set LD_LIBRARY_PATH "${zlib}/lib:${stdenv.cc.cc.lib}/lib:${libssh2}/lib:\''${LD_LIBRARY_PATH}" \
+      --set LD_LIBRARY_PATH "${zlib}/lib:${lib.getLib stdenv.cc.cc}/lib:${libssh2}/lib:\''${LD_LIBRARY_PATH}" \
       --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb"
     if ! isELF "$out/libexec/${dirName}/SystemFiles/FrontEnd/Binaries/Linux-x86-64/WolframPlayer"; then
       substituteInPlace $out/libexec/${dirName}/SystemFiles/FrontEnd/Binaries/Linux-x86-64/WolframPlayer \

pkgs/applications/version-management/bcompare/default.nix

···
     nativeBuildInputs = [ autoPatchelfHook ];
 
     buildInputs = [
-      stdenv.cc.cc.lib
+      (lib.getLib stdenv.cc.cc)
       gtk2
       pango
       cairo

pkgs/applications/version-management/gitkraken/default.nix

···
     dontConfigure = true;
 
     libPath = lib.makeLibraryPath [
-      stdenv.cc.cc.lib
+      stdenv.cc.cc
       curlWithGnuTls
       udev
       libX11

pkgs/applications/version-management/sublime-merge/common.nix

···
       for binary in ${builtins.concatStringsSep " " binaries}; do
         patchelf \
           --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-          --set-rpath ${lib.makeLibraryPath neededLibraries}:${libGL}/lib:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"} \
+          --set-rpath ${lib.makeLibraryPath neededLibraries}:${libGL}/lib:${lib.getLib stdenv.cc.cc}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"} \
           $binary
       done
 

pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix

···
 
   extraBuildInputs = [ pugixml rapidjson ];
 
-  extraRuntimeDependencies = [ glib nspr nss stdenv.cc.cc.lib ];
+  extraRuntimeDependencies = [ glib nspr nss (lib.getLib stdenv.cc.cc) ];
 
   extraInstallPhase = let n = namespace; in ''
     ln -s $out/lib/addons/${n}/libssd_wv.so $out/${addonDir}/${n}/libssd_wv.so

pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix

···
       substitutions = {
         dynamicLinker = "${stdenv.cc}/nix-support/dynamic-linker";
         libPath = lib.makeLibraryPath [
-          stdenv.cc.cc.lib
+          stdenv.cc.cc
           stdenv.cc.libc
           dotnet-sdk.passthru.icu
           zlib

pkgs/build-support/libredirect/default.nix

···
     PATH=${bintools-unwrapped}/bin:${llvmPackages.clang-unwrapped}/bin:$PATH \
       clang -arch x86_64 -arch arm64 -arch arm64e \
       -isystem "$SDKROOT/usr/include" \
-      -isystem ${llvmPackages.libclang.lib}/lib/clang/*/include \
+      -isystem ${lib.getLib llvmPackages.libclang}/lib/clang/*/include \
       "-L$SDKROOT/usr/lib" \
       -Wl,-install_name,$out/lib/$libName \
       -Wall -std=c99 -O3 -fPIC libredirect.c \

pkgs/build-support/rust/default-crate-overrides.nix

···
   nettle-sys = attrs: {
     nativeBuildInputs = [ pkg-config ];
     buildInputs = [ nettle clang ];
-    LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
+    LIBCLANG_PATH = "${lib.getLib llvmPackages.libclang}/lib";
   };
 
   openssl = attrs: {

pkgs/build-support/rust/hooks/default.nix

···
     bindgenHook = callPackage ({}: makeSetupHook {
       name = "rust-bindgen-hook";
       substitutions = {
-        libclang = clang.cc.lib;
+        libclang = (lib.getLib clang.cc);
         inherit clang;
       };
     }

pkgs/by-name/am/am2rlauncher/package.nix

···
     multiArch = true;
 
     multiPkgs = pkgs: with pkgs; [
-        stdenv.cc.cc.lib
+        (lib.getLib stdenv.cc.cc)
         xorg.libX11
         xorg.libXext
         xorg.libXrandr

pkgs/by-name/am/amdenc/package.nix

···
     autoPatchelfHook
   ];
 
-  buildInputs = [ stdenv.cc.cc.lib ];
+  buildInputs = [ (lib.getLib stdenv.cc.cc) ];
 
   installPhase = ''
     runHook preInstall

pkgs/by-name/am/amdvlk/package.nix

···
     [
       libdrm
       openssl
-      stdenv.cc.cc.lib
+      stdenv.cc.cc
       zlib
     ]
     ++ (with xorg; [

pkgs/by-name/ap/aphorme/package.nix

···
   # No tests exist
   doCheck = false;
 
-  buildInputs = [ stdenv.cc.cc.lib ];
+  buildInputs = [ (lib.getLib stdenv.cc.cc) ];
   nativeBuildInputs = [ autoPatchelfHook ];
 
   runtimeDependencies = [

pkgs/by-name/aw/aws-workspaces/package.nix

···
   dontStrip = true;
 
   buildInputs = [
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     libkrb5
     curl
     lttng-ust

pkgs/by-name/bl/blendfarm/package.nix

···
     ];
 
   buildInputs = [
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     fontconfig
     openssl
     libkrb5

pkgs/by-name/ca/caligula/package.nix

···
   cargoHash = "sha256-ma7JVbWSiKfkCXCDwA8DFm2+KPrWR+8nSdgGSqehNg8=";
 
   env = {
-     LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
+     LIBCLANG_PATH = "${lib.getLib llvmPackages.libclang}/lib";
    };
 
 

pkgs/by-name/ca/casadi/package.nix

···
       # nix provide lib/clang headers in libclang, not in llvm.
       substituteInPlace casadi/interfaces/clang/CMakeLists.txt --replace-fail \
         '$'{CLANG_LLVM_LIB_DIR} \
-        ${llvmPackages_17.libclang.lib}/lib
+        ${lib.getLib llvmPackages_17.libclang}/lib
 
       # help casadi find its own libs
       substituteInPlace casadi/core/casadi_os.cpp --replace-fail \

pkgs/by-name/cc/ccache/package.nix

···
           isGNU = unwrappedCC.isGNU or false;
           isCcache = true;
         };
-        inherit (unwrappedCC) lib;
+        lib = lib.getLib unwrappedCC;
         nativeBuildInputs = [ makeWrapper ];
         # Unwrapped clang does not have a targetPrefix because it is multi-target
         # target is decided with argv0.

pkgs/by-name/ch/chatd/package.nix

···
   ] ++ lib.optional stdenv.isLinux autoPatchelfHook; # for onnx libs
 
   buildInputs = [
-    stdenv.cc.cc.lib # for libstdc++.so, required by onnxruntime
+    (lib.getLib stdenv.cc.cc) # for libstdc++.so, required by onnxruntime
     vips # or it will try to download from the Internet
   ];
 

pkgs/by-name/dy/dyalog/package.nix

···
   ];
 
   buildInputs = [
-    stdenv.cc.cc.lib # Used by Conga and .NET Bridge
+    (lib.getLib stdenv.cc.cc) # Used by Conga and .NET Bridge
     ncurses5 # Used by the dyalog binary to correctly display in the terminal
   ]
   ++ lib.optionals htmlRendererSupport [

pkgs/by-name/ec/ecc/package.nix

···
 
   postFixup = ''
     wrapProgram $out/bin/ecc-rs \
-      --prefix LIBCLANG_PATH : ${llvmPackages.libclang.lib}/lib \
+      --prefix LIBCLANG_PATH : ${lib.getLib llvmPackages.libclang}/lib \
       --prefix PATH : ${lib.makeBinPath (with llvmPackages; [clang bintools-unwrapped])}
   '';
 

pkgs/by-name/eq/equibop/package.nix

···
   buildInputs = [
     libpulseaudio
     pipewire
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
   ];
 
   patches =

pkgs/by-name/er/erlang-language-platform/package.nix

···
 
   nativeBuildInputs = [ autoPatchelfHook ];
 
-  buildInputs = [ stdenv.cc.cc.lib ];
+  buildInputs = [ (lib.getLib stdenv.cc.cc) ];
 
   sourceRoot = ".";
 

pkgs/by-name/fe/fedimint/package.nix

···
     protobuf
     pkg-config
     clang
-    libclang.lib
+    (lib.getLib libclang)
   ];
 
   buildInputs = [
···
   PROTOC = "${buildPackages.protobuf}/bin/protoc";
   PROTOC_INCLUDE = "${protobuf}/include";
   OPENSSL_DIR = openssl.dev;
-  LIBCLANG_PATH = "${libclang.lib}/lib";
+  LIBCLANG_PATH = "${lib.getLib libclang}/lib";
 
   FEDIMINT_BUILD_FORCE_GIT_HASH = "0000000000000000000000000000000000000000";
 

pkgs/by-name/gi/github-runner/package.nix

···
       darwin.autoSignDarwinBinariesHook
     ];
 
-  buildInputs = [ stdenv.cc.cc.lib ];
+  buildInputs = [ (lib.getLib stdenv.cc.cc) ];
 
   dotnet-sdk = dotnetCorePackages.sdk_6_0;
   dotnet-runtime = dotnetCorePackages.runtime_6_0;

pkgs/by-name/go/goofcord/package.nix

···
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     libpulseaudio
     pipewire
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
   ];
 
   pnpmDeps = pnpm'.fetchDeps {

pkgs/by-name/gu/guile-lib/package.nix

···
   preCheck = ''
     # Make `libgcc_s.so' visible for `pthread_cancel'.
     export LD_LIBRARY_PATH=\
-    "$(dirname $(echo ${stdenv.cc.cc.lib}/lib*/libgcc_s.so))''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
+    "$(dirname $(echo ${lib.getLib stdenv.cc.cc}/lib*/libgcc_s.so))''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
   '';
 
   meta = with lib; {

pkgs/by-name/ig/igir/package.nix

···
 
   nativeBuildInputs = [ autoPatchelfHook ];
 
-  buildInputs = [ stdenv.cc.cc.lib ];
+  buildInputs = [ (lib.getLib stdenv.cc.cc) ];
 
   # from lib/node_modules/igir/node_modules/@node-rs/crc32-linux-x64-musl/crc32.linux-x64-musl.node
   # Irrelevant to our use

pkgs/by-name/in/inko/package.nix

···
     libz
     libxml2
     ncurses
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
   ];
 
   nativeBuildInputs = [

pkgs/by-name/in/intune-portal/package.nix

···
     let
       libPath = {
         intune = lib.makeLibraryPath [
-          stdenv.cc.cc.lib
+          stdenv.cc.cc
           libuuid
           xorg.libX11
           curlMinimal

pkgs/by-name/is/isabelle/package.nix

···
     done
     patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) contrib/bash_process-*/$arch/bash_process
     for d in contrib/kodkodi-*/jni/$arch; do
-      patchelf --set-rpath "${lib.concatStringsSep ":" [ "${java}/lib/openjdk/lib/server" "${stdenv.cc.cc.lib}/lib" ]}" $d/*.so
+      patchelf --set-rpath "${lib.concatStringsSep ":" [ "${java}/lib/openjdk/lib/server" "${lib.getLib stdenv.cc.cc}/lib" ]}" $d/*.so
     done
   '' + lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") ''
-    patchelf --set-rpath "${stdenv.cc.cc.lib}/lib" contrib/z3-*/$arch/z3
+    patchelf --set-rpath "${lib.getLib stdenv.cc.cc}/lib" contrib/z3-*/$arch/z3
   '';
 
   buildPhase = ''

pkgs/by-name/iv/ivm/package.nix

···
   cargoHash = "sha256-EP3fS4lAGOaXJXAM22ZCn4+9Ah8TM1+wvNerKCKByo0=";
 
   buildInputs = [
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
   ];
 
   nativeBuildInputs = [

pkgs/by-name/je/jextract-21/package.nix

···
   ];
 
   gradleFlags = [
-    "-Pllvm_home=${llvmPackages.libclang.lib}"
+    "-Pllvm_home=${lib.getLib llvmPackages.libclang}"
     "-Pjdk21_home=${jdk21}"
   ];
 

pkgs/by-name/je/jextract/package.nix

···
   ];
 
   gradleFlags = [
-    "-Pllvm_home=${llvmPackages.libclang.lib}"
+    "-Pllvm_home=${lib.getLib llvmPackages.libclang}"
     "-Pjdk22_home=${jdk23}"
   ];
 

pkgs/by-name/lo/logseq/package.nix

···
   nativeBuildInputs = [ makeWrapper ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [ unzip ];
-  buildInputs = [ stdenv.cc.cc.lib ];
+  buildInputs = [ (lib.getLib stdenv.cc.cc) ];
 
   dontUnpack = stdenv.hostPlatform.isLinux;
   dontConfigure = true;

pkgs/by-name/lu/lunarvim/package.nix

···
     install -Dm444 utils/desktop/lvim.desktop -t $out/share/applications
 
     wrapProgram $out/bin/lvim --prefix PATH : ${ lib.makeBinPath finalAttrs.runtimeDeps } \
-      --prefix LD_LIBRARY_PATH : ${stdenv.cc.cc.lib} \
+      --prefix LD_LIBRARY_PATH : ${lib.getLib stdenv.cc.cc} \
       --prefix CC : ${stdenv.cc.targetPrefix}cc
   '' + lib.optionalString finalAttrs.nvimAlias ''
     ln -s $out/bin/lvim $out/bin/nvim

pkgs/by-name/lx/lx-music-desktop/package.nix

···
 
   runtimeLibs = lib.makeLibraryPath [
     libGL
-    stdenv.cc.cc.lib
+    stdenv.cc.cc
   ];
 in
 stdenv.mkDerivation {

pkgs/by-name/mi/mihomo-party/package.nix

···
     alsa-lib
     openssl
     webkitgtk_4_0
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
   ];
 
   runtimeDependencies = map lib.getLib [

pkgs/by-name/mi/misskey/package.nix

···
           lib.makeLibraryPath [
             jemalloc
             ffmpeg-headless
-            stdenv.cc.cc.lib
+            stdenv.cc.cc
           ]
         }
 

pkgs/by-name/mo/modrinth-app/package.nix

···
       xorg.libXxf86vm
 
       # lwjgl
-      stdenv.cc.cc.lib
+      (lib.getLib stdenv.cc.cc)
 
       # narrator support
       flite

pkgs/by-name/mo/mongodb-ce/package.nix

···
   buildInputs = [
     curl.dev
     openssl.dev
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
   ];
 
   installPhase = ''

pkgs/by-name/ms/msalsdk-dbusclient/package.nix

···
 
     mkdir -p $out/lib
     install -m 755 usr/lib/libmsal_dbus_client.so $out/lib/
-    patchelf --set-rpath ${lib.makeLibraryPath [ stdenv.cc.cc.lib sdbus-cpp ]} $out/lib/libmsal_dbus_client.so
+    patchelf --set-rpath ${lib.makeLibraryPath [ stdenv.cc.cc sdbus-cpp ]} $out/lib/libmsal_dbus_client.so
 
     runHook postInstall
   '';

pkgs/by-name/ne/neothesia/package.nix

···
   '';
 
   env = {
-    LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
+    LIBCLANG_PATH = "${lib.getLib llvmPackages.libclang}/lib";
   };
 
   meta = {

pkgs/by-name/nu/nufmt/package.nix

···
     apple-sdk_11
   ];
 
-  env.LIBCLANG_PATH = lib.optionalString stdenv.cc.isClang "${llvmPackages.libclang.lib}/lib";
+  env.LIBCLANG_PATH = lib.optionalString stdenv.cc.isClang "${lib.getLib llvmPackages.libclang}/lib";
 
   cargoHash = "sha256-5DS6pTYGOQ4qay6+YiUstInRX17n3RViNxKXtFZ6J3k=";
 

pkgs/by-name/pa/passmark-performancetest/package.nix

···
   nativeBuildInputs = [ unzip autoPatchelfHook makeWrapper ];
 
   buildInputs = [
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     curl
     ncurses5
   ];

pkgs/by-name/ph/pharo/package.nix

···
 
   preFixup = let
     libPath = lib.makeLibraryPath (finalAttrs.buildInputs ++ [
-      stdenv.cc.cc.lib
+      stdenv.cc.cc
       "$out"
     ]);
   in ''

pkgs/by-name/ph/photonvision/package.nix

···
     install -D $src $out/lib/photonvision.jar
 
     makeWrapper ${temurin-jre-bin-11}/bin/java $out/bin/photonvision \
-      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ stdenv.cc.cc.lib suitesparse ]} \
+      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ stdenv.cc.cc suitesparse ]} \
       --prefix PATH : ${lib.makeBinPath [ temurin-jre-bin-11 bash.out ]} \
       --add-flags "-jar $out/lib/photonvision.jar"
 

pkgs/by-name/pl/plasticity/package.nix

···
     nss
     openssl
     pango
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     trash-cli
     xdg-utils
   ];

pkgs/by-name/po/pocl/package.nix

···
       rm -f $out/bin/$BASENAME
       makeWrapper ${clang}/bin/$BASENAME $out/bin/$BASENAME \
         --add-flags "-L$LIBGCC_DIR" \
-        --add-flags "-L${stdenv.cc.cc.lib}/lib"
+        --add-flags "-L${lib.getLib stdenv.cc.cc}/lib"
     done
   '';
 in

pkgs/by-name/po/portablemc/package.nix

···
     libGL
     glfw
     openal
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
 
     # oshi
     udev

pkgs/by-name/pr/prismlauncher/package.nix

···
     let
       runtimeLibs =
         [
-          stdenv.cc.cc.lib
+          (lib.getLib stdenv.cc.cc)
           ## native versions
           glfw3-minecraft
           openal

pkgs/by-name/pu/pulsar/package.nix

···
     libxkbcommon
     xorg.libxkbfile
     pango
-    stdenv.cc.cc.lib
+    stdenv.cc.cc
     systemd
   ];
 

pkgs/by-name/pu/pupdate/package.nix

···
   };
 
   buildInputs = [
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     zlib
     openssl
   ];

pkgs/by-name/ra/rainbowcrack/package.nix

···
     autoPatchelfHook
   ];
 
-  buildInputs = [ stdenv.cc.cc.lib ];
+  buildInputs = [ (lib.getLib stdenv.cc.cc) ];
 
   dontConfigure = true;
 

pkgs/by-name/se/segger-jlink/qt4-bundled.nix

···
   ];
 
   buildInputs = [
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     fontconfig
     xorg.libXrandr
     xorg.libXfixes

pkgs/by-name/se/servo/package.nix

···
       --prefix LD_LIBRARY_PATH : ${runtimePaths}
   '';
 
-  LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
+  LIBCLANG_PATH = "${lib.getLib llvmPackages.libclang}/lib";
 
   meta = {
     description = "The embeddable, independent, memory-safe, modular, parallel web rendering engine";

pkgs/by-name/sk/skypeforlinux/package.nix

···
       xorg.libXScrnSaver
       xorg.libxcb
     ]
-    + ":${stdenv.cc.cc.lib}/lib64";
+    + ":${lib.getLib stdenv.cc.cc}/lib64";
 
   src =
     if stdenv.hostPlatform.system == "x86_64-linux" then

pkgs/by-name/sl/slimserver/package.nix

···
   );
   libPath = lib.makeLibraryPath [
     zlib
-    stdenv.cc.cc.lib
+    stdenv.cc.cc
   ];
 in
 perlPackages.buildPerlPackage rec {

pkgs/by-name/st/starpls-bin/package.nix

···
   ];
 
   buildInputs = lib.optionals stdenv.hostPlatform.isElf [
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
   ];
 
   installPhase = ''

pkgs/by-name/st/staruml/package.nix

···
       --replace "/opt/StarUML/staruml" "$out/bin/staruml"
 
     mkdir -p $out/lib
-    ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/
+    ln -s ${lib.getLib stdenv.cc.cc}/lib/libstdc++.so.6 $out/lib/
     ln -s ${lib.getLib systemd}/lib/libudev.so.1 $out/lib/libudev.so.0
 
     patchelf \

pkgs/by-name/st/styluslabs-write-bin/package.nix

···
     libPath = lib.makeLibraryPath [
       libsForQt5.qtbase # libQt5PrintSupport.so.5
       libsForQt5.qtsvg  # libQt5Svg.so.5
-      stdenv.cc.cc.lib  # libstdc++.so.6
+      (lib.getLib stdenv.cc.cc)  # libstdc++.so.6
       libglvnd          # libGL.so.1
       libX11            # libX11.so.6
       libXi             # libXi.so.6

pkgs/by-name/su/surfer/package.nix

···
   buildInputs =
     lib.optionals stdenv.hostPlatform.isLinux [
       openssl
-      stdenv.cc.cc.lib
+      (lib.getLib stdenv.cc.cc)
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ];
 

pkgs/by-name/sv/svp/package.nix

···
     libusb1
     mpvForSVP
     ocl-icd
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     vapoursynth
     xdg-utils
     xorg.libX11

pkgs/by-name/tp/tplay/package.nix

···
   buildInputs = [
     openssl.dev
     alsa-lib.dev
-    libclang.lib
+    (lib.getLib libclang)
     ffmpeg.dev
     opencv
   ];

pkgs/by-name/tr/tradingview/package.nix

···
   ];
 
   buildInputs = [
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     alsa-lib
     atk
     at-spi2-atk

pkgs/by-name/ve/vesktop/package.nix

···
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     libpulseaudio
     pipewire
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
   ];
 
   patches =

pkgs/by-name/wa/warp-terminal/package.nix

···
   buildInputs = [
     curl
     fontconfig
-    stdenv.cc.cc.lib # libstdc++.so libgcc_s.so
+    (lib.getLib stdenv.cc.cc) # libstdc++.so libgcc_s.so
     zlib
   ];
 

pkgs/by-name/wi/windmill/package.nix

···
     openssl
     rustfmt
     lld
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
   ];
 
   nativeBuildInputs = [
···
           bash
         ]
       } \
-      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ stdenv.cc.cc.lib ]} \
+      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ stdenv.cc.cc ]} \
       --set PYTHON_PATH "${pythonEnv}/bin/python3" \
       --set GO_PATH "${go}/bin/go" \
       --set DENO_PATH "${deno}/bin/deno" \

pkgs/by-name/wl/wl-gammarelay-applet/package.nix

···
   ];
 
   buildInputs = [
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
   ];
 
   runtimeDependencies = [

pkgs/by-name/ya/yarg/package.nix

···
     # Load-time libraries (loaded from DT_NEEDED section in ELF binary)
     alsa-lib
     gtk3
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     zlib
 
     # Run-time libraries (loaded with dlopen)

pkgs/development/compilers/computecpp/default.nix

···
 
   dontStrip = true;
 
-  buildInputs = [ stdenv.cc.cc.lib ocl-icd zlib ];
+  buildInputs = [ (lib.getLib stdenv.cc.cc) ocl-icd zlib ];
   nativeBuildInputs = [ autoPatchelfHook pkg-config installShellFiles ];
 
   installPhase = ''

pkgs/development/compilers/emscripten/default.nix

···
 
   llvmEnv = symlinkJoin {
     name = "emscripten-llvm-${version}";
-    paths = with llvmPackages; [ clang-unwrapped clang-unwrapped.lib lld llvm ];
+    paths = with llvmPackages; [ clang-unwrapped (lib.getLib clang-unwrapped)  lld llvm ];
   };
 
   nodeModules = buildNpmPackage {

pkgs/development/compilers/fpc/lazarus.nix

···
   LCL_PLATFORM = if withQt then "qt5" else "gtk2";
 
   NIX_LDFLAGS = lib.concatStringsSep " " ([
-    "-L${stdenv.cc.cc.lib}/lib"
+    "-L${lib.getLib stdenv.cc.cc}/lib"
     "-lX11"
     "-lXext"
     "-lXi"

pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix

···
     buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
       alsa-lib # libasound.so wanted by lib/libjsound.so
       fontconfig
-      stdenv.cc.cc.lib # libstdc++.so.6
+      (lib.getLib stdenv.cc.cc) # libstdc++.so.6
       xorg.libX11
       xorg.libXext
       xorg.libXi

pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix

···
     ++ extraNativeBuildInputs;
 
   buildInputs = [
-    stdenv.cc.cc.lib # libstdc++.so.6
+    (lib.getLib stdenv.cc.cc) # libstdc++.so.6
     zlib
     libxcrypt-legacy # libcrypt.so.1 (default is .2 now)
   ]

pkgs/development/compilers/inklecate/default.nix

···
     hash = "sha512-aUjjT5Qf64wrKRn1vkwJadMOBWMkvsXUjtZ7S3/ZWAh1CCDkQNO84mSbtbVc9ny0fKeJEqaDX2tJNwq7pYqAbA==";
   };
 
-  buildInputs = [ stdenv.cc.cc.lib ];
+  buildInputs = [ (lib.getLib stdenv.cc.cc) ];
 
   projectFile = "inklecate/inklecate.csproj";
   nugetDeps = ./deps.nix;

pkgs/development/compilers/llvm/12/default.nix

···
             ({ substituteAll, libclang }: substituteAll
               {
                 src = ./lldb/resource-dir.patch;
-                clangLibDir = "${libclang.lib}/lib";
+                clangLibDir = "${lib.getLib libclang}/lib";
               })
             { };
         in

pkgs/development/compilers/llvm/common/default.nix

···
       mkExtraBuildCommands0 = cc: ''
         rsrc="$out/resource-root"
         mkdir "$rsrc"
-        ln -s "${cc.lib}/lib/clang/${clangVersion}/include" "$rsrc"
+        ln -s "${lib.getLib cc}/lib/clang/${clangVersion}/include" "$rsrc"
         echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
       '';
       mkExtraBuildCommandsBasicRt =
···
                 { substituteAll, libclang }:
                 (substituteAll {
                   src = metadata.getVersionFile "lldb/resource-dir.patch";
-                  clangLibDir = "${libclang.lib}/lib";
+                  clangLibDir = "${lib.getLib libclang}/lib";
                 }).overrideAttrs
                   (_: _: { name = "resource-dir.patch"; })
               ) { };

pkgs/development/compilers/llvm/common/lldb.nix

···
   ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
     "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic
   ] ++ lib.optionals (lib.versionAtLeast release_version "17") [
-    "-DCLANG_RESOURCE_DIR=../../../../${libclang.lib}"
+    "-DCLANG_RESOURCE_DIR=../../../../${lib.getLib libclang}"
   ] ++ lib.optionals enableManpages ([
     "-DLLVM_ENABLE_SPHINX=ON"
     "-DSPHINX_OUTPUT_MAN=ON"

pkgs/development/compilers/temurin-bin/jdk-linux-base.nix

···
       alsa-lib # libasound.so wanted by lib/libjsound.so
       fontconfig
       freetype
-      stdenv.cc.cc.lib # libstdc++.so.6
+      (lib.getLib stdenv.cc.cc) # libstdc++.so.6
       xorg.libX11
       xorg.libXext
       xorg.libXi

pkgs/development/cuda-modules/generic-builders/manifest.nix

···
     # one that is compatible with the rest of nixpkgs, even when
     # nvcc forces us to use an older gcc
     # NB: We don't actually know if this is the right thing to do
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
   ];
 
   # Picked up by autoPatchelf

pkgs/development/libraries/libcef/default.nix

···
 
 let
   gl_rpath = lib.makeLibraryPath [
-    stdenv.cc.cc.lib
+    stdenv.cc.cc
   ];
 
   rpath = lib.makeLibraryPath [

pkgs/development/libraries/libkrun/default.nix

···
     ++ lib.optional withSound pipewire
     ++ lib.optional sevVariant openssl;
 
-  env.LIBCLANG_PATH = "${llvmPackages.clang-unwrapped.lib}/lib/libclang.so";
+  env.LIBCLANG_PATH = "${lib.getLib llvmPackages.clang-unwrapped}/lib/libclang.so";
 
   makeFlags = [
     "PREFIX=${placeholder "out"}"

pkgs/development/libraries/mesa/default.nix

···
 
   # Needed to discover llvm-config for cross
   preConfigure = ''
-    PATH=${llvmPackages.libllvm.dev}/bin:$PATH
+    PATH=${lib.getDev llvmPackages.libllvm}/bin:$PATH
   '';
 
   mesonFlags = [
···
     # Enable Intel RT stuff when available
     (lib.mesonBool "install-intel-clc" true)
     (lib.mesonEnable "intel-rt" stdenv.hostPlatform.isx86_64)
-    (lib.mesonOption "clang-libdir" "${llvmPackages.clang-unwrapped.lib}/lib")
+    (lib.mesonOption "clang-libdir" "${lib.getLib llvmPackages.clang-unwrapped}/lib")
 
     # Clover, old OpenCL frontend
     (lib.mesonOption "gallium-opencl" "icd")

pkgs/development/libraries/opencl-clang/default.nix

···
 
   cmakeFlags = [
     "-DPREFERRED_LLVM_VERSION=${lib.getVersion llvm}"
-    "-DOPENCL_HEADERS_DIR=${libclang.lib}/lib/clang/${lib.getVersion libclang}/include/"
+    "-DOPENCL_HEADERS_DIR=${lib.getLib libclang}/lib/clang/${lib.getVersion libclang}/include/"
 
     "-DLLVMSPIRV_INCLUDED_IN_LLVM=OFF"
     "-DSPIRV_TRANSLATOR_DIR=${spirv-llvm-translator'}"

pkgs/development/libraries/oracle-instantclient/default.nix

···
 stdenv.mkDerivation {
   inherit pname version srcs;
 
-  buildInputs = [ stdenv.cc.cc.lib ]
+  buildInputs = [ (lib.getLib stdenv.cc.cc) ]
     ++ optional stdenv.hostPlatform.isLinux libaio
     ++ optional odbcSupport unixODBC;
 

pkgs/development/libraries/rocksdb/default.nix

···
   '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
     ls -1 $tools/bin/* | xargs -I{} install_name_tool -change "@rpath/librocksdb.${lib.versions.major finalAttrs.version}.dylib" $out/lib/librocksdb.dylib {}
   '' + lib.optionalString (stdenv.hostPlatform.isLinux && enableShared) ''
-    ls -1 $tools/bin/* | xargs -I{} patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib {}
+    ls -1 $tools/bin/* | xargs -I{} patchelf --set-rpath $out/lib:${lib.getLib stdenv.cc.cc}/lib {}
   '';
 
   # Old version doesn't ship the .pc file, new version puts wrong paths in there.

pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix

···
     pname = "libasi";
     buildInputs = [
       libusb1
-      stdenv.cc.cc.lib
+      (lib.getLib stdenv.cc.cc)
     ];
     nativeBuildInputs = [ autoPatchelfHook ];
     meta = with lib; {
···
 
   libastroasis = buildIndi3rdParty {
     pname = "libastroasis";
-    buildInputs = [ stdenv.cc.cc.lib ];
+    buildInputs = [ (lib.getLib stdenv.cc.cc) ];
     nativeBuildInputs = [ autoPatchelfHook ];
     meta = with lib; {
       license = licenses.unfreeRedistributable;
···
   libatik = buildIndi3rdParty {
     pname = "libatik";
     buildInputs = [
-      stdenv.cc.cc.lib
+      (lib.getLib stdenv.cc.cc)
       libusb1
       systemd
       libdc1394
···
   libinovasdk = buildIndi3rdParty {
     pname = "libinovasdk";
     buildInputs = [
-      stdenv.cc.cc.lib
+      (lib.getLib stdenv.cc.cc)
       libusb1
     ];
     nativeBuildInputs = [ autoPatchelfHook ];
···
     '';
 
     buildInputs = [
-      stdenv.cc.cc.lib
+      (lib.getLib stdenv.cc.cc)
       libusb1
       systemd
     ];
···
     cmakeFlags = [ "-DQHY_FIRMWARE_INSTALL_DIR=\${CMAKE_INSTALL_PREFIX}/lib/firmware/qhy" ];
 
     buildInputs = [
-      stdenv.cc.cc.lib
+      (lib.getLib stdenv.cc.cc)
       libusb1
     ];
     nativeBuildInputs = [ autoPatchelfHook ];
···
   libricohcamerasdk = buildIndi3rdParty {
     pname = "libricohcamerasdk";
     buildInputs = [
-      stdenv.cc.cc.lib
+      (lib.getLib stdenv.cc.cc)
       libusb1
     ];
     nativeBuildInputs = [ autoPatchelfHook ];
···
   libsvbony = buildIndi3rdParty {
     pname = "libsvbony";
     buildInputs = [
-      stdenv.cc.cc.lib
+      (lib.getLib stdenv.cc.cc)
       libusb1
     ];
     nativeBuildInputs = [ autoPatchelfHook ];

pkgs/development/libraries/science/math/libtorch/bin.nix

···
   device = if cudaSupport then "cuda" else "cpu";
   srcs = import ./binary-hashes.nix version;
   unavailable = throw "libtorch is not available for this platform";
-  libcxx-for-libtorch = if stdenv.hostPlatform.isDarwin then libcxx else stdenv.cc.cc.lib;
+  libcxx-for-libtorch = if stdenv.hostPlatform.isDarwin then libcxx else (lib.getLib stdenv.cc.cc);
 in stdenv.mkDerivation {
   inherit version;
   pname = "libtorch";
···
   '';
 
   postFixup = let
-    rpath = lib.makeLibraryPath [ stdenv.cc.cc.lib ];
+    rpath = lib.makeLibraryPath [ stdenv.cc.cc ];
   in lib.optionalString stdenv.hostPlatform.isLinux ''
     find $out/lib -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
       echo "setting rpath for $lib..."

pkgs/development/misc/juce/default.nix

···
   buildInputs = [
     freetype # libfreetype.so
     curl # libcurl.so
-    stdenv.cc.cc.lib # libstdc++.so libgcc_s.so
+    (lib.getLib stdenv.cc.cc) # libstdc++.so libgcc_s.so
     pcre # libpcre2.pc
   ] ++ lib.optionals stdenv.hostPlatform.isLinux [
     alsa-lib # libasound.so

pkgs/development/mobile/androidenv/ndk-bundle/default.nix

···
   nativeBuildInputs = [ makeWrapper ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
   autoPatchelfIgnoreMissingDeps = [ "*" ];
-  buildInputs = lib.optionals (os == "linux") [ pkgs.zlib pkgs.libcxx stdenv.cc.cc.lib ];
+  buildInputs = lib.optionals (os == "linux") [ pkgs.zlib pkgs.libcxx (lib.getLib stdenv.cc.cc) ];
 
   patchElfBnaries = ''
     # Patch the executables of the toolchains, but not the libraries -- they are needed for crosscompiling

pkgs/development/mobile/androidenv/platform-tools.nix

···
 deployAndroidPackage {
   inherit package os;
   nativeBuildInputs = lib.optionals (os == "linux") [ autoPatchelfHook ];
-  buildInputs = lib.optionals (os == "linux") [ pkgs.glibc pkgs.stdenv.cc.cc.lib pkgs.zlib pkgs.ncurses5 ];
+  buildInputs = lib.optionals (os == "linux") [ pkgs.glibc (lib.getLib pkgs.stdenv.cc.cc) pkgs.zlib pkgs.ncurses5 ];
 
   patchInstructions = lib.optionalString (os == "linux") ''
     addAutoPatchelfSearchPath $packageBaseDir/lib64

pkgs/development/python-modules/ifcopenshell/default.nix

···
 
   buildInputs = [
     # ifcopenshell needs stdc++
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     boost179
     cgal
     eigen

pkgs/development/python-modules/jaxlib/bin.nix

···
     lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]
     ++ lib.optionals cudaSupport [ autoAddDriverRunpath ];
   # Dynamic link dependencies
-  buildInputs = [ stdenv.cc.cc.lib ];
+  buildInputs = [ (lib.getLib stdenv.cc.cc) ];
 
   # jaxlib contains shared libraries that open other shared libraries via dlopen
   # and these implicit dependencies are not recognized by ldd or

pkgs/development/python-modules/pyside6/default.nix

···
 
   # "Couldn't find libclang.dylib You will likely need to add it manually to PATH to ensure the build succeeds."
   env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-    LLVM_INSTALL_DIR = "${llvmPackages.libclang.lib}/lib";
+    LLVM_INSTALL_DIR = "${lib.getLib llvmPackages.libclang}/lib";
   };
 
   nativeBuildInputs = [

pkgs/development/python-modules/pythran/default.nix

···
     (substituteAll {
       src = ./0001-hardcode-path-to-libgomp.patch;
       gomp = "${
-        if stdenv.cc.isClang then openmp else stdenv.cc.cc.lib
+        if stdenv.cc.isClang then openmp else (lib.getLib stdenv.cc.cc)
       }/lib/libgomp${stdenv.hostPlatform.extensions.sharedLibrary}";
     })
   ];

pkgs/development/python-modules/tensorflow/bin.nix

···
       ];
 
       libpaths = [
-        stdenv.cc.cc.lib
+        (lib.getLib stdenv.cc.cc)
         zlib
       ];
 

pkgs/development/tools/analysis/codeql/default.nix

···
     xorg.libXrender
     freetype
     jdk17
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     curl
   ];
 

pkgs/development/tools/azure-static-sites-client/default.nix

···
     libkrb5
     lttng-ust
     openssl
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     zlib
   ];
 

pkgs/development/tools/build-managers/bloop/default.nix

···
   dontUnpack = true;
   nativeBuildInputs = [ installShellFiles makeWrapper ]
     ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook;
-  buildInputs = [ stdenv.cc.cc.lib zlib ];
+  buildInputs = [ (lib.getLib stdenv.cc.cc) zlib ];
   propagatedBuildInputs = [ jre ];
 
   installPhase = ''

pkgs/development/tools/build-managers/gradle/default.nix

···
         for variant in "" "-ncurses5" "-ncurses6"; do
           autoPatchelfInJar \
             $out/lib/gradle/lib/native-platform-linux-${arch}$variant-''${nativeVersion}.jar \
-            "${stdenv.cc.cc.lib}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ncurses5 ncurses6 ]}"
+            "${lib.getLib stdenv.cc.cc}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ncurses5 ncurses6 ]}"
         done
 
         # The file-events library _seems_ to follow the native-platform version, but
···
         fileEventsVersion="$(extractVersion file-events $out/lib/gradle/lib/file-events-*.jar)"
         autoPatchelfInJar \
           $out/lib/gradle/lib/file-events-linux-${arch}-''${fileEventsVersion}.jar \
-          "${stdenv.cc.cc.lib}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ]}"
+          "${lib.getLib stdenv.cc.cc}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ]}"
 
         # The scanner doesn't pick up the runtime dependency in the jar.
         # Manually add a reference where it will be found.

pkgs/development/tools/electron/binary/generic.nix

···
     xorg.libxkbfile
     pango
     pciutils
-    stdenv.cc.cc.lib
+    stdenv.cc.cc
     systemd
   ]
     ++ lib.optionals (lib.versionAtLeast version "9.0.0") [ libdrm mesa ]

pkgs/development/tools/electron/chromedriver/generic.nix

···
     src = fetcher version (get tags platform) (get hashes platform);
 
     buildInputs = [
-      stdenv.cc.cc.lib
+      (lib.getLib stdenv.cc.cc)
       glib
       xorg.libxcb
       nspr

pkgs/development/tools/electron/common.nix

···
       libPath = lib.makeLibraryPath [
         libnotify
         pipewire
-        stdenv.cc.cc.lib
+        stdenv.cc.cc
         libsecret
         libpulseaudio
         speechd-minimal

pkgs/development/tools/gauge/plugins/dotnet/default.nix

···
   releasePrefix = "gauge-dotnet-";
   isCrossArch = true;
 
-  buildInputs = [ stdenv.cc.cc.lib ];
+  buildInputs = [ (lib.getLib stdenv.cc.cc) ];
 
   meta = {
     description = "Gauge plugin that lets you write tests in C#";

pkgs/development/tools/glamoroustoolkit/default.nix

···
       harfbuzz        # libWebView.so
       libsoup_3       # libWebView.so
       webkitgtk_4_1   # libWebView.so
-      stdenv.cc.cc.lib
+      (lib.getLib stdenv.cc.cc)
     ];
     binPath = lib.makeBinPath [
       zenity          # File selection dialog

pkgs/development/tools/hotdoc/default.nix

···
     substituteInPlace hotdoc/extensions/c/c_extension.py \
       --replace "shutil.which('llvm-config')" 'True' \
       --replace "subprocess.check_output(['llvm-config', '--version']).strip().decode()" '"${lib.versions.major llvmPackages.libclang.version}"' \
-      --replace "subprocess.check_output(['llvm-config', '--prefix']).strip().decode()" '"${llvmPackages.libclang.lib}"' \
-      --replace "subprocess.check_output(['llvm-config', '--libdir']).strip().decode()" '"${llvmPackages.libclang.lib}/lib"'
+      --replace "subprocess.check_output(['llvm-config', '--prefix']).strip().decode()" '"${lib.getLib llvmPackages.libclang}"' \
+      --replace "subprocess.check_output(['llvm-config', '--libdir']).strip().decode()" '"${lib.getLib llvmPackages.libclang}/lib"'
   '';
 
   # Make pytest run from a temp dir to have it pick up installed package for cmark

pkgs/development/tools/iaca/2.1.nix

···
     cp bin/iaca $out/bin/
     cp lib/* $out/lib
   '';
-  preFixup = let libPath = lib.makeLibraryPath [ stdenv.cc.cc.lib gcc ]; in ''
+  preFixup = let libPath = lib.makeLibraryPath [ stdenv.cc.cc gcc ]; in ''
     patchelf \
         --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 \
         --set-rpath $out/lib:"${libPath}" \

pkgs/development/tools/mblock-mlink/default.nix

···
   '';
 
   buildInputs = [
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
   ];
 
   nativeBuildInputs = [

pkgs/development/tools/misc/gdb/default.nix

···
    # $debugdir:$datadir/auto-load are whitelisted by default by GDB
    "$debugdir" "$datadir/auto-load"
    # targetPackages so we get the right libc when cross-compiling and using buildPackages.gdb
-   targetPackages.stdenv.cc.cc.lib
+   (lib.getLib targetPackages.stdenv.cc.cc)
   ]
 , writeScript
 }:

pkgs/development/tools/misc/netcoredbg/default.nix

···
   src = managed;
 
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
-  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.cc.lib ];
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ (lib.getLib stdenv.cc.cc) ];
   installPhase = ''
     mkdir -p $out/share/netcoredbg $out/bin
     cp ${unmanaged}/* $out/share/netcoredbg

pkgs/development/tools/misc/saleae-logic/default.nix

···
 
   libPath = lib.makeLibraryPath [
     glib libSM libICE gtk2 libXext libXft fontconfig libXrender libXfixes libX11
-    libXi libXrandr libXcursor freetype libXinerama libxcb zlib stdenv.cc.cc.lib
+    libXi libXrandr libXcursor freetype libXinerama libxcb zlib stdenv.cc.cc
     dbus libGL
   ];
 
···
                "$out/libQt5Gui.so.5"     \
                "$out/libQt5Core.so.5"    \
                "$out/libQt5Network.so.5" ; do
-        patchelf --set-rpath "${stdenv.cc.cc.lib}/lib:${stdenv.cc.cc.lib}/lib64:${libPath}:\$ORIGIN/Analyzers:\$ORIGIN" "$bin"
+        patchelf --set-rpath "${lib.getLib stdenv.cc.cc}/lib:${lib.getLib stdenv.cc.cc}/lib64:${libPath}:\$ORIGIN/Analyzers:\$ORIGIN" "$bin"
     done
 
-    patchelf --set-rpath "${stdenv.cc.cc.lib}/lib:${stdenv.cc.cc.lib}/lib64:${libPath}:\$ORIGIN/../" "$out/platforms/libqxcb.so"
+    patchelf --set-rpath "${lib.getLib stdenv.cc.cc}/lib:${lib.getLib stdenv.cc.cc}/lib64:${libPath}:\$ORIGIN/../" "$out/platforms/libqxcb.so"
 
     # Build the LD_PRELOAD library that makes Logic work from a read-only directory
     mkdir -p "$out/lib"

pkgs/development/tools/misc/segger-ozone/default.nix

···
     libXfixes
     libXrandr
     libXrender
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
   ];
 
   installPhase = ''

pkgs/development/tools/misc/yakut/default.nix

···
   };
 
   buildInputs = [
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     click
     coloredlogs
     psutil

pkgs/development/tools/replay-io/default.nix

···
     version = builtins.head (builtins.match ".*/linux-recordreplay-(.*).tgz"
       metadata.recordreplay.url);
     nativeBuildInputs = [ autoPatchelfHook ];
-    buildInputs = [ stdenv.cc.cc.lib openssl zlib ];
+    buildInputs = [ (lib.getLib stdenv.cc.cc) openssl zlib ];
 
     src = (fetchzip metadata.recordreplay);
     dontBuild = true;
···
     version = builtins.head
       (builtins.match ".*/linux-node-(.*)" metadata.replay-node.url);
     nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
-    buildInputs = [ stdenv.cc.cc.lib ];
+    buildInputs = [ (lib.getLib stdenv.cc.cc) ];
 
     src = (fetchurl metadata.replay-node);
     dontUnpack = true;
···
     };
 
     nativeBuildInputs = [ makeWrapper ];
-    buildInputs = [ stdenv.cc.cc.lib nodejs ];
+    buildInputs = [ (lib.getLib stdenv.cc.cc) nodejs ];
     dontBuild = true;
     installPhase = ''
       runHook preInstall

pkgs/development/tools/rust/bindgen/default.nix

···
-{ rust-bindgen-unwrapped, zlib, bash, runCommand, runCommandCC }:
+{ lib, rust-bindgen-unwrapped, zlib, bash, runCommand, runCommandCC }:
 let
   clang = rust-bindgen-unwrapped.clang;
   self = runCommand "rust-bindgen-${rust-bindgen-unwrapped.version}"
···
       #for substituteAll
       inherit bash;
       unwrapped = rust-bindgen-unwrapped;
-      libclang = clang.cc.lib;
+      libclang = (lib.getLib clang.cc);
       meta = rust-bindgen-unwrapped.meta // {
         longDescription = rust-bindgen-unwrapped.meta.longDescription + ''
           This version of bindgen is wrapped with the required compiler flags

pkgs/development/tools/rust/bindgen/unwrapped.nix

···
 
   cargoHash = "sha256-UROy/MyPBKJe+EaiUIDbOYKVbge0C9LsmfnsvOLEONE=";
 
-  buildInputs = [ clang.cc.lib ];
+  buildInputs = [ (lib.getLib clang.cc) ];
 
   preConfigure = ''
-    export LIBCLANG_PATH="${clang.cc.lib}/lib"
+    export LIBCLANG_PATH="${lib.getLib clang.cc}/lib"
   '';
 
   doCheck = true;

pkgs/development/web/postman/linux.nix

···
   ];
 
   buildInputs = [
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     atk
     at-spi2-atk
     at-spi2-core

pkgs/games/airshipper/default.nix

···
     runtimeLibs = [
       udev
       alsa-lib
-      stdenv.cc.cc.lib
+      (lib.getLib stdenv.cc.cc)
       libxkbcommon
       libxcb
       libX11

pkgs/games/andyetitmoves/default.nix

···
     mkdir -p $out/{opt/andyetitmoves,bin}
     cp -r * $out/opt/andyetitmoves/
 
-    fullPath=${stdenv.cc.cc.lib}/lib64
+    fullPath=${lib.getLib stdenv.cc.cc}/lib64
     for i in $nativeBuildInputs; do
       fullPath=$fullPath''${fullPath:+:}$i/lib
     done

pkgs/games/arena/default.nix

···
   };
 
   # stdenv.cc.cc.lib is in that list to pick up libstdc++.so. Is there a better way?
-  buildInputs = [gtk2-x11 glib pango cairo atk gdk-pixbuf libX11 stdenv.cc.cc.lib];
+  buildInputs = [gtk2-x11 glib pango cairo atk gdk-pixbuf libX11 (lib.getLib stdenv.cc.cc)];
 
   unpackPhase = ''
     # This is is a tar bomb, i.e. it extract a dozen files and directories to

pkgs/games/clonehero/default.nix

···
     # Load-time libraries (loaded from DT_NEEDED section in ELF binary)
     alsa-lib
     gtk3
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     zlib
 
     # Run-time libraries (loaded with dlopen)

pkgs/games/dwarf-fortress/game.nix

···
   buildInputs = optionals isAtLeast50 [ SDL2 SDL2_image SDL2_mixer ]
     ++ optional (!isAtLeast50) SDL
     ++ optional enableUnfuck dwarf-fortress-unfuck
-    ++ [ stdenv.cc.cc.lib ];
+    ++ [ (lib.getLib stdenv.cc.cc) ];
 
   installPhase = ''
     runHook preInstall

pkgs/games/everspace/default.nix

···
     pango
     gtk2-x11
     openal
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
   ];
 
   runtimeDependencies = [

pkgs/games/oilrush/default.nix

···
     do
       patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $f
     done
-    patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXrender fontconfig freetype ]}\
+    patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXrender fontconfig freetype ]}\
              launcher_$arch
-    patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${stdenv.cc.cc.lib}/lib\
+    patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${lib.getLib stdenv.cc.cc}/lib\
              libNetwork_$arch.so
-    patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${stdenv.cc.cc.lib}/lib\
+    patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${lib.getLib stdenv.cc.cc}/lib\
              libQtCoreUnigine_$arch.so.4
-    patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXrender fontconfig freetype ]}\
+    patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXrender fontconfig freetype ]}\
              libQtGuiUnigine_$arch.so.4
-    patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${stdenv.cc.cc.lib}/lib\
+    patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${lib.getLib stdenv.cc.cc}/lib\
              libQtNetworkUnigine_$arch.so.4
-    patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXrender fontconfig freetype ]}\
+    patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXrender fontconfig freetype ]}\
              libQtWebKitUnigine_$arch.so.4
-    patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${stdenv.cc.cc.lib}/lib\
+    patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${lib.getLib stdenv.cc.cc}/lib\
              libQtXmlUnigine_$arch.so.4
-    patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${stdenv.cc.cc.lib}/lib\
+    patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${lib.getLib stdenv.cc.cc}/lib\
              libRakNet_$arch.so
-    patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXinerama libXrandr ]}\
+    patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXinerama libXrandr ]}\
              libUnigine_$arch.so
-    patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXinerama libXrandr ]}\
+    patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXinerama libXrandr ]}\
              OilRush_$arch
   '';
   installPhase = ''

pkgs/games/planetaryannihilation/default.nix

···
     ln -s ${systemd}/lib/libudev.so.1 $out/lib/libudev.so.0
 
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/PA"
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib xorg.libXdamage xorg.libXfixes gtk2 glib stdenv.cc.libc "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsa-lib atk nspr fontconfig cairo pango nss freetype gnome2.GConf gdk-pixbuf xorg.libXrender ]}:{stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64" "$out/host/CoherentUI_Host"
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc xorg.libXdamage xorg.libXfixes gtk2 glib stdenv.cc.libc "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsa-lib atk nspr fontconfig cairo pango nss freetype gnome2.GConf gdk-pixbuf xorg.libXrender ]}:${lib.getLib stdenv.cc.cc}/lib64:${stdenv.cc.libc}/lib64" "$out/host/CoherentUI_Host"
 
-    wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib stdenv.cc.libc xorg.libX11 xorg.libXcursor gtk2 glib curl "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64"
+    wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc xorg.libX11 xorg.libXcursor gtk2 glib curl "$out" ]}:${lib.getLib stdenv.cc.cc}/lib64:${stdenv.cc.libc}/lib64"
 
     for f in $out/lib/*; do
-      patchelf --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib curl xorg.libX11 stdenv.cc.libc xorg.libXcursor "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64" $f
+      patchelf --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc curl xorg.libX11 stdenv.cc.libc xorg.libXcursor "$out" ]}:${lib.getLib stdenv.cc.cc}/lib64:${stdenv.cc.libc}/lib64" $f
     done
   '';
 

pkgs/games/worldofgoo/default.nix

···
   nativeBuildInputs = [ unzip ];
   sourceRoot = pname;
 
-  libPath = lib.makeLibraryPath [ stdenv.cc.cc.lib stdenv.cc.libc SDL2 SDL2_mixer
+  libPath = lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc SDL2 SDL2_mixer
     libogg libvorbis ];
 
   unpackPhase = ''

pkgs/kde/gear/kdevelop/default.nix

···
   ];
 
   extraCmakeFlags = [
-    "-DCLANG_BUILTIN_DIR=${libclang.lib}/lib/clang/${lib.versions.major libclang.version}/include"
+    "-DCLANG_BUILTIN_DIR=${lib.getLib libclang}/lib/clang/${lib.versions.major libclang.version}/include"
     "-DAPR_CONFIG_PATH=${apr.dev}/bin"
     "-DAPU_CONFIG_PATH=${aprutil.dev}/bin"
   ];

pkgs/misc/cups/drivers/canon/default.nix

···
       ln -sf libuictlufr2r.so.1.0.0 libuictlufr2r.so
       ln -sf libuictlufr2r.so.1.0.0 libuictlufr2r.so.1
 
-      patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64:$out/lib" libcanonufr2r.so.1.0.0
-      patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64" libcaepcmufr2.so.1.0
-      patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64" libColorGearCufr2.so.2.0.0
+      patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${lib.getLib stdenv.cc.cc}/lib64:${stdenv.cc.libc}/lib64:$out/lib" libcanonufr2r.so.1.0.0
+      patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${lib.getLib stdenv.cc.cc}/lib64:${stdenv.cc.libc}/lib64" libcaepcmufr2.so.1.0
+      patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${lib.getLib stdenv.cc.cc}/lib64:${stdenv.cc.libc}/lib64" libColorGearCufr2.so.2.0.0
     )
 
     (
       cd $out/bin
-      patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64" cnsetuputil2 cnpdfdrv
-      patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64:$out/lib" cnpkbidir cnrsdrvufr2 cnpkmoduleufr2r cnjbigufr2
+      patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${lib.getLib stdenv.cc.cc}/lib64:${stdenv.cc.libc}/lib64" cnsetuputil2 cnpdfdrv
+      patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${lib.getLib stdenv.cc.cc}/lib64:${stdenv.cc.libc}/lib64:$out/lib" cnpkbidir cnrsdrvufr2 cnpkmoduleufr2r cnjbigufr2
 
       wrapProgram $out/bin/cnrsdrvufr2 \
         --prefix LD_LIBRARY_PATH ":" "$out/lib" \

pkgs/misc/cups/drivers/samsung/1.00.36/default.nix

···
     patchelf --set-rpath "$out/lib:${lib.getLib cups}/lib" "$out/lib/libscmssc.so"
     patchelf --set-rpath "$out/lib:${libxml2.out}/lib:${libusb-compat-0_1.out}/lib" "$out/lib/sane/libsane-smfp.so.1.0.1"
 
-    ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/
+    ln -s ${lib.getLib stdenv.cc.cc}/lib/libstdc++.so.6 $out/lib/
   '';
 
   # all binaries are already stripped

pkgs/misc/cups/drivers/samsung/1.00.37.nix

···
     patchelf --set-rpath "$out/lib:${lib.getLib cups}/lib" "$out/lib/libscmssc.so"
     patchelf --set-rpath "$out/lib:${libxml2.out}/lib:${libusb-compat-0_1.out}/lib" "$out/lib/sane/libsane-smfp.so.1.0.1"
 
-    ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/
+    ln -s ${lib.getLib stdenv.cc.cc}/lib/libstdc++.so.6 $out/lib/
   '';
 
   # all binaries are already stripped

pkgs/misc/cups/drivers/samsung/4.01.17.nix

···
 let
   installationPath = if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64" else "i386";
   appendPath = lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") "64";
-  libPath = lib.makeLibraryPath [ cups libusb-compat-0_1 ] + ":$out/lib:${stdenv.cc.cc.lib}/lib${appendPath}";
+  libPath = lib.makeLibraryPath [ cups libusb-compat-0_1 ] + ":$out/lib:${lib.getLib stdenv.cc.cc}/lib${appendPath}";
 in stdenv.mkDerivation rec {
   pname = "samsung-UnifiedLinuxDriver";
   version = "4.01.17";

pkgs/misc/drivers/epkowa/default.nix

···
     # for the version, look for the driver of XP-750 in the search page
     version = "2.30.4";
 
-    buildInputs = [ stdenv.cc.cc.lib ];
+    buildInputs = [ (lib.getLib stdenv.cc.cc) ];
     nativeBuildInputs = [ autoPatchelfHook ];
 
     src = fetchurl {

pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix

···
 
   nativeBuildInputs = [
     autoPatchelfHook
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     expat
     zlib
   ];

pkgs/os-specific/linux/intel-compute-runtime/default.nix

···
   '';
 
   postFixup = ''
-    patchelf --set-rpath ${lib.makeLibraryPath [ intel-gmmlib intel-graphics-compiler libva stdenv.cc.cc.lib ]} \
+    patchelf --set-rpath ${lib.makeLibraryPath [ intel-gmmlib intel-graphics-compiler libva stdenv.cc.cc ]} \
       $out/lib/intel-opencl/libigdrcl.so
   '';
 

pkgs/os-specific/linux/intel-ocl/default.nix

···
   sourceRoot = ".";
 
   libPath = lib.makeLibraryPath [
-    stdenv.cc.cc.lib
+    stdenv.cc.cc
     ncurses5
     numactl
     zlib

pkgs/os-specific/linux/scx/default.nix

···
             zlib
           ] ++ (args.buildInputs or [ ]);
 
-          env.LIBCLANG_PATH = args.env.LIBCLANG_PATH or "${llvmPackages.libclang.lib}/lib";
+          env.LIBCLANG_PATH = args.env.LIBCLANG_PATH or "${lib.getLib llvmPackages.libclang}/lib";
 
           # Needs to be disabled in BPF builds
           hardeningDisable = [

pkgs/os-specific/linux/uhk-agent/default.nix

···
   ];
 
   buildInputs = [
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     libusb1
   ];
 

pkgs/os-specific/linux/xp-pen-drivers/deco-01-v2/default.nix

···
     libXinerama
     glibc
     libGL
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     qtx11extras
   ];
 

pkgs/os-specific/linux/xp-pen-drivers/g430/default.nix

···
     libXtst
     qtbase
     libglvnd
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
   ];
 
   installPhase = ''

pkgs/servers/blockbook/default.nix

···
   tags = [ "rocksdb_7_10" ];
 
   CGO_LDFLAGS = [
-    "-L${stdenv.cc.cc.lib}/lib"
+    "-L${lib.getLib stdenv.cc.cc}/lib"
     "-lrocksdb"
     "-lz"
     "-lbz2"

pkgs/servers/meteor/default.nix

···
     # Patch node.
     patchelf \
       --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-      --set-rpath "$(patchelf --print-rpath $out/dev_bundle/bin/node):${stdenv.cc.cc.lib}/lib" \
+      --set-rpath "$(patchelf --print-rpath $out/dev_bundle/bin/node):${lib.getLib stdenv.cc.cc}/lib" \
       $out/dev_bundle/bin/node
 
     # Patch mongo.
···
     # Patch node dlls.
     for p in $(find $out/packages -name '*.node'); do
       patchelf \
-        --set-rpath "$(patchelf --print-rpath $p):${stdenv.cc.cc.lib}/lib" \
+        --set-rpath "$(patchelf --print-rpath $p):${lib.getLib stdenv.cc.cc}/lib" \
         $p || true
     done
   '';

pkgs/servers/networkaudiod/default.nix

···
 
   buildInputs = [
     alsa-lib
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
   ];
 
   dontConfigure = true;

pkgs/servers/photoprism/libtensorflow.nix

···
   # Patch library to use our libc, libstdc++ and others
   patchPhase =
     let
-      rpath = lib.makeLibraryPath [ stdenv.cc.libc stdenv.cc.cc.lib ];
+      rpath = lib.makeLibraryPath [ stdenv.cc.libc stdenv.cc.cc ];
     in
     ''
       chmod -R +w lib

pkgs/servers/roon-bridge/default.nix

···
   buildInputs = [
     alsa-lib
     zlib
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
   ];
 
   nativeBuildInputs = [ autoPatchelfHook makeWrapper ];

pkgs/servers/roon-server/default.nix

···
     krb5
     libtasn1
     lttng-ust_2_12
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
   ];
 
   nativeBuildInputs = [ autoPatchelfHook makeWrapper ];

pkgs/servers/search/opensearch/default.nix

···
 
     wrapProgram $out/bin/opensearch \
       --prefix PATH : "${lib.makeBinPath [ gnugrep coreutils ]}" \
-      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$out/plugins/opensearch-knn/lib/" \
+      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}:$out/plugins/opensearch-knn/lib/" \
       --set JAVA_HOME "${jre_headless}"
 
     wrapProgram $out/bin/opensearch-plugin --set JAVA_HOME "${jre_headless}"

pkgs/servers/urserver/default.nix

···
   ];
 
   buildInputs = [
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     bluez
     libX11
     libXtst

pkgs/stdenv/darwin/default.nix

···
 
                 rsrc="$out/resource-root"
                 mkdir "$rsrc"
-                ln -s "$(clangResourceRootIncludePath "${clang-unwrapped.lib}")" "$rsrc"
+                ln -s "$(clangResourceRootIncludePath "${lib.getLib clang-unwrapped}")" "$rsrc"
                 ln -s "${compiler-rt.out}/lib"   "$rsrc/lib"
                 ln -s "${compiler-rt.out}/share" "$rsrc/share"
                 echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
···
                       extraBuildCommands = ''
                         rsrc="$out/resource-root"
                         mkdir "$rsrc"
-                        ln -s "${cc.lib}/lib/clang/${lib.versions.major (lib.getVersion cc)}/include" "$rsrc"
+                        ln -s "${lib.getLib cc}/lib/clang/${lib.versions.major (lib.getVersion cc)}/include" "$rsrc"
                         echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
                         ln -s "${prevStage.llvmPackages.compiler-rt.out}/lib" "$rsrc/lib"
                         ln -s "${prevStage.llvmPackages.compiler-rt.out}/share" "$rsrc/share"
···
           ++ (with prevStage.llvmPackages; [
             bintools-unwrapped
             clang-unwrapped
-            clang-unwrapped.lib
+            (lib.getLib clang-unwrapped)
             compiler-rt
             compiler-rt.dev
             libcxx

pkgs/tools/admin/pulumi-bin/default.nix

···
   installPhase = ''
     install -D -t $out/bin/ *
   '' + lib.optionalString stdenv.hostPlatform.isLinux ''
-    wrapProgram $out/bin/pulumi --set LD_LIBRARY_PATH "${stdenv.cc.cc.lib}/lib"
+    wrapProgram $out/bin/pulumi --set LD_LIBRARY_PATH "${lib.getLib stdenv.cc.cc}/lib"
   '' + ''
     installShellCompletion --cmd pulumi \
       --bash <($out/bin/pulumi completion bash) \

pkgs/tools/admin/pulumi/default.nix

···
         mkdir -p $out/bin
         makeWrapper ${pulumi}/bin/pulumi $out/bin/pulumi \
           --suffix PATH : ${lib.makeBinPath (f pulumiPackages)} \
-          --set LD_LIBRARY_PATH "${stdenv.cc.cc.lib}/lib"
+          --set LD_LIBRARY_PATH "${lib.getLib stdenv.cc.cc}/lib"
       '';
   };
 

pkgs/tools/archivers/rar/default.nix

···
 
   dontBuild = true;
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.cc.lib ];
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ (lib.getLib stdenv.cc.cc) ];
 
   nativeBuildInputs = [ installShellFiles ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];

pkgs/tools/audio/stt/default.nix

···
   buildInputs = [
     bzip2
     xz
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
   ];
 
   installPhase = ''

pkgs/tools/filesystems/yandex-disk/default.nix

···
 let
   p = if stdenv.hostPlatform.is64bit then {
       arch = "x86_64";
-      gcclib = "${stdenv.cc.cc.lib}/lib64";
+      gcclib = "${lib.getLib stdenv.cc.cc}/lib64";
       sha256 = "sha256-HH/pLZmDr6m/B3e6MHafDGnNWR83oR2y1ijVMR/LOF0=";
       webarchive = "20220519080155";
     }
     else {
       arch = "i386";
-      gcclib = "${stdenv.cc.cc.lib}/lib";
+      gcclib = "${lib.getLib stdenv.cc.cc}/lib";
       sha256 = "sha256-28dmdnJf+qh9r3F0quwlYXB/UqcOzcHzuzFq8vt2bf0=";
       webarchive = "20220519080430";
     };

pkgs/tools/games/opentracker/default.nix

···
   ];
 
   buildInputs = [
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     fontconfig
     gtk3
     icu

pkgs/tools/misc/esphome/default.nix

···
     # inetutils is used in esphome/dashboard/status/ping.py
     "--prefix PATH : ${lib.makeBinPath [ platformio esptool git inetutils ]}"
     "--prefix PYTHONPATH : ${python.pkgs.makePythonPath dependencies}" # will show better error messages
-    "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}"
+    "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ stdenv.cc.cc ]}"
     "--set ESPHOME_USE_SUBPROCESS ''"
   ];
 

pkgs/tools/misc/geekbench/5.nix

···
 
   nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
 
-  buildInputs = [ stdenv.cc.cc.lib ];
+  buildInputs = [ (lib.getLib stdenv.cc.cc) ];
 
   installPhase = ''
     runHook preInstall

pkgs/tools/misc/geekbench/6.nix

···
 
   nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
 
-  buildInputs = [ stdenv.cc.cc.lib ];
+  buildInputs = [ (lib.getLib stdenv.cc.cc) ];
 
   installPhase = ''
     runHook preInstall

pkgs/tools/misc/megacli/default.nix

···
 
     ${patchelf}/bin/patchelf \
       --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.cc.lib}/lib \
+      --set-rpath ${libPath}:${lib.getLib stdenv.cc.cc}/lib64:${lib.getLib stdenv.cc.cc}/lib \
       $out/opt/MegaRAID/MegaCli/MegaCli64
 
     ln -s $out/opt/MegaRAID/MegaCli/MegaCli64 $out/bin/MegaCli64

pkgs/tools/networking/cloudflare-warp/default.nix

···
     libpcap
     openssl
     nss
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
   ];
 
   desktopItems = [

pkgs/tools/networking/mqttmultimeter/default.nix

···
     copyDesktopItems
   ];
 
-  buildInputs = [ stdenv.cc.cc.lib ];
+  buildInputs = [ (lib.getLib stdenv.cc.cc) ];
 
   postInstall = ''
     rm -rf $out/lib/${lib.toLower pname}/runtimes/{*musl*,win*}

pkgs/tools/package-management/lix/common.nix

···
       rm -f $out/lib/*.a
       ${lib.optionalString stdenv.hostPlatform.isLinux ''
         chmod u+w $out/lib/*.so.*
-        patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib $out/lib/libboost_thread.so.*
+        patchelf --set-rpath $out/lib:${lib.getLib stdenv.cc.cc}/lib $out/lib/libboost_thread.so.*
       ''}
       ${lib.optionalString stdenv.hostPlatform.isDarwin ''
         for LIB in $out/lib/*.dylib; do

pkgs/tools/package-management/nix/common.nix

···
       rm -f $out/lib/*.a
       ${lib.optionalString stdenv.hostPlatform.isLinux ''
         chmod u+w $out/lib/*.so.*
-        patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib $out/lib/libboost_thread.so.*
+        patchelf --set-rpath $out/lib:${lib.getLib stdenv.cc.cc}/lib $out/lib/libboost_thread.so.*
       ''}
     '' +
     # On all versions before c9f51e87057652db0013289a95deffba495b35e7, which

pkgs/tools/security/ghidra/default.nix

···
   ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
 
   buildInputs = [
-    stdenv.cc.cc.lib
+    (lib.getLib stdenv.cc.cc)
     pam
   ];
 

pkgs/tools/system/dell-command-configure/default.nix

···
   inherit version;
   pname = "dell-command-configure";
 
-  buildInputs = [ openssl stdenv.cc.cc.lib ];
+  buildInputs = [ openssl (lib.getLib stdenv.cc.cc) ];
   nativeBuildInputs = [ autoPatchelfHook ];
   dontConfigure = true;