about summary refs log tree commit diff
path: root/pkgs/tools/wayland
diff options
context:
space:
mode:
authorArtturi <Artturin@artturin.com>2023-11-01 08:50:00 +0200
committerGitHub <noreply@github.com>2023-11-01 08:50:00 +0200
commitc3b3057db1eb43fb885a48ae8a808384d6b80bff (patch)
tree35009782a97ade802170d86cab2c9938d7140684 /pkgs/tools/wayland
parentbf4a5ce57b10ad0dd628f1d7f849745562e75d2b (diff)
parentb8f93f048d43c98b0648d327009080e3ca0938d9 (diff)
downloadnixlib-c3b3057db1eb43fb885a48ae8a808384d6b80bff.tar
nixlib-c3b3057db1eb43fb885a48ae8a808384d6b80bff.tar.gz
nixlib-c3b3057db1eb43fb885a48ae8a808384d6b80bff.tar.bz2
nixlib-c3b3057db1eb43fb885a48ae8a808384d6b80bff.tar.lz
nixlib-c3b3057db1eb43fb885a48ae8a808384d6b80bff.tar.xz
nixlib-c3b3057db1eb43fb885a48ae8a808384d6b80bff.tar.zst
nixlib-c3b3057db1eb43fb885a48ae8a808384d6b80bff.zip
Merge pull request #263465 from NickCao/sov
Diffstat (limited to 'pkgs/tools/wayland')
-rw-r--r--pkgs/tools/wayland/sov/default.nix16
1 files changed, 16 insertions, 0 deletions
diff --git a/pkgs/tools/wayland/sov/default.nix b/pkgs/tools/wayland/sov/default.nix
index 31451d82d4b5..c8ddc6524f28 100644
--- a/pkgs/tools/wayland/sov/default.nix
+++ b/pkgs/tools/wayland/sov/default.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, fetchpatch2
 , meson
 , ninja
 , pkg-config
@@ -23,13 +24,28 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-1L5D0pzcXbkz3VS7VB6ID8BJEbGeNxjo3xCr71CGcIo=";
   };
 
+  patches = [
+    # mark wayland-scanner as build-time dependency
+    # https://github.com/milgra/sov/pull/45
+    (fetchpatch2 {
+      url = "https://github.com/milgra/sov/commit/8677dcfc47e440157388a8f15bdda9419d84db04.patch";
+      hash = "sha256-P1k1zosHcVO7hyhD1JWbj07h7pQ7ybgDHfoufBinEys=";
+    })
+  ];
+
   strictDeps = true;
+
+  depsBuildBuild = [
+    pkg-config
+  ];
+
   nativeBuildInputs = [
     meson
     ninja
     pkg-config
     wayland-scanner
   ];
+
   buildInputs = [
     freetype
     libglvnd