mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-16 06:47:09 +03:00
Merge pull request #34794 from ajs124/update/texmaker_and_studio
move texstudio from qt4 to qt5
This commit is contained in:
commit
358b821bbe
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, qt4, qmake4Hook, poppler_qt4, zlib, pkgconfig}:
|
||||
{ stdenv, fetchurl, qt5, poppler_qt5, zlib, pkgconfig}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "texstudio";
|
||||
@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "18rxd7ra5k2f7s4c296b3v3pqhxjmfix9xpy9i1g4jm87ygqrbnd";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake4Hook pkgconfig ];
|
||||
buildInputs = [ qt4 poppler_qt4 zlib ];
|
||||
nativeBuildInputs = [ qt5.qmake pkgconfig ];
|
||||
buildInputs = [ qt5.qtbase qt5.qtscript qt5.qtsvg poppler_qt5 zlib ];
|
||||
|
||||
qmakeFlags = [ "NO_APPDATA=True" ];
|
||||
|
||||
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
homepage = http://texstudio.sourceforge.net;
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ cfouche ];
|
||||
};
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user