Unverified Commit 25d265d4 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #234198 from wegank/microsoft-gsl-rename 

treewide: microsoft_gsl -> microsoft-gsl
parents b25d03cc 5bafafe3

pkgs/applications/misc/iptsd/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
, fmt

, hidrd

, inih

, microsoft_gsl

, microsoft-gsl

, spdlog

, systemd

}:
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec { 
    fmt

    hidrd

    inih

    microsoft_gsl

    microsoft-gsl

    spdlog

    systemd

  ];

pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
, jemalloc

, rnnoise

, abseil-cpp

, microsoft_gsl

, microsoft-gsl

, wayland

, libicns

, Cocoa
@@ -140,7 +140,7 @@ stdenv.mkDerivation rec { 
    tl-expected

    rnnoise

    tg_owt

    microsoft_gsl

    microsoft-gsl

  ] ++ lib.optionals stdenv.isLinux [

    kwayland

    alsa-lib
@@ -199,7 +199,7 @@ stdenv.mkDerivation rec { 
  preFixup = ''

    binName=${if stdenv.isLinux then "kotatogram-desktop" else "Kotatogram"}

    remove-references-to -t ${stdenv.cc.cc} $out/bin/$binName

    remove-references-to -t ${microsoft_gsl} $out/bin/$binName

    remove-references-to -t ${microsoft-gsl} $out/bin/$binName

    remove-references-to -t ${tg_owt.dev} $out/bin/$binName

  '';

pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 
, libsysprof-capture

, libpsl

, brotli

, microsoft_gsl

, microsoft-gsl

, rlottie

, stdenv

}:
@@ -161,7 +161,7 @@ stdenv.mkDerivation rec { 
    libsysprof-capture

    libpsl

    brotli

    microsoft_gsl

    microsoft-gsl

    rlottie

  ];

pkgs/applications/terminal-emulators/contour/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
, boost

, catch2

, fmt

, microsoft_gsl

, microsoft-gsl

, range-v3

, yaml-cpp

, ncurses
@@ -62,7 +62,7 @@ mkDerivation rec { 
    boost

    catch2

    fmt

    microsoft_gsl

    microsoft-gsl

    range-v3

    yaml-cpp

  ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.libs.utmp ];

pkgs/development/libraries/iqueue/default.nix

+2 −2
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, pkg-config, libbsd, microsoft_gsl }:

{ lib, stdenv, fetchurl, pkg-config, libbsd, microsoft-gsl }:



stdenv.mkDerivation rec {

  pname = "iqueue";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec { 


  doCheck = true;

  nativeBuildInputs = [ pkg-config ];

  buildInputs = [ libbsd microsoft_gsl ];

  buildInputs = [ libbsd microsoft-gsl ];



  env.NIX_CFLAGS_COMPILE = toString [

    # Needed with GCC 12