libvncserver: 0.9.14 -> 0.9.15 (#417844)

authored by 7c6f434c and committed by GitHub 482e8ba3 ae48ab38

+17 -12
+11 -6
pkgs/by-name/li/libvncserver/package.nix
··· 10 10 libpng, 11 11 withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, 12 12 systemd, 13 + 14 + enableShared ? !stdenv.hostPlatform.isStatic, 15 + buildExamples ? false, 13 16 }: 14 17 15 - stdenv.mkDerivation rec { 18 + stdenv.mkDerivation (finalAttrs: { 16 19 pname = "libvncserver"; 17 - version = "0.9.14"; 20 + version = "0.9.15"; 18 21 19 22 outputs = [ 20 23 "out" ··· 24 27 src = fetchFromGitHub { 25 28 owner = "LibVNC"; 26 29 repo = "libvncserver"; 27 - rev = "LibVNCServer-${version}"; 28 - sha256 = "sha256-kqVZeCTp+Z6BtB6nzkwmtkJ4wtmjlSQBg05lD02cVvQ="; 30 + tag = "LibVNCServer-${finalAttrs.version}"; 31 + hash = "sha256-a3acEjJM+ZA9jaB6qZ/czjIfx/L3j71VjJ6mtlqYcSw="; 29 32 }; 30 33 31 34 patches = [ ··· 38 41 ]; 39 42 40 43 cmakeFlags = [ 41 - "-DWITH_SYSTEMD=${if withSystemd then "ON" else "OFF"}" 44 + (lib.cmakeBool "WITH_SYSTEMD" withSystemd) 45 + (lib.cmakeBool "BUILD_SHARED_LIBS" enableShared) 46 + (lib.cmakeBool "WITH_EXAMPLES" buildExamples) 42 47 ]; 43 48 44 49 buildInputs = ··· 63 68 maintainers = with maintainers; [ raskin ]; 64 69 platforms = platforms.unix; 65 70 }; 66 - } 71 + })
+6 -6
pkgs/by-name/li/libvncserver/pkgconfig.patch
··· 1 - diff --git a/libvncclient.pc.cmakein b/libvncclient.pc.cmakein 1 + diff --git a/src/libvncclient/libvncclient.pc.cmakein b/src/libvncclient/libvncclient.pc.cmakein 2 2 index ceeda39d..2516e643 100644 3 - --- a/libvncclient.pc.cmakein 4 - +++ b/libvncclient.pc.cmakein 3 + --- a/src/libvncclient/libvncclient.pc.cmakein 4 + +++ b/src/libvncclient/libvncclient.pc.cmakein 5 5 @@ -1,7 +1,7 @@ 6 6 prefix=@CMAKE_INSTALL_PREFIX@ 7 7 exec_prefix=@CMAKE_INSTALL_PREFIX@ ··· 12 12 13 13 Name: LibVNCClient 14 14 Description: A library for easy implementation of a VNC client. 15 - diff --git a/libvncserver.pc.cmakein b/libvncserver.pc.cmakein 15 + diff --git a/src/libvncserver/libvncserver.pc.cmakein b/src/libvncserver/libvncserver.pc.cmakein 16 16 index 33ec6685..57244742 100644 17 - --- a/libvncserver.pc.cmakein 18 - +++ b/libvncserver.pc.cmakein 17 + --- a/src/libvncserver/libvncserver.pc.cmakein 18 + +++ b/src/libvncserver/libvncserver.pc.cmakein 19 19 @@ -1,7 +1,7 @@ 20 20 prefix=@CMAKE_INSTALL_PREFIX@ 21 21 exec_prefix=@CMAKE_INSTALL_PREFIX@