Merge pull request #67406 from Alkeryn/megasync

megasync: use qt5's mkDerivation
This commit is contained in:
worldofpeace
2019-08-24 18:24:32 -04:00
committed by GitHub
2 changed files with 11 additions and 7 deletions
+10 -6
View File
@@ -15,15 +15,19 @@
, libuv
, libzen
, lsb-release
, mkDerivation
, pkgconfig
, qt5
, qmake
, qtbase
, qtsvg
, qttools
, sqlite
, swig
, unzip
, wget
}:
stdenv.mkDerivation rec {
mkDerivation rec {
name = "megasync-${version}";
version = "4.1.1.0";
@@ -41,8 +45,8 @@ stdenv.mkDerivation rec {
doxygen
lsb-release
pkgconfig
qt5.qmake
qt5.qttools
qmake
qttools
swig
];
buildInputs = [
@@ -57,8 +61,8 @@ stdenv.mkDerivation rec {
libtool
libuv
libzen
qt5.qtbase
qt5.qtsvg
qtbase
qtsvg
sqlite
unzip
wget
+1 -1
View File
@@ -1786,7 +1786,7 @@ in
massren = callPackage ../tools/misc/massren { };
megasync = callPackage ../applications/misc/megasync { };
megasync = libsForQt5.callPackage ../applications/misc/megasync { };
meritous = callPackage ../games/meritous { };