ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-24 20:02:58 +03:00
Code Issues Projects Releases Wiki Activity

qscintilla: move to qmake4Hook

Browse Source
This commit is contained in:
Nikolay Amiantov 2016-04-17 02:46:33 +03:00
parent e307c3dac2
commit b69940ee76
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/qscintilla/default.nix
View File

@ -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 = {

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

@ -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 { };