Unverified Commit c2507ad1 authored by kirillrdy's avatar kirillrdy Committed by GitHub
Browse files

Merge pull request #288481 from trofi/avoid-gcc13Stdenv 

hyprland, vesktop, gtkclipblock: avoid gcc13 stdenv
parents ac6c0ae7 95d4a838

pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix

+2 −2
Original line number Diff line number Diff line 
{ lib

, callPackage

, pkg-config

, gcc13Stdenv

, stdenv

, hyprland

}:

let

  mkHyprlandPlugin =

    args@{ pluginName, ... }:

    gcc13Stdenv.mkDerivation (args // {

    stdenv.mkDerivation (args // {

      pname = "${pluginName}";

      nativeBuildInputs = [ pkg-config ] ++ args.nativeBuildInputs or [ ];

      buildInputs = [ hyprland ]

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

+1 −2
Original line number Diff line number Diff line 
{ lib

, stdenv

, stdenvNoCC

, gcc13Stdenv

, fetchFromGitHub

, substituteAll

, makeWrapper
@@ -123,7 +122,7 @@ stdenv.mkDerivation (finalAttrs: { 
        libpulseaudio

        libnotify

        pipewire

        gcc13Stdenv.cc.cc.lib

        stdenv.cc.cc.lib

      ] ++ lib.optional withTTS speechd);

    in

    ''

pkgs/top-level/all-packages.nix

+1 −11
Original line number Diff line number Diff line
@@ -5664,7 +5664,6 @@ with pkgs; 
  hyprdim = callPackage ../applications/misc/hyprdim { };















  hyprland = callPackage ../applications/window-managers/hyprwm/hyprland {













    stdenv = gcc13Stdenv;















    wlroots = callPackage ../applications/window-managers/hyprwm/hyprland/wlroots.nix { };















    udis86 = callPackage ../applications/window-managers/hyprwm/hyprland/udis86.nix { };















  };









@@ -5675,15 +5674,9 @@ with pkgs;



























  hyprland-protocols = callPackage ../applications/window-managers/hyprwm/hyprland-protocols { };



























  hyprlang = callPackage ../by-name/hy/hyprlang/package.nix {













    stdenv = gcc13Stdenv;













  };



























  hyprnome = callPackage ../applications/misc/hyprnome { };



























  hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper {













    stdenv = gcc13Stdenv;













  };













  hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { };





























  hyprpicker = callPackage ../applications/window-managers/hyprwm/hyprpicker {















    wlroots = wlroots_0_16;










@@ -8965,8 +8958,6 @@ with pkgs;



























  gtdialog = callPackage ../development/libraries/gtdialog { };



























  gtkclipblock = callPackage ../by-name/gt/gtkclipblock/package.nix { stdenv = gcc13Stdenv; };



























  gtkd = callPackage ../development/libraries/gtkd { dcompiler = ldc; };





























  gtkgnutella = callPackage ../tools/networking/p2p/gtk-gnutella { };










@@ -36447,7 +36438,6 @@ with pkgs;













  xdg-desktop-portal-gtk = callPackage ../development/libraries/xdg-desktop-portal-gtk { };





























  xdg-desktop-portal-hyprland = callPackage ../applications/window-managers/hyprwm/xdg-desktop-portal-hyprland {













    stdenv = gcc13Stdenv;















    inherit (qt6) qtbase qttools qtwayland wrapQtAppsHook;















  };