summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMihai Fufezan <fufexan@protonmail.com>2023-03-05 14:10:49 +0200
committerMihai Fufezan <fufexan@protonmail.com>2023-03-05 14:10:55 +0200
commit7bae0823c84b225ef2bb6357c43391e72e86a685 (patch)
tree22c9694df9f2d7dcd8a307949b106554205db8cf
parent5184b542b1f505c90f9ef4715ae949ac45b2b7ef (diff)
Nix: move dependency overrides inside wlroots-hyprland call
This fixes overlays failing to build. Fixes #1704
-rw-r--r--flake.nix51
1 files changed, 22 insertions, 29 deletions
diff --git a/flake.nix b/flake.nix
index 24983119..6eb091fe 100644
--- a/flake.nix
+++ b/flake.nix
@@ -32,35 +32,7 @@
"x86_64-linux"
];
- 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=";
- };
- });
-
- 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=";
- };
- });
- })
- ];
- });
+ pkgsFor = nixpkgs.legacyPackages;
props = builtins.fromJSON (builtins.readFile ./props.json);
@@ -74,6 +46,27 @@
wlroots-hyprland = prev.callPackage ./nix/wlroots.nix {
version = mkDate (inputs.wlroots.lastModifiedDate or "19700101") + "_" + (inputs.wlroots.shortRev or "dirty");
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 {
stdenv = prev.gcc12Stdenv;