public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #121726 from primeos/wayland-scanner-fix-cross-compilation

Browse Source 
wayland{.bin,-scanner}: Add a pkg-config file for cross-compilation
This commit is contained in:
Michael Weiss 2021-05-05 21:59:13 +02:00 committed by GitHub
commit 62b0f89f4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/libraries/wayland/default.nix
View File

@ -5,7 +5,7 @@
, meson , meson
, pkg-config , pkg-config
, ninja , ninja
, wayland , wayland-scanner
, expat , expat
, libxml2 , libxml2
, withLibraries ? stdenv.isLinux , withLibraries ? stdenv.isLinux
@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
pkg-config pkg-config
ninja ninja
] ++ lib.optionals isCross [ ] ++ lib.optionals isCross [
wayland # For wayland-scanner during the build wayland-scanner
] ++ lib.optionals withDocumentation [ ] ++ lib.optionals withDocumentation [
(graphviz-nox.override { pango = null; }) # To avoid an infinite recursion (graphviz-nox.override { pango = null; }) # To avoid an infinite recursion
doxygen doxygen
@ -85,6 +85,18 @@ stdenv.mkDerivation rec {
docbook_xml_dtd_42 docbook_xml_dtd_42
]; ];
postFixup = ''
# The pkg-config file is required for cross-compilation:
mkdir -p $bin/lib/pkgconfig/
cat <<EOF > $bin/lib/pkgconfig/wayland-scanner.pc
wayland_scanner=$bin/bin/wayland-scanner
Name: Wayland Scanner
Description: Wayland scanner
Version: ${version}
EOF
'';
meta = with lib; { meta = with lib; {
description = "Core Wayland window system code and protocol"; description = "Core Wayland window system code and protocol";
longDescription = '' longDescription = ''