From 31ab2349f9f0cad25c9804b5a585617d04cb2a43 Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Wed, 18 Jan 2023 00:37:56 -0800 Subject: [PATCH] nix: react to another stdenv change (#1399) --- flake.nix | 6 +++--- nix/hm-module.nix | 2 +- nix/module.nix | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.nix b/flake.nix index 15ff9e61..dbd7f8f9 100644 --- a/flake.nix +++ b/flake.nix @@ -51,7 +51,7 @@ stdenv = prev.gcc12Stdenv; version = props.version + "+date=" + (mkDate (self.lastModifiedDate or "19700101")) + "_" + (self.shortRev or "dirty"); wlroots = wlroots-hyprland; - inherit (inputs.hyprland-protocols.packages.${prev.hostPlatform.system}) hyprland-protocols; + inherit (inputs.hyprland-protocols.packages.${prev.stdenv.hostPlatform.system}) hyprland-protocols; }; hyprland-debug = hyprland.override {debug = true;}; hyprland-no-hidpi = hyprland.override {hidpiXWayland = false;}; @@ -60,8 +60,8 @@ mesonFlags = oldAttrs.mesonFlags ++ ["-Dexperimental=true"]; }); - xdg-desktop-portal-hyprland = inputs.xdph.packages.${prev.hostPlatform.system}.default.override { - hyprland-share-picker = inputs.xdph.packages.${prev.hostPlatform.system}.hyprland-share-picker.override {inherit hyprland;}; + xdg-desktop-portal-hyprland = inputs.xdph.packages.${prev.stdenv.hostPlatform.system}.default.override { + hyprland-share-picker = inputs.xdph.packages.${prev.stdenv.hostPlatform.system}.hyprland-share-picker.override {inherit hyprland;}; }; }; diff --git a/nix/hm-module.nix b/nix/hm-module.nix index b6eeba8a..07c42e78 100644 --- a/nix/hm-module.nix +++ b/nix/hm-module.nix @@ -5,7 +5,7 @@ self: { ... }: let cfg = config.wayland.windowManager.hyprland; - defaultHyprlandPackage = self.packages.${pkgs.hostPlatform.system}.default.override { + defaultHyprlandPackage = self.packages.${pkgs.stdenv.hostPlatform.system}.default.override { enableXWayland = cfg.xwayland.enable; hidpiXWayland = cfg.xwayland.hidpi; nvidiaPatches = cfg.nvidiaPatches; diff --git a/nix/module.nix b/nix/module.nix index 6ddedfdc..45f40f63 100644 --- a/nix/module.nix +++ b/nix/module.nix @@ -8,7 +8,7 @@ inputs: { with lib; let cfg = config.programs.hyprland; - defaultHyprlandPackage = inputs.self.packages.${pkgs.hostPlatform.system}.default.override { + defaultHyprlandPackage = inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.default.override { enableXWayland = cfg.xwayland.enable; hidpiXWayland = cfg.xwayland.hidpi; nvidiaPatches = cfg.nvidiaPatches; @@ -94,8 +94,8 @@ in { enable = mkDefault true; # xdg-desktop-portal-hyprland extraPortals = lib.mkIf (cfg.package != null) [ - (inputs.xdph.packages.${pkgs.hostPlatform.system}.xdg-desktop-portal-hyprland.override { - hyprland-share-picker = inputs.xdph.packages.${pkgs.hostPlatform.system}.hyprland-share-picker.override { + (inputs.xdph.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland.override { + hyprland-share-picker = inputs.xdph.packages.${pkgs.stdenv.hostPlatform.system}.hyprland-share-picker.override { hyprland = cfg.package; }; })