diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-17 02:46:33 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-20 18:55:52 +0300 |
| commit | b69940ee7686897e743d3083a226314d491b57cc (patch) | |
| tree | 893e6e693dba957f6d1ee9d9ebc79ca9294a093f /pkgs | |
| parent | e307c3dac2a70e4861ffb54f08ce00c308f27f54 (diff) | |
| download | nixpkgs-b69940ee7686897e743d3083a226314d491b57cc.tar nixpkgs-b69940ee7686897e743d3083a226314d491b57cc.tar.gz nixpkgs-b69940ee7686897e743d3083a226314d491b57cc.tar.bz2 nixpkgs-b69940ee7686897e743d3083a226314d491b57cc.tar.lz nixpkgs-b69940ee7686897e743d3083a226314d491b57cc.tar.xz nixpkgs-b69940ee7686897e743d3083a226314d491b57cc.tar.zst nixpkgs-b69940ee7686897e743d3083a226314d491b57cc.zip | |
qscintilla: move to qmake4Hook
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/qscintilla/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index 26d412e5a8c..bc44f53fa6e 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -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 = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 007c8df4f07..ded7ed829d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |