mirror of
https://github.com/hyprwm/Hyprland.git
synced 2024-09-11 13:25:42 +03:00
Nix: move dependency overrides inside wlroots-hyprland call
This fixes overlays failing to build. Fixes #1704
This commit is contained in:
parent
5184b542b1
commit
7bae0823c8
51
flake.nix
51
flake.nix
@ -32,35 +32,7 @@
|
|||||||
"x86_64-linux"
|
"x86_64-linux"
|
||||||
];
|
];
|
||||||
|
|
||||||
pkgsFor = genSystems (system:
|
pkgsFor = nixpkgs.legacyPackages;
|
||||||
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=";
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
libliftoff = prev.libliftoff.overrideAttrs (old: {
|
|
||||||
version = "0.5.0-dev";
|
|
||||||
src = prev.fetchFromGitLab {
|
|
||||||
domain = "gitlab.freedesktop.org";
|
|
||||||
owner = "emersion";
|
|
||||||
repo = old.pname;
|
|
||||||
rev = "d98ae243280074b0ba44bff92215ae8d785658c0";
|
|
||||||
sha256 = "sha256-DjwlS8rXE7srs7A8+tHqXyUsFGtucYSeq6X0T/pVOc8=";
|
|
||||||
};
|
|
||||||
});
|
|
||||||
})
|
|
||||||
];
|
|
||||||
});
|
|
||||||
|
|
||||||
props = builtins.fromJSON (builtins.readFile ./props.json);
|
props = builtins.fromJSON (builtins.readFile ./props.json);
|
||||||
|
|
||||||
@ -74,6 +46,27 @@
|
|||||||
wlroots-hyprland = prev.callPackage ./nix/wlroots.nix {
|
wlroots-hyprland = prev.callPackage ./nix/wlroots.nix {
|
||||||
version = mkDate (inputs.wlroots.lastModifiedDate or "19700101") + "_" + (inputs.wlroots.shortRev or "dirty");
|
version = mkDate (inputs.wlroots.lastModifiedDate or "19700101") + "_" + (inputs.wlroots.shortRev or "dirty");
|
||||||
src = inputs.wlroots;
|
src = inputs.wlroots;
|
||||||
|
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=";
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
libliftoff = prev.libliftoff.overrideAttrs (old: {
|
||||||
|
version = "0.5.0-dev";
|
||||||
|
src = prev.fetchFromGitLab {
|
||||||
|
domain = "gitlab.freedesktop.org";
|
||||||
|
owner = "emersion";
|
||||||
|
repo = old.pname;
|
||||||
|
rev = "d98ae243280074b0ba44bff92215ae8d785658c0";
|
||||||
|
sha256 = "sha256-DjwlS8rXE7srs7A8+tHqXyUsFGtucYSeq6X0T/pVOc8=";
|
||||||
|
};
|
||||||
|
});
|
||||||
};
|
};
|
||||||
hyprland = prev.callPackage ./nix/default.nix {
|
hyprland = prev.callPackage ./nix/default.nix {
|
||||||
stdenv = prev.gcc12Stdenv;
|
stdenv = prev.gcc12Stdenv;
|
||||||
|
Loading…
Reference in New Issue
Block a user