qscintilla: move to qmake4Hook
This commit is contained in:
parent
e307c3dac2
commit
b69940ee76
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, qt }:
|
||||
{ stdenv, fetchurl, qt4, qmake4Hook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qscintilla";
|
||||
@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "d7c32e32582f93779de861006d87467b38b9ebc06e3d0b32e981cb24369fa417";
|
||||
};
|
||||
|
||||
buildInputs = [ qt ];
|
||||
buildInputs = [ qt4 ];
|
||||
nativeBuildInputs = [ qmake4Hook ];
|
||||
|
||||
preConfigure = ''
|
||||
cd Qt4Qt5
|
||||
@ -20,7 +21,6 @@ stdenv.mkDerivation rec {
|
||||
-e "s,\$\$\\[QT_INSTALL_TRANSLATIONS\\],$out/share/qt/translations," \
|
||||
-e "s,\$\$\\[QT_INSTALL_DATA\\],$out/share/qt," \
|
||||
qscintilla.pro
|
||||
qmake qscintilla.pro
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
@ -2986,9 +2986,7 @@ in
|
||||
|
||||
qprint = callPackage ../tools/text/qprint { };
|
||||
|
||||
qscintilla = callPackage ../development/libraries/qscintilla {
|
||||
qt = qt4;
|
||||
};
|
||||
qscintilla = callPackage ../development/libraries/qscintilla { };
|
||||
|
||||
qshowdiff = callPackage ../tools/text/qshowdiff { };
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user