diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-01-10 07:13:44 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-01-12 14:07:16 +0000 |
| commit | e2698550456abba83c6dcd5d5e5a9990a0b96f8a (patch) | |
| tree | 79a56f0df3fa55e470d84b4dff6059fbf487ec18 /nixpkgs/pkgs/development/libraries/libvncserver | |
| parent | 1cdc42df888dc98c347e03bd942ed9825a55bcb3 (diff) | |
| parent | 84d74ae9c9cbed73274b8e4e00be14688ffc93fe (diff) | |
| download | nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.gz nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.bz2 nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.lz nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.xz nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.zst nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.zip | |
Merge commit '84d74ae9c9cbed73274b8e4e00be14688ffc93fe'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libvncserver')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libvncserver/default.nix | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libvncserver/default.nix b/nixpkgs/pkgs/development/libraries/libvncserver/default.nix index c9adad6f6454..c4e82b1c326c 100644 --- a/nixpkgs/pkgs/development/libraries/libvncserver/default.nix +++ b/nixpkgs/pkgs/development/libraries/libvncserver/default.nix @@ -7,9 +7,9 @@ let s = # Generated upstream information rec { pname = "libvncserver"; - version = "0.9.12"; + version = "0.9.13"; url = "https://github.com/LibVNC/libvncserver/archive/LibVNCServer-${version}.tar.gz"; - sha256 = "1226hb179l914919f5nm2mlf8rhaarqbf48aa649p4rwmghyx9vm"; # unpacked archive checksum + sha256 = "0zz0hslw8b1p3crnfy3xnmrljik359h83dpk64s697dqdcrzy141"; # unpacked archive checksum }; in stdenv.mkDerivation { @@ -17,18 +17,7 @@ stdenv.mkDerivation { src = fetchzip { inherit (s) url sha256; }; - patches = [ - (fetchpatch { - name = "CVE-2018-20750.patch"; - url = "https://github.com/LibVNC/libvncserver/commit/09e8fc02f59f16e2583b34fe1a270c238bd9ffec.patch"; - sha256 = "004h50786nvjl3y3yazpsi2b767vc9gqrwm1ralj3zgy47kwfhqm"; - }) - (fetchpatch { - name = "CVE-2019-15681.patch"; - url = "https://github.com/LibVNC/libvncserver/commit/d01e1bb4246323ba6fcee3b82ef1faa9b1dac82a.patch"; - sha256 = "0hf0ss7all2m50z2kan4mck51ws44yim4ymn8p0d991y465y6l9s"; - }) - ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ libjpeg openssl libgcrypt libpng |