diff options
| author | Tim Keller <tjk@tjkeller.xyz> | 2026-06-20 11:21:08 -0500 |
|---|---|---|
| committer | Tim Keller <tjk@tjkeller.xyz> | 2026-06-20 11:21:08 -0500 |
| commit | 933449d2d4b988dc65df974ec1a11056dca80ee3 (patch) | |
| tree | 994a9fcb9c54f8e322210a98eadad98268ca0341 /pkgs/xorg/overrides.nix | |
| parent | 1108a24654c161cef2b12bd104d77300850dfe0e (diff) | |
| download | nixos-933449d2d4b988dc65df974ec1a11056dca80ee3.tar.xz nixos-933449d2d4b988dc65df974ec1a11056dca80ee3.zip | |
fix xinit overlay
Diffstat (limited to 'pkgs/xorg/overrides.nix')
| -rw-r--r-- | pkgs/xorg/overrides.nix | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/pkgs/xorg/overrides.nix b/pkgs/xorg/overrides.nix index 7225431..0cd9490 100644 --- a/pkgs/xorg/overrides.nix +++ b/pkgs/xorg/overrides.nix @@ -1,20 +1,18 @@ final: prev: { - xorg = prev.xorg // { - # Apply startx patch to create serverauth file in /tmp instead of home directory - xinit = (prev.xorg.xinit.overrideAttrs (finalAttrs: previousAttrs: { - version = "1.4.4"; - patchtag = "${finalAttrs.version}-1"; # Archlinux xinit package tagged release to fetch patch from - # Override src since is hardcoded to 1.4.2 - src = prev.fetchurl { - url = "mirror://xorg/individual/app/xinit-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-QKR8ehZMf5gc43h7Szf35BH7QyMdzeVD1wCUB12s/vk="; - }; - patches = [ - (prev.fetchpatch { - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/xorg-xinit/-/raw/${finalAttrs.patchtag}/06_move_serverauthfile_into_tmp.diff"; - sha256 = "1whzs5bw7ph12r3abs1g9fydibkr291jh56a0zp17d4x070jnkda"; - }) - ]; - })); - }; + # Apply startx patch to create serverauth file in /tmp instead of home directory + xinit = prev.xinit.overrideAttrs (finalAttrs: previousAttrs: { + version = "1.4.4"; + patchtag = "${finalAttrs.version}-1"; # Archlinux xinit package tagged release to fetch patch from + # Override src since is hardcoded to 1.4.2 + src = prev.fetchurl { + url = "mirror://xorg/individual/app/xinit-${finalAttrs.version}.tar.xz"; + sha256 = "sha256-QKR8ehZMf5gc43h7Szf35BH7QyMdzeVD1wCUB12s/vk="; + }; + patches = [ + (prev.fetchpatch { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/xorg-xinit/-/raw/${finalAttrs.patchtag}/06_move_serverauthfile_into_tmp.diff"; + sha256 = "1whzs5bw7ph12r3abs1g9fydibkr291jh56a0zp17d4x070jnkda"; + }) + ]; + }); } |