diff --git a/pkgs/by-name/hy/hyprcursor/package.nix b/pkgs/by-name/hy/hyprcursor/package.nix index ca36cdaef2fe..a0dca3c3415b 100644 --- a/pkgs/by-name/hy/hyprcursor/package.nix +++ b/pkgs/by-name/hy/hyprcursor/package.nix @@ -1,6 +1,6 @@ { lib, - stdenv, + gcc15Stdenv, fetchFromGitHub, cmake, pkg-config, @@ -12,7 +12,7 @@ tomlplusplus, nix-update-script, }: -stdenv.mkDerivation (finalAttrs: { +gcc15Stdenv.mkDerivation (finalAttrs: { pname = "hyprcursor"; version = "0.1.13"; diff --git a/pkgs/by-name/hy/hyprgraphics/package.nix b/pkgs/by-name/hy/hyprgraphics/package.nix index 7e4412aa079f..2de55be5a2a8 100644 --- a/pkgs/by-name/hy/hyprgraphics/package.nix +++ b/pkgs/by-name/hy/hyprgraphics/package.nix @@ -1,6 +1,6 @@ { lib, - stdenv, + gcc15Stdenv, fetchFromGitHub, nix-update-script, cmake, @@ -17,7 +17,7 @@ pixman, }: -stdenv.mkDerivation (finalAttrs: { +gcc15Stdenv.mkDerivation (finalAttrs: { pname = "hyprgraphics"; version = "0.4.0"; diff --git a/pkgs/by-name/hy/hypridle/package.nix b/pkgs/by-name/hy/hypridle/package.nix index 062cb0908ebe..0791f1389ba7 100644 --- a/pkgs/by-name/hy/hypridle/package.nix +++ b/pkgs/by-name/hy/hypridle/package.nix @@ -1,6 +1,6 @@ { lib, - stdenv, + gcc15Stdenv, fetchFromGitHub, pkg-config, cmake, @@ -16,7 +16,7 @@ nix-update-script, }: -stdenv.mkDerivation (finalAttrs: { +gcc15Stdenv.mkDerivation (finalAttrs: { pname = "hypridle"; version = "0.1.7"; diff --git a/pkgs/by-name/hy/hyprland-protocols/package.nix b/pkgs/by-name/hy/hyprland-protocols/package.nix index fc3a02b1ae53..4f86862e1d81 100644 --- a/pkgs/by-name/hy/hyprland-protocols/package.nix +++ b/pkgs/by-name/hy/hyprland-protocols/package.nix @@ -1,11 +1,11 @@ { lib, - stdenv, + gcc15Stdenv, fetchFromGitHub, meson, ninja, }: -stdenv.mkDerivation (finalAttrs: { +gcc15Stdenv.mkDerivation (finalAttrs: { pname = "hyprland-protocols"; version = "0.7.0"; diff --git a/pkgs/by-name/hy/hyprland-qt-support/package.nix b/pkgs/by-name/hy/hyprland-qt-support/package.nix index e160e7561c2b..7e57ce1683d1 100644 --- a/pkgs/by-name/hy/hyprland-qt-support/package.nix +++ b/pkgs/by-name/hy/hyprland-qt-support/package.nix @@ -1,6 +1,6 @@ { lib, - stdenv, + gcc15Stdenv, fetchFromGitHub, cmake, ninja, @@ -8,7 +8,7 @@ pkg-config, hyprlang, }: -stdenv.mkDerivation (finalAttrs: { +gcc15Stdenv.mkDerivation (finalAttrs: { pname = "hyprland-qt-support"; version = "0.1.0"; diff --git a/pkgs/by-name/hy/hyprland-qtutils/package.nix b/pkgs/by-name/hy/hyprland-qtutils/package.nix index 12cac7364ae0..59242eeb582b 100644 --- a/pkgs/by-name/hy/hyprland-qtutils/package.nix +++ b/pkgs/by-name/hy/hyprland-qtutils/package.nix @@ -1,6 +1,6 @@ { lib, - stdenv, + gcc15Stdenv, fetchFromGitHub, fetchpatch, cmake, @@ -13,7 +13,7 @@ let inherit (lib.strings) makeBinPath; in -stdenv.mkDerivation (finalAttrs: { +gcc15Stdenv.mkDerivation (finalAttrs: { pname = "hyprland-qtutils"; version = "0.1.5"; diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix index d55c28a961e4..3e1cdc33a198 100644 --- a/pkgs/by-name/hy/hyprland/package.nix +++ b/pkgs/by-name/hy/hyprland/package.nix @@ -1,6 +1,6 @@ { lib, - stdenv, + gcc15Stdenv, stdenvAdapters, fetchFromGitHub, pkg-config, @@ -42,7 +42,7 @@ xwayland, debug ? false, enableXWayland ? true, - withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, + withSystemd ? lib.meta.availableOn gcc15Stdenv.hostPlatform systemd, wrapRuntimeDeps ? true, # deprecated flags nvidiaPatches ? false, @@ -75,11 +75,11 @@ let # which would be controlled by the `debug` flag # Condition on darwin to avoid breaking eval for darwin in CI, # even though darwin is not supported anyway. - adapters = lib.optionals (!stdenv.targetPlatform.isDarwin) [ + adapters = lib.optionals (!gcc15Stdenv.targetPlatform.isDarwin) [ stdenvAdapters.useMoldLinker ]; - customStdenv = foldl' (acc: adapter: adapter acc) stdenv adapters; + customStdenv = foldl' (acc: adapter: adapter acc) gcc15Stdenv adapters; in assert assertMsg (!nvidiaPatches) "The option `nvidiaPatches` has been removed."; assert assertMsg (!enableNvidiaPatches) "The option `enableNvidiaPatches` has been removed."; diff --git a/pkgs/by-name/hy/hyprlang/package.nix b/pkgs/by-name/hy/hyprlang/package.nix index ea19642e584e..57edd414661f 100644 --- a/pkgs/by-name/hy/hyprlang/package.nix +++ b/pkgs/by-name/hy/hyprlang/package.nix @@ -1,13 +1,13 @@ { lib, - stdenv, + gcc15Stdenv, fetchFromGitHub, cmake, pkg-config, hyprutils, }: -stdenv.mkDerivation (finalAttrs: { +gcc15Stdenv.mkDerivation (finalAttrs: { pname = "hyprlang"; version = "0.6.7"; diff --git a/pkgs/by-name/hy/hyprlock/package.nix b/pkgs/by-name/hy/hyprlock/package.nix index 79b12b04664b..f7657d82c3dd 100644 --- a/pkgs/by-name/hy/hyprlock/package.nix +++ b/pkgs/by-name/hy/hyprlock/package.nix @@ -1,6 +1,6 @@ { lib, - stdenv, + gcc15Stdenv, fetchFromGitHub, cmake, pkg-config, @@ -26,7 +26,7 @@ nix-update-script, }: -stdenv.mkDerivation (finalAttrs: { +gcc15Stdenv.mkDerivation (finalAttrs: { pname = "hyprlock"; version = "0.9.2"; diff --git a/pkgs/by-name/hy/hyprpaper/package.nix b/pkgs/by-name/hy/hyprpaper/package.nix index e3df156e7058..a4042b79ff69 100644 --- a/pkgs/by-name/hy/hyprpaper/package.nix +++ b/pkgs/by-name/hy/hyprpaper/package.nix @@ -1,6 +1,6 @@ { lib, - stdenv, + gcc15Stdenv, fetchFromGitHub, cmake, cairo, @@ -31,7 +31,7 @@ hyprgraphics, }: -stdenv.mkDerivation (finalAttrs: { +gcc15Stdenv.mkDerivation (finalAttrs: { pname = "hyprpaper"; version = "0.7.6"; @@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.bsd3; teams = [ lib.teams.hyprland ]; inherit (wayland.meta) platforms; - broken = stdenv.hostPlatform.isDarwin; + broken = gcc15Stdenv.hostPlatform.isDarwin; mainProgram = "hyprpaper"; }; }) diff --git a/pkgs/by-name/hy/hyprpicker/package.nix b/pkgs/by-name/hy/hyprpicker/package.nix index d7f5c6dc9416..e640542cd6d1 100644 --- a/pkgs/by-name/hy/hyprpicker/package.nix +++ b/pkgs/by-name/hy/hyprpicker/package.nix @@ -1,6 +1,6 @@ { lib, - stdenv, + gcc15Stdenv, fetchFromGitHub, nix-update-script, pkg-config, @@ -18,7 +18,7 @@ libXdmcp, debug ? false, }: -stdenv.mkDerivation (finalAttrs: { +gcc15Stdenv.mkDerivation (finalAttrs: { pname = "hyprpicker" + lib.optionalString debug "-debug"; version = "0.4.5"; diff --git a/pkgs/by-name/hy/hyprpolkitagent/package.nix b/pkgs/by-name/hy/hyprpolkitagent/package.nix index df6ec7f36fdb..2cbc31de60c0 100644 --- a/pkgs/by-name/hy/hyprpolkitagent/package.nix +++ b/pkgs/by-name/hy/hyprpolkitagent/package.nix @@ -1,6 +1,6 @@ { lib, - stdenv, + gcc15Stdenv, cmake, pkg-config, fetchFromGitHub, @@ -10,7 +10,7 @@ polkit, qt6, }: -stdenv.mkDerivation (finalAttrs: { +gcc15Stdenv.mkDerivation (finalAttrs: { pname = "hyprpolkitagent"; version = "0.1.3"; diff --git a/pkgs/by-name/hy/hyprsunset/package.nix b/pkgs/by-name/hy/hyprsunset/package.nix index ad8280ba2bb0..e72feacfa216 100644 --- a/pkgs/by-name/hy/hyprsunset/package.nix +++ b/pkgs/by-name/hy/hyprsunset/package.nix @@ -1,6 +1,6 @@ { lib, - stdenv, + gcc15Stdenv, cmake, fetchFromGitHub, pkg-config, @@ -13,7 +13,7 @@ wayland-scanner, nix-update-script, }: -stdenv.mkDerivation (finalAttrs: { +gcc15Stdenv.mkDerivation (finalAttrs: { pname = "hyprsunset"; version = "0.3.3"; diff --git a/pkgs/by-name/hy/hyprsysteminfo/package.nix b/pkgs/by-name/hy/hyprsysteminfo/package.nix index f25ffc8a2165..a3067b584af9 100644 --- a/pkgs/by-name/hy/hyprsysteminfo/package.nix +++ b/pkgs/by-name/hy/hyprsysteminfo/package.nix @@ -1,6 +1,6 @@ { lib, - stdenv, + gcc15Stdenv, fetchFromGitHub, fetchpatch, cmake, @@ -13,7 +13,7 @@ let inherit (lib.strings) makeBinPath; in -stdenv.mkDerivation (finalAttrs: { +gcc15Stdenv.mkDerivation (finalAttrs: { pname = "hyprsysteminfo"; version = "0.1.3"; diff --git a/pkgs/by-name/hy/hyprutils/package.nix b/pkgs/by-name/hy/hyprutils/package.nix index a88c7b7cc0df..94e10427677f 100644 --- a/pkgs/by-name/hy/hyprutils/package.nix +++ b/pkgs/by-name/hy/hyprutils/package.nix @@ -1,6 +1,6 @@ { lib, - stdenv, + gcc15Stdenv, cmake, pkg-config, pixman, @@ -8,7 +8,7 @@ nix-update-script, }: -stdenv.mkDerivation (finalAttrs: { +gcc15Stdenv.mkDerivation (finalAttrs: { pname = "hyprutils"; version = "0.11.0"; diff --git a/pkgs/by-name/hy/hyprwayland-scanner/package.nix b/pkgs/by-name/hy/hyprwayland-scanner/package.nix index 3872937acfa2..d414e1af2629 100644 --- a/pkgs/by-name/hy/hyprwayland-scanner/package.nix +++ b/pkgs/by-name/hy/hyprwayland-scanner/package.nix @@ -1,13 +1,13 @@ { lib, - stdenv, + gcc15Stdenv, fetchFromGitHub, cmake, pkg-config, pugixml, nix-update-script, }: -stdenv.mkDerivation (finalAttrs: { +gcc15Stdenv.mkDerivation (finalAttrs: { pname = "hyprwayland-scanner"; version = "0.4.5"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f9f57a72bb94..c54fa90f5003 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1974,70 +1974,6 @@ with pkgs; 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 = 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 { }; hyprlandPlugins = recurseIntoAttrs (