From 0eb49192a5cdd5e6e8e6c2c82c33857d78d6cd56 Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Sun, 24 Mar 2024 14:24:13 +0200 Subject: [PATCH] Nix: override wayland-protocols until merged Fix include Ref: https://nixpk.gs/pr-tracker.html?pr=297606 --- flake.nix | 13 ++++++++++--- src/includes.hpp | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index af24621..9613a74 100644 --- a/flake.nix +++ b/flake.nix @@ -16,15 +16,22 @@ ]; pkgsFor = nixpkgs.legacyPackages; mkDate = longDate: (lib.concatStringsSep "-" [ - (__substring 0 4 longDate) - (__substring 4 2 longDate) - (__substring 6 2 longDate) + (builtins.substring 0 4 longDate) + (builtins.substring 4 2 longDate) + (builtins.substring 6 2 longDate) ]); in { overlays.default = _: prev: rec { hyprpicker = prev.callPackage ./nix/default.nix { stdenv = prev.gcc12Stdenv; 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; }; hyprpicker-debug = hyprpicker.override {debug = true;}; diff --git a/src/includes.hpp b/src/includes.hpp index fa06edb..11bd840 100644 --- a/src/includes.hpp +++ b/src/includes.hpp @@ -19,7 +19,7 @@ extern "C" { #include "wlr-layer-shell-unstable-v1-protocol.h" #include "wlr-screencopy-unstable-v1-protocol.h" #include "xdg-shell-protocol.h" -#include "wp-cursor-shape-protocol.h" +#include "wp-cursor-shape-v1-protocol.h" #include #include }