diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2021-04-30 21:56:18 +0200 |
---|---|---|
committer | Michael Weiss <dev.primeos@gmail.com> | 2021-05-05 22:00:26 +0200 |
commit | a893df3f9fd1bb39a4a9f084debd19d89db35e23 (patch) | |
tree | 304e03503b82db27738473d7e1d2b4a3f8a15afd /pkgs/development/libraries/wayland | |
parent | 62b0f89f4e64a42f53dcf0d79b76a681099932c5 (diff) | |
download | nixpkgs-a893df3f9fd1bb39a4a9f084debd19d89db35e23.tar nixpkgs-a893df3f9fd1bb39a4a9f084debd19d89db35e23.tar.gz nixpkgs-a893df3f9fd1bb39a4a9f084debd19d89db35e23.tar.bz2 nixpkgs-a893df3f9fd1bb39a4a9f084debd19d89db35e23.tar.lz nixpkgs-a893df3f9fd1bb39a4a9f084debd19d89db35e23.tar.xz nixpkgs-a893df3f9fd1bb39a4a9f084debd19d89db35e23.tar.zst nixpkgs-a893df3f9fd1bb39a4a9f084debd19d89db35e23.zip |
wayland-protocols: Switch to Meson
According to diffoscope this is fine (only the Nix store path changes). Cross-compilation with doCheck=true is broken (requires pkg-config in nativeBuildInputs but doesn't play nicely with checkInputs).
Diffstat (limited to 'pkgs/development/libraries/wayland')
-rw-r--r-- | pkgs/development/libraries/wayland/protocols.nix | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index 8a2b05aa4df..7f3ec5f3d59 100644 --- a/pkgs/development/libraries/wayland/protocols.nix +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -1,15 +1,29 @@ -{ lib, stdenv, fetchurl, wayland-scanner }: +{ lib, stdenv, fetchurl +, pkg-config +, meson, ninja, wayland-scanner +, python3, wayland +}: stdenv.mkDerivation rec { pname = "wayland-protocols"; version = "1.21"; + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + src = fetchurl { url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; sha256 = "1rfdlkzz67qsb955zqb8jbw3m22pl6ppvrvfq8bqiqcb5n24b6dr"; }; - nativeBuildInputs = [ wayland-scanner ]; + postPatch = lib.optionalString doCheck '' + patchShebangs tests/ + ''; + + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ meson ninja wayland-scanner ]; + checkInputs = [ python3 wayland ]; + + mesonFlags = [ "-Dtests=${lib.boolToString doCheck}" ]; meta = { description = "Wayland protocol extensions"; |