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

maestral-gui: Fix Qt by using libsForQt5

Browse Source 
This is needed after c88f3adb17 to make sure the libs are consistent.
This commit is contained in:
Stefan Frijters 2020-09-21 13:50:45 +02:00 committed by Jon
parent 11c36334bf
commit bc2e4628b2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10868,8 +10868,8 @@ in
if stdenv.targetPlatform.isi686
then gcc6.cc
else if stdenv.targetPlatform == stdenv.hostPlatform && targetPackages.stdenv.cc.isGNU
# Can only do this is in the native case, otherwise we might get infinite
# recursion if `targetPackages.stdenv.cc.cc` itself uses `gccForLibs`.
# Can only do this is in the native case, otherwise we might get infinite
# recursion if `targetPackages.stdenv.cc.cc` itself uses `gccForLibs`.
then targetPackages.stdenv.cc.cc
else gcc.cc;
@ -23242,7 +23242,7 @@ in
maestral = with python3Packages; toPythonApplication maestral;
maestral-gui = libsForQt514.callPackage ../applications/networking/maestral-qt { };
maestral-gui = libsForQt5.callPackage ../applications/networking/maestral-qt { };
insync = callPackage ../applications/networking/insync { };