diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-01 12:01:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-01 12:01:10 +0000 |
| commit | 4a533d29ce8fa4759d9aa43e9cd0a128f0e94767 (patch) | |
| tree | fc99f88643464ac109c3fbe15fdc529f76da8a16 /pkgs/tools/wayland | |
| parent | 39efd75b563a62d554b229624c78a646d014923a (diff) | |
| parent | 05e8361387301551045b988e30c4c926e804b739 (diff) | |
| download | nixpkgs-4a533d29ce8fa4759d9aa43e9cd0a128f0e94767.tar nixpkgs-4a533d29ce8fa4759d9aa43e9cd0a128f0e94767.tar.gz nixpkgs-4a533d29ce8fa4759d9aa43e9cd0a128f0e94767.tar.bz2 nixpkgs-4a533d29ce8fa4759d9aa43e9cd0a128f0e94767.tar.lz nixpkgs-4a533d29ce8fa4759d9aa43e9cd0a128f0e94767.tar.xz nixpkgs-4a533d29ce8fa4759d9aa43e9cd0a128f0e94767.tar.zst nixpkgs-4a533d29ce8fa4759d9aa43e9cd0a128f0e94767.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/wayland')
| -rw-r--r-- | pkgs/tools/wayland/sov/default.nix | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/pkgs/tools/wayland/sov/default.nix b/pkgs/tools/wayland/sov/default.nix index 31451d82d4b..c8ddc6524f2 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 |