diff options
| author | Stéphan Kochen <git@stephank.nl> | 2021-05-17 20:52:30 +0200 |
|---|---|---|
| committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2021-05-17 14:13:50 -0700 |
| commit | 0776eae5ae9456923903b42a2804984fd627d14b (patch) | |
| tree | f6bddcf04ab2c907d3e853fcee068b1ac33ffd10 | |
| parent | aba67c5de5c625d6d5ffa2916c6da43cdf0d2c6d (diff) | |
| download | nixpkgs-0776eae5ae9456923903b42a2804984fd627d14b.tar nixpkgs-0776eae5ae9456923903b42a2804984fd627d14b.tar.gz nixpkgs-0776eae5ae9456923903b42a2804984fd627d14b.tar.bz2 nixpkgs-0776eae5ae9456923903b42a2804984fd627d14b.tar.lz nixpkgs-0776eae5ae9456923903b42a2804984fd627d14b.tar.xz nixpkgs-0776eae5ae9456923903b42a2804984fd627d14b.tar.zst nixpkgs-0776eae5ae9456923903b42a2804984fd627d14b.zip | |
libvncserver: fix darwin build
| -rw-r--r-- | pkgs/development/libraries/libvncserver/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/development/libraries/libvncserver/default.nix b/pkgs/development/libraries/libvncserver/default.nix index 7c8d4a76fc9..01a079a2051 100644 --- a/pkgs/development/libraries/libvncserver/default.nix +++ b/pkgs/development/libraries/libvncserver/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchzip, fetchpatch, cmake , libjpeg, openssl, zlib, libgcrypt, libpng -, systemd +, systemd, Carbon }: let @@ -19,10 +19,11 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ - libjpeg openssl libgcrypt libpng - ] ++ lib.optional stdenv.isLinux systemd; + buildInputs = [ libjpeg openssl libgcrypt libpng ] + ++ lib.optional stdenv.isLinux systemd + ++ lib.optional stdenv.isDarwin Carbon; propagatedBuildInputs = [ zlib ]; + meta = { inherit (s) version; description = "VNC server library"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b3c35c18b1..5f7376fc183 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16589,7 +16589,9 @@ in 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 { }; |