Unverified Commit b2cd5e15 authored by rewine's avatar rewine Committed by GitHub
Browse files

Merge pull request #304058 from jackyliu16/fix-303675 

realvnc-vnc-viewer: replace fetchurl by requireFile to fix captcha
parents 5629a633 4c5b0237

pkgs/tools/admin/realvnc-vnc-viewer/darwin.nix

+12 −4
Original line number Diff line number Diff line 
{ lib

, stdenvNoCC

, fetchurl

, requireFile

, undmg

, pname

, version
@@ -9,9 +9,17 @@ 
stdenvNoCC.mkDerivation (finalAttrs: {

  inherit pname version meta;



  src = fetchurl {

    url = "https://downloads.realvnc.com/download/file/viewer.files/VNC-Viewer-${finalAttrs.version}-MacOSX-universal.dmg";

  src = requireFile rec {

      name = "VNC-Viewer-${finalAttrs.version}-MacOSX-universal.dmg";

      url = "https://downloads.realvnc.com/download/file/viewer.files/${name}";

      sha256 = "0k72fdnx1zmyi9z5n3lazc7s70gcddxq0s73akp0al0y9hzq9prh";

      message= ''

        vnc-viewer can be downloaded from ${url},

        but the download link require captcha, thus if you wish to use this application,

        you need to download it manually and use follow command to add downloaded files into nix-store



        $ nix-prefetch-url --type sha256 file:///path/to/${name}

      '';

  };

  sourceRoot = ".";

pkgs/tools/admin/realvnc-vnc-viewer/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ let 
    };

    maintainers = with maintainers; [ emilytrau onedragon ];

    platforms = [ "x86_64-linux" ] ++ platforms.darwin;

    hydraPlatforms = [];

    mainProgram = "vncviewer";

  };

in

pkgs/tools/admin/realvnc-vnc-viewer/linux.nix

+11 −3
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchurl

, requireFile

, autoPatchelfHook

, rpmextract

, libX11
@@ -14,9 +14,17 @@ stdenv.mkDerivation (finalAttrs: { 
  inherit pname version;



  src = {

    "x86_64-linux" = fetchurl {

      url = "https://downloads.realvnc.com/download/file/viewer.files/VNC-Viewer-${finalAttrs.version}-Linux-x64.rpm";

    "x86_64-linux" = requireFile rec {

      name = "VNC-Viewer-${finalAttrs.version}-Linux-x64.rpm";

      url = "https://downloads.realvnc.com/download/file/viewer.files/${name}";

      sha256 = "sha256-Ull9iNi8NxB12YwEThWE0P9k1xOV2LZnebuRrVH/zwI=";

      message= ''

        vnc-viewer can be downloaded from ${url},

        but the download link require captcha, thus if you wish to use this application,

        you need to download it manually and use follow command to add downloaded files into nix-store



        $ nix-prefetch-url --type sha256 file:///path/to/${name}

      '';

    };

  }.${stdenv.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");