Commit fc63f763 authored by Sergei Trofimovich's avatar Sergei Trofimovich
Browse files

hyprland: use `stdenv` instead of `gcc13Stdenv` 

`gcc-13` as a default now. Let's switch to use it to ease migration to
future migration to `gcc-14`.
parent 4e53560e

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/top-level/all-packages.nix

+1 −9
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;










@@ -36463,7 +36456,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;















  };