diff --git a/pkgs/by-name/li/libvncserver/package.nix b/pkgs/by-name/li/libvncserver/package.nix index b016e19af766..ecaceb3c56ad 100644 --- a/pkgs/by-name/li/libvncserver/package.nix +++ b/pkgs/by-name/li/libvncserver/package.nix @@ -10,11 +10,14 @@ libpng, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd, + + enableShared ? !stdenv.hostPlatform.isStatic, + buildExamples ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libvncserver"; - version = "0.9.14"; + version = "0.9.15"; outputs = [ "out" @@ -24,8 +27,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "LibVNC"; repo = "libvncserver"; - rev = "LibVNCServer-${version}"; - sha256 = "sha256-kqVZeCTp+Z6BtB6nzkwmtkJ4wtmjlSQBg05lD02cVvQ="; + tag = "LibVNCServer-${finalAttrs.version}"; + hash = "sha256-a3acEjJM+ZA9jaB6qZ/czjIfx/L3j71VjJ6mtlqYcSw="; }; patches = [ @@ -38,7 +41,9 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DWITH_SYSTEMD=${if withSystemd then "ON" else "OFF"}" + (lib.cmakeBool "WITH_SYSTEMD" withSystemd) + (lib.cmakeBool "BUILD_SHARED_LIBS" enableShared) + (lib.cmakeBool "WITH_EXAMPLES" buildExamples) ]; buildInputs = @@ -63,4 +68,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libvncserver/pkgconfig.patch b/pkgs/by-name/li/libvncserver/pkgconfig.patch index 0b98e9e0a79b..929508b4d935 100644 --- a/pkgs/by-name/li/libvncserver/pkgconfig.patch +++ b/pkgs/by-name/li/libvncserver/pkgconfig.patch @@ -1,7 +1,7 @@ -diff --git a/libvncclient.pc.cmakein b/libvncclient.pc.cmakein +diff --git a/src/libvncclient/libvncclient.pc.cmakein b/src/libvncclient/libvncclient.pc.cmakein index ceeda39d..2516e643 100644 ---- a/libvncclient.pc.cmakein -+++ b/libvncclient.pc.cmakein +--- a/src/libvncclient/libvncclient.pc.cmakein ++++ b/src/libvncclient/libvncclient.pc.cmakein @@ -1,7 +1,7 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=@CMAKE_INSTALL_PREFIX@ @@ -12,10 +12,10 @@ index ceeda39d..2516e643 100644 Name: LibVNCClient Description: A library for easy implementation of a VNC client. -diff --git a/libvncserver.pc.cmakein b/libvncserver.pc.cmakein +diff --git a/src/libvncserver/libvncserver.pc.cmakein b/src/libvncserver/libvncserver.pc.cmakein index 33ec6685..57244742 100644 ---- a/libvncserver.pc.cmakein -+++ b/libvncserver.pc.cmakein +--- a/src/libvncserver/libvncserver.pc.cmakein ++++ b/src/libvncserver/libvncserver.pc.cmakein @@ -1,7 +1,7 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=@CMAKE_INSTALL_PREFIX@