diff options
| author | Thomas Tuegel <ttuegel@secure.mailbox.org> | 2017-03-25 08:50:00 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-25 08:50:00 -0500 |
| commit | a9172891d964c03a9d833cf0c5cf861ebaad9d35 (patch) | |
| tree | 2aa06103baf0c196c20ccc27576a0fbe04d91478 /pkgs/development/libraries/qt-5/5.8/default.nix | |
| parent | 6b8ad8b581576d45996a17822e80e6be281dffd9 (diff) | |
| parent | b97dd5f560cee49ede14c9b7129b6e1bca3a3707 (diff) | |
| download | nixlib-a9172891d964c03a9d833cf0c5cf861ebaad9d35.tar nixlib-a9172891d964c03a9d833cf0c5cf861ebaad9d35.tar.gz nixlib-a9172891d964c03a9d833cf0c5cf861ebaad9d35.tar.bz2 nixlib-a9172891d964c03a9d833cf0c5cf861ebaad9d35.tar.lz nixlib-a9172891d964c03a9d833cf0c5cf861ebaad9d35.tar.xz nixlib-a9172891d964c03a9d833cf0c5cf861ebaad9d35.tar.zst nixlib-a9172891d964c03a9d833cf0c5cf861ebaad9d35.zip | |
Merge pull request #24139 from periklis/topic_qt58_darwin_compatibility
qt58: enable darwin compatibility
Diffstat (limited to 'pkgs/development/libraries/qt-5/5.8/default.nix')
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.8/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/qt-5/5.8/default.nix b/pkgs/development/libraries/qt-5/5.8/default.nix index f02b80706380..eb26f88f7258 100644 --- a/pkgs/development/libraries/qt-5/5.8/default.nix +++ b/pkgs/development/libraries/qt-5/5.8/default.nix @@ -106,13 +106,13 @@ let makeQtWrapper = makeSetupHook - { deps = [ makeWrapper dconf.lib gtk3 ]; } - ../make-qt-wrapper.sh; + { deps = [ makeWrapper ] ++ optionals (!stdenv.isDarwin) [ dconf.lib gtk3 ]; } + (if stdenv.isDarwin then ../make-qt-wrapper-darwin.sh else ../make-qt-wrapper.sh); qmakeHook = makeSetupHook { deps = [ self.qtbase.dev ]; } - ../qmake-hook.sh; + (if stdenv.isDarwin then ../qmake-hook-darwin.sh else ../qmake-hook.sh); }; |