hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2025-02-18 13:02:09 +01:00
Code Issues Projects Releases Packages Wiki Activity

nix: react to another stdenv change (#1399)

Browse source
This commit is contained in:
Cole Mickens 2023-01-18 00:37:56 -08:00 • committed by GitHub
parent c31c627cf8
commit 31ab2349f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
flake.nix
View file

@ -51,7 +51,7 @@
stdenv = prev.gcc12Stdenv; stdenv = prev.gcc12Stdenv;
version = props.version + "+date=" + (mkDate (self.lastModifiedDate or "19700101")) + "_" + (self.shortRev or "dirty"); version = props.version + "+date=" + (mkDate (self.lastModifiedDate or "19700101")) + "_" + (self.shortRev or "dirty");
wlroots = wlroots-hyprland; 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-debug = hyprland.override {debug = true;};
hyprland-no-hidpi = hyprland.override {hidpiXWayland = false;}; hyprland-no-hidpi = hyprland.override {hidpiXWayland = false;};
@ -60,8 +60,8 @@
mesonFlags = oldAttrs.mesonFlags ++ ["-Dexperimental=true"]; mesonFlags = oldAttrs.mesonFlags ++ ["-Dexperimental=true"];
}); });
xdg-desktop-portal-hyprland = inputs.xdph.packages.${prev.hostPlatform.system}.default.override { xdg-desktop-portal-hyprland = inputs.xdph.packages.${prev.stdenv.hostPlatform.system}.default.override {
hyprland-share-picker = inputs.xdph.packages.${prev.hostPlatform.system}.hyprland-share-picker.override {inherit hyprland;}; hyprland-share-picker = inputs.xdph.packages.${prev.stdenv.hostPlatform.system}.hyprland-share-picker.override {inherit hyprland;};
}; };
}; };

2
nix/hm-module.nix
View file

@ -5,7 +5,7 @@ self: {
... ...
}: let }: let
cfg = config.wayland.windowManager.hyprland; 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; enableXWayland = cfg.xwayland.enable;
hidpiXWayland = cfg.xwayland.hidpi; hidpiXWayland = cfg.xwayland.hidpi;
nvidiaPatches = cfg.nvidiaPatches; nvidiaPatches = cfg.nvidiaPatches;

6
nix/module.nix
View file

@ -8,7 +8,7 @@ inputs: {
with lib; let with lib; let
cfg = config.programs.hyprland; 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; enableXWayland = cfg.xwayland.enable;
hidpiXWayland = cfg.xwayland.hidpi; hidpiXWayland = cfg.xwayland.hidpi;
nvidiaPatches = cfg.nvidiaPatches; nvidiaPatches = cfg.nvidiaPatches;
@ -94,8 +94,8 @@ in {
enable = mkDefault true; enable = mkDefault true;
# xdg-desktop-portal-hyprland # xdg-desktop-portal-hyprland
extraPortals = lib.mkIf (cfg.package != null) [ extraPortals = lib.mkIf (cfg.package != null) [
(inputs.xdph.packages.${pkgs.hostPlatform.system}.xdg-desktop-portal-hyprland.override { (inputs.xdph.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland.override {
hyprland-share-picker = inputs.xdph.packages.${pkgs.hostPlatform.system}.hyprland-share-picker.override { hyprland-share-picker = inputs.xdph.packages.${pkgs.stdenv.hostPlatform.system}.hyprland-share-picker.override {
hyprland = cfg.package; hyprland = cfg.package;
}; };
}) })