nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 01:13:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

freerdp3: don't set WAYLAND_SCANNER explicitly

Browse Source 
This is in fact wrong since moving the binary to the `bin` output, and
works just fine only with it in `nativeBuildInputs`.

Also, add wayland-scanner to buildInputs, so the pkg-config machinery
does discover it.
This commit is contained in:
Florian Klink 2024-08-11 12:47:04 +03:00
parent dbffd9be77
commit 4509215980
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/networking/remote/freerdp/3.nix
View File

@ -145,6 +145,7 @@ stdenv.mkDerivation (finalAttrs: {
fuse3
systemd
wayland
wayland-scanner
] ++ lib.optionals stdenv.isDarwin [
AudioToolbox
AVFoundation
@ -160,7 +161,6 @@ stdenv.mkDerivation (finalAttrs: {
"-Wno-dev"
"-DCMAKE_INSTALL_LIBDIR=lib"
"-DDOCBOOKXSL_DIR=${docbook-xsl-nons}/xml/xsl/docbook"
"-DWAYLAND_SCANNER=${buildPackages.wayland-scanner}/bin/wayland-scanner"
] ++ lib.mapAttrsToList (k: v: "-D${k}=${cmFlag v}") {
BUILD_TESTING = false; # false is recommended by upstream
WITH_CAIRO = (cairo != null);