public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qt5: build env and full per version

Browse Source
This commit is contained in:
Thomas Tuegel 2015-12-19 18:44:40 -06:00
parent 7450865827
commit f250a6e64e
4 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/qt-5/5.4/default.nix
View File

@ -101,6 +101,14 @@ let
qtx11extras = callPackage ./qtx11extras.nix {}; qtx11extras = callPackage ./qtx11extras.nix {};
qtxmlpatterns = callPackage ./qtxmlpatterns.nix {}; qtxmlpatterns = callPackage ./qtxmlpatterns.nix {};
env = callPackage ../qt-env.nix {};
full = env "qt-${qtbase.version}" [
qtconnectivity qtdeclarative qtdoc qtenginio qtgraphicaleffects qtimageformats
qtlocation qtmultimedia qtquick1 qtquickcontrols qtscript qtsensors qtserialport
qtsvg qttools qttranslations qtwebkit qtwebkit-examples qtwebsockets qtx11extras
qtxmlpatterns
];
makeQtWrapper = makeSetupHook { deps = [ makeWrapper ]; } ./make-qt-wrapper.sh; makeQtWrapper = makeSetupHook { deps = [ makeWrapper ]; } ./make-qt-wrapper.sh;
}; };

8
pkgs/development/libraries/qt-5/5.5/default.nix
View File

@ -101,6 +101,14 @@ let
qtx11extras = callPackage ./qtx11extras.nix {}; qtx11extras = callPackage ./qtx11extras.nix {};
qtxmlpatterns = callPackage ./qtxmlpatterns.nix {}; qtxmlpatterns = callPackage ./qtxmlpatterns.nix {};
env = callPackage ../qt-env.nix {};
full = env "qt-${qtbase.version}" [
qtconnectivity qtdeclarative qtdoc qtenginio qtgraphicaleffects qtimageformats
qtlocation qtmultimedia qtquick1 qtquickcontrols qtscript qtsensors qtserialport
qtsvg qttools qttranslations qtwebkit qtwebkit-examples qtwebsockets qtx11extras
qtxmlpatterns
];
makeQtWrapper = makeSetupHook { deps = [ makeWrapper ]; } ./make-qt-wrapper.sh; makeQtWrapper = makeSetupHook { deps = [ makeWrapper ]; } ./make-qt-wrapper.sh;
}; };

6
pkgs/development/libraries/qt-5/qt-env.nix
View File

@ -1,8 +1,6 @@
{ runCommand, lndir }: { runCommand, lndir, qtbase }: name: paths:
{ paths, qtbase }: runCommand name { inherit paths qtbase; } ''
runCommand "qt-env" { inherit paths qtbase; } ''
mkdir -p "$out/bin" "$out/mkspecs" "$out/include" "$out/lib" "$out/share" mkdir -p "$out/bin" "$out/mkspecs" "$out/include" "$out/lib" "$out/share"

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

@ -8205,12 +8205,8 @@ let
qt55Libs = lib.makeScope qt55.newScope qt5LibsFun; qt55Libs = lib.makeScope qt55.newScope qt5LibsFun;
qt5Libs = qt55Libs; qt5Libs = qt55Libs;
qtEnv = callPackage ../development/libraries/qt-5/qt-env.nix {}; qtEnv = qt5.env;
qt5Full = qt5.full;
qt5Full = appendToName "full" (qtEnv {
qtbase = qt5.base;
paths = lib.filter lib.isDerivation (lib.attrValues qt5);
});
qtcreator = callPackage ../development/qtcreator { qtcreator = callPackage ../development/qtcreator {
qtLib = qt54; qtLib = qt54;