From a9db54b790ad3f0631c618db02084bfb346d7661 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 16 Nov 2022 02:15:24 +0100 Subject: [PATCH] hyprland, hyprpaper: fix build on aarch64-linux --- .../window-managers/hyprwm/hyprland/default.nix | 2 -- .../window-managers/hyprwm/hyprpaper/default.nix | 2 -- pkgs/top-level/all-packages.nix | 8 ++++++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/hyprland/default.nix index c5733ffa68fb..ca9565d915a2 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland/default.nix @@ -90,7 +90,5 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ wozeparrot ]; inherit (wayland.meta) platforms; mainProgram = "Hyprland"; - # ofborg failure: g++ does not recognize '-std=c++23' - broken = stdenv.isAarch64; }; }) diff --git a/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix b/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix index 8362097ddf9e..f7c28ff35d22 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix @@ -59,7 +59,5 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.bsd3; maintainers = with maintainers; [ wozeparrot ]; inherit (wayland.meta) platforms; - # ofborg failure: g++ does not recognize '-std=c++23' - broken = stdenv.isAarch64; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e79424b0e308..1b1c0ef49c6d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4320,9 +4320,13 @@ with pkgs; hypr = callPackage ../applications/window-managers/hyprwm/hypr { }; - hyprland = callPackage ../applications/window-managers/hyprwm/hyprland { }; + hyprland = callPackage ../applications/window-managers/hyprwm/hyprland { + stdenv = gcc11Stdenv; + }; - hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { }; + hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { + stdenv = gcc11Stdenv; + }; hysteria = callPackage ../tools/networking/hysteria { };