diff options
-rw-r--r-- | pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix | 4 | ||||
-rw-r--r-- | pkgs/by-name/ve/vesktop/package.nix | 3 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 12 |
3 files changed, 4 insertions, 15 deletions
diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix b/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix index 00acdef9b7ab6..71ac28ca749dd 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix @@ -1,13 +1,13 @@ { 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 ] diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index e29007a1876c1..26c9efec448ae 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -1,7 +1,6 @@ { 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 '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c74b39af6e60..caaeccf78133c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; }; |