Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

megasync: use qt5's mkDerivation #67406

Merged
merged 1 commit into from
Aug 24, 2019
Merged

megasync: use qt5's mkDerivation #67406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions pkgs/applications/misc/megasync/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand All @@ -41,8 +45,8 @@ stdenv.mkDerivation rec {
doxygen
lsb-release
pkgconfig
qt5.qmake
qt5.qttools
qmake
qttools
swig
];
buildInputs = [
Expand All @@ -57,8 +61,8 @@ stdenv.mkDerivation rec {
libtool
libuv
libzen
qt5.qtbase
qt5.qtsvg
qtbase
qtsvg
sqlite
unzip
wget
Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1784,7 +1784,7 @@ in

massren = callPackage ../tools/misc/massren { };

megasync = callPackage ../applications/misc/megasync { };
megasync = libsForQt5.callPackage ../applications/misc/megasync { };

meritous = callPackage ../games/meritous { };

Expand Down