libvncserver: 0.9.14 -> 0.9.15

Also a minor cleanup

+12 -14
+6 -8
pkgs/by-name/li/libvncserver/package.nix
··· 12 12 systemd, 13 13 }: 14 14 15 - stdenv.mkDerivation rec { 15 + stdenv.mkDerivation (finalAttrs: { 16 16 pname = "libvncserver"; 17 - version = "0.9.14"; 17 + version = "0.9.15"; 18 18 19 19 outputs = [ 20 20 "out" ··· 24 24 src = fetchFromGitHub { 25 25 owner = "LibVNC"; 26 26 repo = "libvncserver"; 27 - rev = "LibVNCServer-${version}"; 28 - sha256 = "sha256-kqVZeCTp+Z6BtB6nzkwmtkJ4wtmjlSQBg05lD02cVvQ="; 27 + tag = "LibVNCServer-${finalAttrs.version}"; 28 + hash = "sha256-a3acEjJM+ZA9jaB6qZ/czjIfx/L3j71VjJ6mtlqYcSw="; 29 29 }; 30 30 31 31 patches = [ ··· 37 37 cmake 38 38 ]; 39 39 40 - cmakeFlags = [ 41 - "-DWITH_SYSTEMD=${if withSystemd then "ON" else "OFF"}" 42 - ]; 40 + cmakeFlags = [ (lib.cmakeBool "WITH_SYSTEMD" withSystemd) ]; 43 41 44 42 buildInputs = 45 43 [ ··· 63 61 maintainers = with maintainers; [ raskin ]; 64 62 platforms = platforms.unix; 65 63 }; 66 - } 64 + })
+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@