diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2018-01-15 18:49:27 -0600 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2018-01-15 18:49:27 -0600 |
| commit | 04239641b5233fce7407b1ad7522dd33f259a6cf (patch) | |
| tree | 250212ec7dca40239cb742eadc95a4a34aee99b3 /pkgs/development/libraries/qt-5/modules | |
| parent | 617c4f4220b6266e5b21341c8cef83431a217d4f (diff) | |
| parent | 75d2a7dc4dd0dc084cbc1b47dc7f6b69566ee35c (diff) | |
| download | nixlib-04239641b5233fce7407b1ad7522dd33f259a6cf.tar nixlib-04239641b5233fce7407b1ad7522dd33f259a6cf.tar.gz nixlib-04239641b5233fce7407b1ad7522dd33f259a6cf.tar.bz2 nixlib-04239641b5233fce7407b1ad7522dd33f259a6cf.tar.lz nixlib-04239641b5233fce7407b1ad7522dd33f259a6cf.tar.xz nixlib-04239641b5233fce7407b1ad7522dd33f259a6cf.tar.zst nixlib-04239641b5233fce7407b1ad7522dd33f259a6cf.zip | |
Merge branch 'bugfix/qt-5/closure-size-static-libs' into merge/qt-5.10.0
Diffstat (limited to 'pkgs/development/libraries/qt-5/modules')
| -rw-r--r-- | pkgs/development/libraries/qt-5/modules/qtbase.nix | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 5f65f71bbbaa..3c070bf6ce97 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -97,7 +97,6 @@ stdenv.mkDerivation { fix_qt_builtin_paths = ../hooks/fix-qt-builtin-paths.sh; fix_qt_module_paths = ../hooks/fix-qt-module-paths.sh; preHook = '' - . "$fix_qt_static_libs" . "$fix_qt_builtin_paths" . "$fix_qt_module_paths" . ${../hooks/move-qt-dev-tools.sh} @@ -363,11 +362,6 @@ stdenv.mkDerivation { fixQtBuiltinPaths "''${!outputDev}" '*.pr?' '' - # Move static libraries and QMake library definitions into $dev. - + '' - fixQtStaticLibs "''${!outputLib}" "''${!outputDev}" - '' - # Move development tools to $dev + '' moveQtDevTools |