gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #304058 from jackyliu16/fix-303675

Browse Source 
realvnc-vnc-viewer: replace fetchurl by requireFile to fix captcha
This commit is contained in:
rewine
2024-04-18 00:10:32 +08:00
committed by GitHub
parent 5629a63379 4c5b0237a4
commit b2cd5e15fb
3 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/admin/realvnc-vnc-viewer/darwin.nix
+12 -4
View File
@@ -1,6 +1,6 @@
{ 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";
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 = ".";
pkgs/tools/admin/realvnc-vnc-viewer/default.nix
+1
View File
@@ -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
View File
@@ -1,6 +1,6 @@
{ 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}");