b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #147099 from jcouyang/synology-drive-client

Browse source 
synology-drive-client: merge with "synology-drive"
This commit is contained in:
Bobby Rong 2022-01-21 10:16:47 +08:00 committed by GitHub
parent 8858896dde 92484333d1
commit f614799359
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/networking/synology-drive-client/default.nix
View file

@ -8,12 +8,12 @@ let
description = "Desktop application to synchronize files and folders between the computer and the Synology Drive server.";
homepage = "https://www.synology.com/en-global/dsm/feature/drive";
license = licenses.unfree;
maintainers = with maintainers; [ jcouyang ];
maintainers = with maintainers; [ jcouyang MoritzBoehme ];
platforms = [ "x86_64-linux" "x86_64-darwin" ];
};
linux = qt5.mkDerivation {
inherit pname version;
inherit pname version meta;
src = fetchurl {
url = "${baseUrl}/${version}-${buildNumber}/Ubuntu/Installer/x86_64/synology-drive-client-${buildNumber}.x86_64.deb";
@ -43,7 +43,7 @@ let
};
darwin = stdenv.mkDerivation {
inherit pname version;
inherit pname version meta;
src = fetchurl {
url = "${baseUrl}/${version}-${buildNumber}/Mac/Installer/synology-drive-client-${buildNumber}.dmg";

45
pkgs/applications/networking/synology-drive/default.nix
View file

@ -1,45 +0,0 @@
{ lib, mkDerivation, fetchurl, autoPatchelfHook, dpkg, glibc, gnome }:
mkDerivation rec {
pname = "synology-drive";
subVersion = "12674";
version = "3.0.1-${subVersion}";
src = fetchurl {
url = "https://global.download.synology.com/download/Utility/SynologyDriveClient/${version}/Ubuntu/Installer/x86_64/synology-drive-client-${subVersion}.x86_64.deb";
sha256 = "1yyv6zgszsym22kf4jvlan7n9lw09fw24fyrh7c8pzbb2029gp8a";
};
nativeBuildInputs = [ autoPatchelfHook dpkg ];
buildInputs = [ glibc gnome.nautilus ];
unpackPhase = ''
mkdir -p $out
dpkg -x $src $out
'';
installPhase = ''
# synology-drive executable
cp -av $out/usr/* $out
rm -rf $out/usr
runHook postInstall
'';
postInstall = ''
substituteInPlace $out/bin/synology-drive --replace /opt $out/opt
'';
meta = with lib; {
homepage = "https://www.synology.com/";
description = "Synchronize files between client and Synology NAS.";
longDescription = ''
Drive for PC, the desktop utility of the DSM add-on package.
Drive, allows you to sync and share files owned by you or shared by others between a centralized Synology NAS and multiple client computers.
'';
license = licenses.unfree;
maintainers = with maintainers; [ MoritzBoehme ];
platforms = [ "x86_64-linux" ];
};
}

1
pkgs/top-level/aliases.nix
View file

@ -988,6 +988,7 @@ mapAliases ({
swfdec = throw "swfdec has been removed as broken and unmaintained."; # added 2020-08-23
swtpm-tpm2 = swtpm; # added 2021-02-26
syncthing-cli = syncthing; # added 2021-04-06
synology-drive = throw "synology-drive has been superseded by synology-drive-client"; # added 2021-11-26
system_config_printer = system-config-printer; # added 2016-01-03
systemd-cryptsetup-generator = throw "systemd-cryptsetup-generator is now included in the systemd package"; # added 2020-07-12
systemd_with_lvm2 = throw "systemd_with_lvm2 is obsolete, enabled by default via the lvm module"; # added 2020-07-12

2
pkgs/top-level/all-packages.nix
View file

@ -27571,8 +27571,6 @@ with pkgs;
mlt-qt5 = libsForQt514.mlt;
};
synology-drive = libsForQt5.callPackage ../applications/networking/synology-drive { };
taxi = callPackage ../applications/networking/ftp/taxi { };
librep = callPackage ../development/libraries/librep { };