Merge pull request #304058 from jackyliu16/fix-303675

realvnc-vnc-viewer: replace fetchurl by requireFile to fix captcha

rewine b2cd5e15 5629a633

Changed files
+24 -7
pkgs
tools
admin
realvnc-vnc-viewer
+12 -4
pkgs/tools/admin/realvnc-vnc-viewer/darwin.nix
···
{ lib
, stdenvNoCC
-
, fetchurl
+
, requireFile
, undmg
, pname
, version
···
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";
-
sha256 = "0k72fdnx1zmyi9z5n3lazc7s70gcddxq0s73akp0al0y9hzq9prh";
+
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 = ".";
+1
pkgs/tools/admin/realvnc-vnc-viewer/default.nix
···
};
maintainers = with maintainers; [ emilytrau onedragon ];
platforms = [ "x86_64-linux" ] ++ platforms.darwin;
+
hydraPlatforms = [];
mainProgram = "vncviewer";
};
in
+11 -3
pkgs/tools/admin/realvnc-vnc-viewer/linux.nix
···
{ lib
, stdenv
-
, fetchurl
+
, requireFile
, autoPatchelfHook
, rpmextract
, libX11
···
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}");