diff --git a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix index c4fcab1949b1..544f4f627efd 100644 --- a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix +++ b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix @@ -1,6 +1,6 @@ { lib, - gcc14Stdenv, + stdenv, fetchFromGitHub, cmake, makeWrapper, @@ -26,7 +26,7 @@ wayland-scanner, debug ? false, }: -gcc14Stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "xdg-desktop-portal-hyprland"; version = "1.3.9"; diff --git a/pkgs/by-name/hy/hyprcursor/package.nix b/pkgs/by-name/hy/hyprcursor/package.nix index 2f5f95be496b..254b9c65901d 100644 --- a/pkgs/by-name/hy/hyprcursor/package.nix +++ b/pkgs/by-name/hy/hyprcursor/package.nix @@ -1,6 +1,6 @@ { lib, - gcc14Stdenv, + stdenv, fetchFromGitHub, cmake, pkg-config, @@ -12,7 +12,7 @@ tomlplusplus, nix-update-script, }: -gcc14Stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "hyprcursor"; version = "0.1.12"; diff --git a/pkgs/by-name/hy/hypridle/package.nix b/pkgs/by-name/hy/hypridle/package.nix index 488ec0e9ad4f..61dceae40db7 100644 --- a/pkgs/by-name/hy/hypridle/package.nix +++ b/pkgs/by-name/hy/hypridle/package.nix @@ -1,6 +1,6 @@ { lib, - gcc14Stdenv, + stdenv, fetchFromGitHub, pkg-config, cmake, @@ -16,7 +16,7 @@ nix-update-script, }: -gcc14Stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "hypridle"; version = "0.1.6"; diff --git a/pkgs/by-name/hy/hyprland-qtutils/package.nix b/pkgs/by-name/hy/hyprland-qtutils/package.nix index 695fc391751e..500a2eb1a9b9 100644 --- a/pkgs/by-name/hy/hyprland-qtutils/package.nix +++ b/pkgs/by-name/hy/hyprland-qtutils/package.nix @@ -1,6 +1,6 @@ { lib, - gcc14Stdenv, + stdenv, fetchFromGitHub, cmake, pkg-config, @@ -12,7 +12,7 @@ let inherit (lib.strings) makeBinPath; in -gcc14Stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "hyprland-qtutils"; version = "0.1.4"; diff --git a/pkgs/by-name/hy/hyprlang/package.nix b/pkgs/by-name/hy/hyprlang/package.nix index 9c0125f130e9..4cf3d2bf5b88 100644 --- a/pkgs/by-name/hy/hyprlang/package.nix +++ b/pkgs/by-name/hy/hyprlang/package.nix @@ -1,13 +1,13 @@ { lib, - gcc14Stdenv, + stdenv, fetchFromGitHub, cmake, pkg-config, hyprutils, }: -gcc14Stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "hyprlang"; version = "0.6.3"; diff --git a/pkgs/by-name/hy/hyprlock/package.nix b/pkgs/by-name/hy/hyprlock/package.nix index 57b3be59764e..53f15041f4ee 100644 --- a/pkgs/by-name/hy/hyprlock/package.nix +++ b/pkgs/by-name/hy/hyprlock/package.nix @@ -1,6 +1,6 @@ { lib, - gcc14Stdenv, + stdenv, fetchFromGitHub, cmake, pkg-config, @@ -26,7 +26,7 @@ nix-update-script, }: -gcc14Stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "hyprlock"; version = "0.9.0"; diff --git a/pkgs/by-name/hy/hyprpaper/package.nix b/pkgs/by-name/hy/hyprpaper/package.nix index 3b349ea80d00..df52471c8b1f 100644 --- a/pkgs/by-name/hy/hyprpaper/package.nix +++ b/pkgs/by-name/hy/hyprpaper/package.nix @@ -1,6 +1,6 @@ { lib, - gcc14Stdenv, + stdenv, fetchFromGitHub, cmake, cairo, @@ -31,7 +31,7 @@ hyprgraphics, }: -gcc14Stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "hyprpaper"; version = "0.7.5"; @@ -90,7 +90,7 @@ gcc14Stdenv.mkDerivation (finalAttrs: { license = licenses.bsd3; teams = [ lib.teams.hyprland ]; inherit (wayland.meta) platforms; - broken = gcc14Stdenv.hostPlatform.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "hyprpaper"; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be64ee151950..3e13c9bc896b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2204,12 +2204,72 @@ with pkgs; cairo = cairo.override { xcbSupport = true; }; }; + aquamarine = callPackage ../by-name/aq/aquamarine/package.nix { + stdenv = gcc15Stdenv; + }; + + hyprcursor = callPackage ../by-name/hy/hyprcursor/package.nix { + stdenv = gcc15Stdenv; + }; + + hyprgraphics = callPackage ../by-name/hy/hyprgraphics/package.nix { + stdenv = gcc15Stdenv; + }; + + hypridle = callPackage ../by-name/hy/hypridle/package.nix { + stdenv = gcc15Stdenv; + }; + hyprland = callPackage ../by-name/hy/hyprland/package.nix { stdenv = gcc15Stdenv; }; + hyprland-protocols = callPackage ../by-name/hy/hyprland-protocols/package.nix { + stdenv = gcc15Stdenv; + }; + + hyprland-qt-support = callPackage ../by-name/hy/hyprland-qt-support/package.nix { + stdenv = gcc15Stdenv; + }; + + hyprland-qtutils = callPackage ../by-name/hy/hyprland-qtutils/package.nix { + stdenv = gcc15Stdenv; + }; + + hyprlang = callPackage ../by-name/hy/hyprlang/package.nix { + stdenv = gcc15Stdenv; + }; + + hyprlock = callPackage ../by-name/hy/hyprlock/package.nix { + stdenv = gcc15Stdenv; + }; + + hyprpaper = callPackage ../by-name/hy/hyprpaper/package.nix { + stdenv = gcc15Stdenv; + }; + + hyprpicker = callPackage ../by-name/hy/hyprpicker/package.nix { + stdenv = gcc15Stdenv; + }; + hyprpolkitagent = callPackage ../by-name/hy/hyprpolkitagent/package.nix { - stdenv = gcc14Stdenv; + stdenv = gcc15Stdenv; + }; + + hyprsunset = callPackage ../by-name/hy/hyprsunset/package.nix { + stdenv = gcc15Stdenv; + }; + + hyprsysteminfo = callPackage ../by-name/hy/hyprsysteminfo/package.nix { + stdenv = gcc15Stdenv; + }; + + hyprutils = callPackage ../by-name/hy/hyprutils/package.nix { + stdenv = gcc15Stdenv; + }; + + hyprwayland-scanner = callPackage ../by-name/hy/hyprwayland-scanner/package.nix { + stdenv = gcc15Stdenv; }; hyprshade = python3Packages.callPackage ../applications/window-managers/hyprwm/hyprshade { }; @@ -14318,6 +14378,7 @@ with pkgs; xdg-desktop-portal-hyprland = callPackage ../applications/window-managers/hyprwm/xdg-desktop-portal-hyprland { + stdenv = gcc15Stdenv; inherit (qt6) qtbase qttools