cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #288481 from trofi/avoid-gcc13Stdenv

Browse source 
hyprland, vesktop, gtkclipblock: avoid gcc13 stdenv
This commit is contained in:
kirillrdy 2024-02-15 06:02:40 +11:00 committed by GitHub
commit c2507ad16b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix
View file

@ -1,13 +1,13 @@
{ lib { lib
, callPackage , callPackage
, pkg-config , pkg-config
, gcc13Stdenv , stdenv
, hyprland , hyprland
}: }:
let let
mkHyprlandPlugin = mkHyprlandPlugin =
args@{ pluginName, ... }: args@{ pluginName, ... }:
gcc13Stdenv.mkDerivation (args // { stdenv.mkDerivation (args // {
pname = "${pluginName}"; pname = "${pluginName}";
nativeBuildInputs = [ pkg-config ] ++ args.nativeBuildInputs or [ ]; nativeBuildInputs = [ pkg-config ] ++ args.nativeBuildInputs or [ ];
buildInputs = [ hyprland ] buildInputs = [ hyprland ]

3
pkgs/by-name/ve/vesktop/package.nix
View file

@ -1,7 +1,6 @@
{ lib { lib
, stdenv , stdenv
, stdenvNoCC , stdenvNoCC
, gcc13Stdenv
, fetchFromGitHub , fetchFromGitHub
, substituteAll , substituteAll
, makeWrapper , makeWrapper
@ -123,7 +122,7 @@ stdenv.mkDerivation (finalAttrs: {
libpulseaudio libpulseaudio
libnotify libnotify
pipewire pipewire
gcc13Stdenv.cc.cc.lib stdenv.cc.cc.lib
] ++ lib.optional withTTS speechd); ] ++ lib.optional withTTS speechd);
in in
'' ''

12
pkgs/top-level/all-packages.nix
View file

@ -5664,7 +5664,6 @@ with pkgs;
hyprdim = callPackage ../applications/misc/hyprdim { }; hyprdim = callPackage ../applications/misc/hyprdim { };
hyprland = callPackage ../applications/window-managers/hyprwm/hyprland { hyprland = callPackage ../applications/window-managers/hyprwm/hyprland {
stdenv = gcc13Stdenv;
wlroots = callPackage ../applications/window-managers/hyprwm/hyprland/wlroots.nix { }; wlroots = callPackage ../applications/window-managers/hyprwm/hyprland/wlroots.nix { };
udis86 = callPackage ../applications/window-managers/hyprwm/hyprland/udis86.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 { }; hyprland-protocols = callPackage ../applications/window-managers/hyprwm/hyprland-protocols { };
hyprlang = callPackage ../by-name/hy/hyprlang/package.nix {
stdenv = gcc13Stdenv;
};
hyprnome = callPackage ../applications/misc/hyprnome { }; hyprnome = callPackage ../applications/misc/hyprnome { };
hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { };
stdenv = gcc13Stdenv;
};
hyprpicker = callPackage ../applications/window-managers/hyprwm/hyprpicker { hyprpicker = callPackage ../applications/window-managers/hyprwm/hyprpicker {
wlroots = wlroots_0_16; wlroots = wlroots_0_16;
@ -8965,8 +8958,6 @@ with pkgs;
gtdialog = callPackage ../development/libraries/gtdialog { }; gtdialog = callPackage ../development/libraries/gtdialog { };
gtkclipblock = callPackage ../by-name/gt/gtkclipblock/package.nix { stdenv = gcc13Stdenv; };
gtkd = callPackage ../development/libraries/gtkd { dcompiler = ldc; }; gtkd = callPackage ../development/libraries/gtkd { dcompiler = ldc; };
gtkgnutella = callPackage ../tools/networking/p2p/gtk-gnutella { }; 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-gtk = callPackage ../development/libraries/xdg-desktop-portal-gtk { };
xdg-desktop-portal-hyprland = callPackage ../applications/window-managers/hyprwm/xdg-desktop-portal-hyprland { xdg-desktop-portal-hyprland = callPackage ../applications/window-managers/hyprwm/xdg-desktop-portal-hyprland {
stdenv = gcc13Stdenv;
inherit (qt6) qtbase qttools qtwayland wrapQtAppsHook; inherit (qt6) qtbase qttools qtwayland wrapQtAppsHook;
}; };