diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-07-23 09:26:00 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-07-23 09:26:00 +0000 |
commit | ab63e0bb8dcf2b1bf8d4a26ed360af777b8f241d (patch) | |
tree | 504b28a058661f6c1cbb7d3f580020e50367ca7f /nixpkgs/pkgs/applications/misc/dmenu | |
parent | 55cc63c079f49e81d695a25bc2f5b3902f2bd290 (diff) | |
parent | b09661d41fb93562fd53f31574dbf781b130ac44 (diff) | |
download | nixlib-ab63e0bb8dcf2b1bf8d4a26ed360af777b8f241d.tar nixlib-ab63e0bb8dcf2b1bf8d4a26ed360af777b8f241d.tar.gz nixlib-ab63e0bb8dcf2b1bf8d4a26ed360af777b8f241d.tar.bz2 nixlib-ab63e0bb8dcf2b1bf8d4a26ed360af777b8f241d.tar.lz nixlib-ab63e0bb8dcf2b1bf8d4a26ed360af777b8f241d.tar.xz nixlib-ab63e0bb8dcf2b1bf8d4a26ed360af777b8f241d.tar.zst nixlib-ab63e0bb8dcf2b1bf8d4a26ed360af777b8f241d.zip |
Merge commit 'b09661d41fb93562fd53f31574dbf781b130ac44'
Diffstat (limited to 'nixpkgs/pkgs/applications/misc/dmenu')
-rw-r--r-- | nixpkgs/pkgs/applications/misc/dmenu/wayland.nix | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/applications/misc/dmenu/wayland.nix b/nixpkgs/pkgs/applications/misc/dmenu/wayland.nix index 8d77588ce8f1..6b8f92ddb1c2 100644 --- a/nixpkgs/pkgs/applications/misc/dmenu/wayland.nix +++ b/nixpkgs/pkgs/applications/misc/dmenu/wayland.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchFromGitHub, meson, ninja, cairo, pango, pkg-config, wayland-protocols -, glib, wayland, libxkbcommon, makeWrapper +, glib, wayland, libxkbcommon, makeWrapper, wayland-scanner +, fetchpatch }: stdenv.mkDerivation rec { @@ -15,9 +16,19 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" ]; - nativeBuildInputs = [ meson ninja pkg-config makeWrapper ]; + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ meson ninja pkg-config makeWrapper wayland-scanner ]; buildInputs = [ cairo pango wayland-protocols glib wayland libxkbcommon ]; + # Patch to support cross-compilation, see https://github.com/nyyManni/dmenu-wayland/pull/23/ + patches = [ + # can be removed when https://github.com/nyyManni/dmenu-wayland/pull/23 is included + (fetchpatch { + url = "https://github.com/nyyManni/dmenu-wayland/commit/3434410de5dcb007539495395f7dc5421923dd3a.patch"; + sha256 = "sha256-im16kU8RWrCY0btYOYjDp8XtfGEivemIPlhwPX0C77o="; + }) + ]; + postInstall = '' wrapProgram $out/bin/dmenu-wl_run \ --prefix PATH : $out/bin |