diff options
Diffstat (limited to 'pkgs/development/libraries/qt-5/5.8')
3 files changed, 3 insertions, 31 deletions
diff --git a/pkgs/development/libraries/qt-5/5.8/default.nix b/pkgs/development/libraries/qt-5/5.8/default.nix index 1000bf09b17..b7d141fd5a2 100644 --- a/pkgs/development/libraries/qt-5/5.8/default.nix +++ b/pkgs/development/libraries/qt-5/5.8/default.nix @@ -133,12 +133,6 @@ let ] ++ optional (!stdenv.isDarwin) qtwayland ++ optional (stdenv.isDarwin) qtmacextras); - makeQtWrapper = - makeSetupHook - { deps = [ makeWrapper ] ++ optionals (!stdenv.isDarwin) [ dconf.lib gtk3 ]; } - (if stdenv.isDarwin then ../make-qt-wrapper-darwin.sh else ../make-qt-wrapper.sh); - - qmake = makeSetupHook { deps = [ self.qtbase.dev ]; substitutions = { inherit (stdenv) isDarwin; }; diff --git a/pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix b/pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix index 28ea571adca..6f2ff593f1e 100644 --- a/pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix +++ b/pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix @@ -1,4 +1,4 @@ -{ stdenv, qtSubmodule, makeQtWrapper, copyPathsToStore, python2, qtbase, qtsvg, qtxmlpatterns }: +{ stdenv, qtSubmodule, copyPathsToStore, python2, qtbase, qtsvg, qtxmlpatterns }: with stdenv.lib; @@ -6,17 +6,9 @@ qtSubmodule { name = "qtdeclarative"; patches = copyPathsToStore (readPathsFromFile ./. ./series); qtInputs = [ qtbase qtsvg qtxmlpatterns ]; - nativeBuildInputs = [ python2 makeQtWrapper ]; + nativeBuildInputs = [ python2 ]; preConfigure = '' NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QML2_IMPORT_PREFIX=\"$qtQmlPrefix\"" ''; - - postInstall = '' - wrapQtProgram $out/bin/qmleasing - wrapQtProgram $out/bin/qmlscene - wrapQtProgram $out/bin/qmltestrunner - '' + optionalString (stdenv.isDarwin) '' - wrapQtProgram $out/bin/qml.app/Contents/MacOS/qml - ''; } diff --git a/pkgs/development/libraries/qt-5/5.8/qttools/default.nix b/pkgs/development/libraries/qt-5/5.8/qttools/default.nix index 6b97c2d85cd..6fa5390855d 100644 --- a/pkgs/development/libraries/qt-5/5.8/qttools/default.nix +++ b/pkgs/development/libraries/qt-5/5.8/qttools/default.nix @@ -1,28 +1,14 @@ -{ stdenv, qtSubmodule, makeQtWrapper, copyPathsToStore, qtbase }: +{ stdenv, qtSubmodule, copyPathsToStore, qtbase }: with stdenv.lib; qtSubmodule { name = "qttools"; qtInputs = [ qtbase ]; - nativeBuildInputs = [ makeQtWrapper ]; patches = copyPathsToStore (readPathsFromFile ./. ./series); postFixup = '' moveToOutput "bin/qdbus" "$out" moveToOutput "bin/qtpaths" "$out" ''; - - postInstall = '' - wrapQtProgram $out/bin/qcollectiongenerator - wrapQtProgram $out/bin/qhelpconverter - wrapQtProgram $out/bin/qhelpgenerator - wrapQtProgram $out/bin/qtdiag - '' + optionalString (stdenv.isDarwin) '' - wrapQtProgram $out/bin/Assistant.app/Contents/MacOS/Assistant - wrapQtProgram $out/bin/Designer.app/Contents/MacOS/Designer - wrapQtProgram $out/bin/Linguist.app/Contents/MacOS/Linguist - wrapQtProgram $out/bin/pixeltool.app/Contents/MacOS/pixeltool - wrapQtProgram $out/bin/qdbusviewer.app/Contents/MacOS/qdbusviewer - ''; } |