From 0b0fcb01c70ee40618fde848d87779e4444a46b9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 9 Jan 2022 00:11:07 +0100 Subject: [PATCH] libvncserver: add dev output This will prevent zlib.dev from propagatedBuildInputs from ending in the out closure. --- .../libraries/libvncserver/default.nix | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libvncserver/default.nix b/pkgs/development/libraries/libvncserver/default.nix index b9890f6a806..b9da7135f92 100644 --- a/pkgs/development/libraries/libvncserver/default.nix +++ b/pkgs/development/libraries/libvncserver/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { pname = "libvncserver"; version = "0.9.13"; + outputs = [ "out" "dev" ]; + src = fetchFromGitHub { owner = "LibVNC"; repo = "libvncserver"; @@ -23,11 +25,24 @@ stdenv.mkDerivation rec { sha256 = "sha256-gQT/M2u4nWQ0MfO2gWAqY0ZJc7V9eGczGzcsxKmG4H8="; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ libjpeg openssl libgcrypt libpng ] - ++ lib.optional stdenv.isLinux systemd - ++ lib.optional stdenv.isDarwin Carbon; - propagatedBuildInputs = [ zlib ]; + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + libjpeg + openssl + libgcrypt + libpng + ] ++ lib.optionals stdenv.isLinux [ + systemd + ] ++ lib.optional stdenv.isDarwin [ + Carbon + ]; + + propagatedBuildInputs = [ + zlib + ]; meta = with lib; { description = "VNC server library";