Nix: override wayland-protocols until merged

Fix include

Ref: https://nixpk.gs/pr-tracker.html?pr=297606
This commit is contained in:
Mihai Fufezan 2024-03-24 14:24:13 +02:00
parent 9f05fbdabe
commit 0eb49192a5
No known key found for this signature in database
2 changed files with 11 additions and 4 deletions

View file

@ -16,15 +16,22 @@
]; ];
pkgsFor = nixpkgs.legacyPackages; pkgsFor = nixpkgs.legacyPackages;
mkDate = longDate: (lib.concatStringsSep "-" [ mkDate = longDate: (lib.concatStringsSep "-" [
(__substring 0 4 longDate) (builtins.substring 0 4 longDate)
(__substring 4 2 longDate) (builtins.substring 4 2 longDate)
(__substring 6 2 longDate) (builtins.substring 6 2 longDate)
]); ]);
in { in {
overlays.default = _: prev: rec { overlays.default = _: prev: rec {
hyprpicker = prev.callPackage ./nix/default.nix { hyprpicker = prev.callPackage ./nix/default.nix {
stdenv = prev.gcc12Stdenv; stdenv = prev.gcc12Stdenv;
version = "0.pre" + "+date=" + (mkDate (self.lastModifiedDate or "19700101")) + "_" + (self.shortRev or "dirty"); version = "0.pre" + "+date=" + (mkDate (self.lastModifiedDate or "19700101")) + "_" + (self.shortRev or "dirty");
wayland-protocols = prev.wayland-protocols.overrideAttrs (self: super: {
version = "1.34";
src = prev.fetchurl {
url = "https://gitlab.freedesktop.org/wayland/${self.pname}/-/releases/${self.version}/downloads/${self.pname}-${self.version}.tar.xz";
hash = "sha256-xZsnys2F9guvTuX4DfXA0Vdg6taiQysAq34uBXTcr+s=";
};
});
inherit (prev.xorg) libXdmcp; inherit (prev.xorg) libXdmcp;
}; };
hyprpicker-debug = hyprpicker.override {debug = true;}; hyprpicker-debug = hyprpicker.override {debug = true;};

View file

@ -19,7 +19,7 @@ extern "C" {
#include "wlr-layer-shell-unstable-v1-protocol.h" #include "wlr-layer-shell-unstable-v1-protocol.h"
#include "wlr-screencopy-unstable-v1-protocol.h" #include "wlr-screencopy-unstable-v1-protocol.h"
#include "xdg-shell-protocol.h" #include "xdg-shell-protocol.h"
#include "wp-cursor-shape-protocol.h" #include "wp-cursor-shape-v1-protocol.h"
#include <wayland-client.h> #include <wayland-client.h>
#include <wayland-cursor.h> #include <wayland-cursor.h>
} }