diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2013-11-09 16:26:59 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2013-11-09 16:26:59 +0100 |
commit | 35a3d07c4f1cc2772e35decb348a71651056c057 (patch) | |
tree | 474519a62558478f6b87ebc3af68f33413d3af51 /pkgs/top-level | |
parent | 61528849e3020e9bfdd152b569a0e8302748bbb5 (diff) | |
parent | 736b295bc56199280bbe35c9822a7c473c44f909 (diff) | |
download | nixlib-35a3d07c4f1cc2772e35decb348a71651056c057.tar nixlib-35a3d07c4f1cc2772e35decb348a71651056c057.tar.gz nixlib-35a3d07c4f1cc2772e35decb348a71651056c057.tar.bz2 nixlib-35a3d07c4f1cc2772e35decb348a71651056c057.tar.lz nixlib-35a3d07c4f1cc2772e35decb348a71651056c057.tar.xz nixlib-35a3d07c4f1cc2772e35decb348a71651056c057.tar.zst nixlib-35a3d07c4f1cc2772e35decb348a71651056c057.zip |
Merge #1082: Update QtCreator to 2.8.1, add Qt 5.1.1 and QtSDK
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 33 |
1 files changed, 30 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 39dbeae6df44..b5737918cff8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5478,6 +5478,35 @@ let docs = true; demos = true; examples = true; + developerBuild = true; + }; + + qt4SDK = qtcreator.override { + sdkBuild = true; + qtLib = qt48Full; + }; + + qt5 = callPackage ../development/libraries/qt-5 { + mesa = mesa_noglu; + cups = if stdenv.isLinux then cups else null; + # GNOME dependencies are not used unless gtkStyle == true + inherit (gnome) libgnomeui GConf gnome_vfs; + }; + + qt5Full = qt5.override { + buildDocs = true; + buildExamples = true; + buildTests = true; + developerBuild = true; + }; + + qt5SDK = qtcreator.override { + sdkBuild = true; + qtLib = qt5Full; + }; + + qtcreator = callPackage ../development/qtcreator { + qtLib = qt48.override { developerBuild = true; }; }; qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator { }; @@ -5742,7 +5771,7 @@ let vtk = callPackage ../development/libraries/vtk { }; - vtkWithQt4 = vtk.override { useQt4 = true; }; + vtkWithQt4 = vtk.override { qtLib = qt4; }; vxl = callPackage ../development/libraries/vxl { libpng = libpng12; @@ -8571,8 +8600,6 @@ let qsynth = callPackage ../applications/audio/qsynth { }; - qtcreator = callPackage ../development/qtcreator { }; - qtpfsgui = callPackage ../applications/graphics/qtpfsgui { }; qtractor = callPackage ../applications/audio/qtractor { }; |