Merge pull request #34794 from ajs124/update/texmaker_and_studio

move texstudio from qt4 to qt5

authored by Andreas Rammhold and committed by GitHub 358b821b 122fa75b

+4 -4
+4 -4
pkgs/applications/editors/texstudio/default.nix
··· 1 - { stdenv, fetchurl, qt4, qmake4Hook, poppler_qt4, zlib, pkgconfig}: 2 3 stdenv.mkDerivation rec { 4 pname = "texstudio"; ··· 11 sha256 = "18rxd7ra5k2f7s4c296b3v3pqhxjmfix9xpy9i1g4jm87ygqrbnd"; 12 }; 13 14 - nativeBuildInputs = [ qmake4Hook pkgconfig ]; 15 - buildInputs = [ qt4 poppler_qt4 zlib ]; 16 17 qmakeFlags = [ "NO_APPDATA=True" ]; 18 ··· 25 ''; 26 homepage = http://texstudio.sourceforge.net; 27 license = licenses.gpl2Plus; 28 - platforms = platforms.linux; 29 maintainers = with maintainers; [ cfouche ]; 30 }; 31 }
··· 1 + { stdenv, fetchurl, qt5, poppler_qt5, zlib, pkgconfig}: 2 3 stdenv.mkDerivation rec { 4 pname = "texstudio"; ··· 11 sha256 = "18rxd7ra5k2f7s4c296b3v3pqhxjmfix9xpy9i1g4jm87ygqrbnd"; 12 }; 13 14 + nativeBuildInputs = [ qt5.qmake pkgconfig ]; 15 + buildInputs = [ qt5.qtbase qt5.qtscript qt5.qtsvg poppler_qt5 zlib ]; 16 17 qmakeFlags = [ "NO_APPDATA=True" ]; 18 ··· 25 ''; 26 homepage = http://texstudio.sourceforge.net; 27 license = licenses.gpl2Plus; 28 + platforms = [ "x86_64-linux" ]; 29 maintainers = with maintainers; [ cfouche ]; 30 }; 31 }