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

Merge pull request #67406 from Alkeryn/megasync

Browse Source 
megasync: use qt5's mkDerivation
This commit is contained in:
worldofpeace 2019-08-24 18:24:32 -04:00 committed by GitHub
commit 0f395d6fae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/applications/misc/megasync/default.nix
View File

@ -15,15 +15,19 @@
, libuv , libuv
, libzen , libzen
, lsb-release , lsb-release
, mkDerivation
, pkgconfig , pkgconfig
, qt5 , qmake
, qtbase
, qtsvg
, qttools
, sqlite , sqlite
, swig , swig
, unzip , unzip
, wget , wget
}: }:
stdenv.mkDerivation rec { mkDerivation rec {
name = "megasync-${version}"; name = "megasync-${version}";
version = "4.1.1.0"; version = "4.1.1.0";
@ -41,8 +45,8 @@ stdenv.mkDerivation rec {
doxygen doxygen
lsb-release lsb-release
pkgconfig pkgconfig
qt5.qmake qmake
qt5.qttools qttools
swig swig
]; ];
buildInputs = [ buildInputs = [
@ -57,8 +61,8 @@ stdenv.mkDerivation rec {
libtool libtool
libuv libuv
libzen libzen
qt5.qtbase qtbase
qt5.qtsvg qtsvg
sqlite sqlite
unzip unzip
wget wget

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

@ -1786,7 +1786,7 @@ in
massren = callPackage ../tools/misc/massren { }; massren = callPackage ../tools/misc/massren { };
megasync = callPackage ../applications/misc/megasync { }; megasync = libsForQt5.callPackage ../applications/misc/megasync { };
meritous = callPackage ../games/meritous { }; meritous = callPackage ../games/meritous { };