chore: fractional scaling in X11

This commit is contained in:
Daniel Langbein 2024-02-01 20:58:53 +01:00
parent 5867199769
commit d75d28cdda
Signed by: langfingaz
GPG Key ID: 6C47C753F0823002
2 changed files with 17 additions and 12 deletions

View File

@ -1,4 +1,7 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
let
version = "45.3";
in
{ {
# https://wiki.archlinux.org/title/HiDPI#Wayland # https://wiki.archlinux.org/title/HiDPI#Wayland
# Results in blurry font in non-Wayland applications :/ # Results in blurry font in non-Wayland applications :/
@ -27,25 +30,27 @@
# -> https://salsa.debian.org/gnome-team/mutter/-/tags?sort=updated_desc&search=ubuntu%2F # -> https://salsa.debian.org/gnome-team/mutter/-/tags?sort=updated_desc&search=ubuntu%2F
# -> https://salsa.debian.org/gnome-team/mutter/-/tags/ubuntu%2F44.2-3ubuntu1 # -> https://salsa.debian.org/gnome-team/mutter/-/tags/ubuntu%2F44.2-3ubuntu1
# -> https://salsa.debian.org/gnome-team/mutter/-/raw/ubuntu/44.2-3ubuntu1/debian/patches/ubuntu/x11-Add-support-for-fractional-scaling-using-Randr.patch # -> https://salsa.debian.org/gnome-team/mutter/-/raw/ubuntu/44.2-3ubuntu1/debian/patches/ubuntu/x11-Add-support-for-fractional-scaling-using-Randr.patch
# # For release 45.3:
#=> building '/nix/store/yh0jnwyq5351l1rjspjlkimas3wvpf6g-mutter-44.2.drv'... # -> https://salsa.debian.org/gnome-team/mutter/-/tags?sort=updated_desc&search=ubuntu%2F
# -> https://salsa.debian.org/gnome-team/mutter/-/tags/ubuntu%2F45.3-1ubuntu1
# -> https://salsa.debian.org/gnome-team/mutter/-/raw/ubuntu/45.3-1ubuntu1/debian/patches/ubuntu/x11-Add-support-for-fractional-scaling-using-Randr.patch
# Elements of nixpkgs must be taken from final and prev. # Elements of nixpkgs must be taken from final and prev.
final: prev: { final: prev: {
# Elements of pkgs.gnome must be taken from gfinal and gprev. # Elements of pkgs.gnome must be taken from gfinal and gprev.
gnome = prev.gnome.overrideScope' (gfinal: gprev: { gnome = prev.gnome.overrideScope' (gfinal: gprev: {
mutter = gprev.mutter.overrideAttrs (oldAttrs: mutter = gprev.mutter.overrideAttrs (oldAttrs:
if oldAttrs.version == "44.2" then if oldAttrs.version == version then
{ {
patches = (oldAttrs.patches or []) ++ [ patches = (oldAttrs.patches or []) ++ [
(prev.fetchpatch { (prev.fetchpatch {
url = "https://salsa.debian.org/gnome-team/mutter/-/raw/ubuntu/44.2-3ubuntu1/debian/patches/ubuntu/x11-Add-support-for-fractional-scaling-using-Randr.patch"; url = "https://salsa.debian.org/gnome-team/mutter/-/raw/ubuntu/${version}-1ubuntu1/debian/patches/ubuntu/x11-Add-support-for-fractional-scaling-using-Randr.patch";
# Determining the hash: https://github.com/NixOS/nixpkgs/issues/191128#issuecomment-1246030431 # Determining the hash: https://github.com/NixOS/nixpkgs/issues/191128#issuecomment-1246030431
hash = "sha256-GCtz87C1NgxenYE5nbxcIIxqNhutmdngscnlK10fRyQ="; hash = "sha256-snEgCuTsTEo0wQ5XsjEM53K2j7l4ZQ3t9FT3+Yfoti0=";
}) })
]; ];
} }
else throw "Mutter version mismatch. Please update patch." else throw "Mutter version mismatch. Please update patch. ${oldAttrs.version}"
); );
}); });
} }

View File

@ -5,10 +5,10 @@
"homepage": "https://nur.nix-community.org/", "homepage": "https://nur.nix-community.org/",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "6bc9f506e6299fc5e02bb7f5f7d7692b82df628d", "rev": "91d594fbe9e38f7248fcc36f2f102082f1170ef8",
"sha256": "1fafgh64fw8rq9pjpwyyzlfwminnd5ifcpm2n3mgafds2nadx225", "sha256": "0v4s19fmyzasrwqhfxkdp44rdfp4yii03l4fn41f8irmd5xll4i5",
"type": "tarball", "type": "tarball",
"url": "https://github.com/nix-community/NUR/archive/6bc9f506e6299fc5e02bb7f5f7d7692b82df628d.tar.gz", "url": "https://github.com/nix-community/NUR/archive/91d594fbe9e38f7248fcc36f2f102082f1170ef8.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"home-manager": { "home-manager": {
@ -29,10 +29,10 @@
"homepage": null, "homepage": null,
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f4a8d6d5324c327dcc2d863eb7f3cc06ad630df4", "rev": "53fbe41cf76b6a685004194e38e889bc8857e8c2",
"sha256": "0nlm934nnx09lfilz8171rx6x510g9ffdyrzijvqr5gh1vjdhmvq", "sha256": "1fyc4kbhv7rrfzya74yprvd70prlcsv56b7n0fv47kn7rznvvr2b",
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/f4a8d6d5324c327dcc2d863eb7f3cc06ad630df4.tar.gz", "url": "https://github.com/NixOS/nixpkgs/archive/53fbe41cf76b6a685004194e38e889bc8857e8c2.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"unstable": { "unstable": {