Unverified Commit 3a6d4d00 authored by Emily's avatar Emily Committed by GitHub
Browse files

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

parents 61af34b8 52bf1163

nixos/tests/vscode-remote-ssh.nix

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ in { 
      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

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec { 
  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

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec { 
    libxkbcommon

    pipewire

    pulseaudio

    stdenv.cc.cc.lib

    (lib.getLib stdenv.cc.cc)

    xcbutil

    xcbutilwm

    zlib

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

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec { 
    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

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ buildDotnetModule rec { 
    graphicsmagick

  ];



  buildInputs = [ stdenv.cc.cc.lib fontconfig ];

  buildInputs = [ (lib.getLib stdenv.cc.cc) fontconfig ];



  runtimeDeps = [

    libglvnd