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

libvncserver: fix darwin build

This commit is contained in:
Stéphan Kochen 2021-05-17 20:52:30 +02:00 committed by Jonathan Ringer
parent aba67c5de5
commit 0776eae5ae
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/libvncserver/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchzip, fetchpatch, cmake { lib, stdenv, fetchzip, fetchpatch, cmake
, libjpeg, openssl, zlib, libgcrypt, libpng , libjpeg, openssl, zlib, libgcrypt, libpng
, systemd , systemd, Carbon
}: }:
let let
@ -19,10 +19,11 @@ stdenv.mkDerivation {
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ buildInputs = [ libjpeg openssl libgcrypt libpng ]
libjpeg openssl libgcrypt libpng ++ lib.optional stdenv.isLinux systemd
] ++ lib.optional stdenv.isLinux systemd; ++ lib.optional stdenv.isDarwin Carbon;
propagatedBuildInputs = [ zlib ]; propagatedBuildInputs = [ zlib ];
meta = { meta = {
inherit (s) version; inherit (s) version;
description = "VNC server library"; description = "VNC server library";

4
pkgs/top-level/all-packages.nix
View File

@ -16589,7 +16589,9 @@ in
libvmaf = callPackage ../development/libraries/libvmaf { }; libvmaf = callPackage ../development/libraries/libvmaf { };
libvncserver = callPackage ../development/libraries/libvncserver {}; libvncserver = callPackage ../development/libraries/libvncserver {
inherit (darwin.apple_sdk.frameworks) Carbon;
};
libviper = callPackage ../development/libraries/libviper { }; libviper = callPackage ../development/libraries/libviper { };