pyrox.dev / nixpkgs
lol
fork atom

qt5: build env and full per version

Thomas Tuegel f250a6e6 74508658

+20 -10
unified split
+8
pkgs/development/libraries/qt-5/5.4/default.nix
··· 101 101 qtx11extras = callPackage ./qtx11extras.nix {}; 102 102 qtxmlpatterns = callPackage ./qtxmlpatterns.nix {}; 103 103 104 + env = callPackage ../qt-env.nix {}; 105 + full = env "qt-${qtbase.version}" [ 106 + qtconnectivity qtdeclarative qtdoc qtenginio qtgraphicaleffects qtimageformats 107 + qtlocation qtmultimedia qtquick1 qtquickcontrols qtscript qtsensors qtserialport 108 + qtsvg qttools qttranslations qtwebkit qtwebkit-examples qtwebsockets qtx11extras 109 + qtxmlpatterns 110 + ]; 111 + 104 112 makeQtWrapper = makeSetupHook { deps = [ makeWrapper ]; } ./make-qt-wrapper.sh; 105 113 106 114 };
+8
pkgs/development/libraries/qt-5/5.5/default.nix
··· 101 101 qtx11extras = callPackage ./qtx11extras.nix {}; 102 102 qtxmlpatterns = callPackage ./qtxmlpatterns.nix {}; 103 103 104 + env = callPackage ../qt-env.nix {}; 105 + full = env "qt-${qtbase.version}" [ 106 + qtconnectivity qtdeclarative qtdoc qtenginio qtgraphicaleffects qtimageformats 107 + qtlocation qtmultimedia qtquick1 qtquickcontrols qtscript qtsensors qtserialport 108 + qtsvg qttools qttranslations qtwebkit qtwebkit-examples qtwebsockets qtx11extras 109 + qtxmlpatterns 110 + ]; 111 + 104 112 makeQtWrapper = makeSetupHook { deps = [ makeWrapper ]; } ./make-qt-wrapper.sh; 105 113 106 114 };
+2 -4
pkgs/development/libraries/qt-5/qt-env.nix
··· 1 - { runCommand, lndir }: 2 - 3 - { paths, qtbase }: 1 + { runCommand, lndir, qtbase }: name: paths: 4 2 5 - runCommand "qt-env" { inherit paths qtbase; } '' 3 + runCommand name { inherit paths qtbase; } '' 6 4 7 5 mkdir -p "$out/bin" "$out/mkspecs" "$out/include" "$out/lib" "$out/share" 8 6
+2 -6
pkgs/top-level/all-packages.nix
··· 8205 8205 qt55Libs = lib.makeScope qt55.newScope qt5LibsFun; 8206 8206 qt5Libs = qt55Libs; 8207 8207 8208 - qtEnv = callPackage ../development/libraries/qt-5/qt-env.nix {}; 8209 - 8210 - qt5Full = appendToName "full" (qtEnv { 8211 - qtbase = qt5.base; 8212 - paths = lib.filter lib.isDerivation (lib.attrValues qt5); 8213 - }); 8208 + qtEnv = qt5.env; 8209 + qt5Full = qt5.full; 8214 8210 8215 8211 qtcreator = callPackage ../development/qtcreator { 8216 8212 qtLib = qt54;