diff --git a/flake.nix b/flake.nix index 973a6fb9..95587a66 100644 --- a/flake.nix +++ b/flake.nix @@ -32,7 +32,24 @@ "x86_64-linux" ]; - pkgsFor = nixpkgs.legacyPackages; + pkgsFor = genSystems (system: + import nixpkgs { + inherit system; + overlays = [ + (_: prev: { + libdisplay-info = prev.libdisplay-info.overrideAttrs (old: { + version = "0.1.1+date=2023-03-02"; + src = prev.fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "emersion"; + repo = old.pname; + rev = "147d6611a64a6ab04611b923e30efacaca6fc678"; + sha256 = "sha256-/q79o13Zvu7x02SBGu0W5yQznQ+p7ltZ9L6cMW5t/o4="; + }; + }); + }) + ]; + }); props = builtins.fromJSON (builtins.readFile ./props.json); diff --git a/nix/wlroots.nix b/nix/wlroots.nix index b3aa6194..4413259e 100644 --- a/nix/wlroots.nix +++ b/nix/wlroots.nix @@ -7,7 +7,9 @@ fetchpatch, lib, hwdata, - hidpiXWayland ? true, + libliftoff, + libdisplay-info, + hidpiXWayland ? false, enableXWayland ? true, nvidiaPatches ? false, }: @@ -58,7 +60,7 @@ assert (lib.assertMsg (hidpiXWayland -> enableXWayland) '' '' else "" ); - buildInputs = old.buildInputs ++ [hwdata]; + buildInputs = old.buildInputs ++ [hwdata libliftoff libdisplay-info]; })) .override { xwayland = xwayland.overrideAttrs (old: {