diff options
author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-11-09 19:20:57 -0600 |
---|---|---|
committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-11-12 09:51:47 -0600 |
commit | 4f7283193425cd8e8221243249cb1a13e0d63003 (patch) | |
tree | a17a5974136eb78548fab777ce5646e5192b26d8 /pkgs/development/libraries/qt-5 | |
parent | 9e05d61dd756956e1e7d07bd843bf8af7b1c57f5 (diff) | |
download | nixpkgs-4f7283193425cd8e8221243249cb1a13e0d63003.tar nixpkgs-4f7283193425cd8e8221243249cb1a13e0d63003.tar.gz nixpkgs-4f7283193425cd8e8221243249cb1a13e0d63003.tar.bz2 nixpkgs-4f7283193425cd8e8221243249cb1a13e0d63003.tar.lz nixpkgs-4f7283193425cd8e8221243249cb1a13e0d63003.tar.xz nixpkgs-4f7283193425cd8e8221243249cb1a13e0d63003.tar.zst nixpkgs-4f7283193425cd8e8221243249cb1a13e0d63003.zip |
qt56.qtbase: replace `type` with `command` for POSIX compatibility
Diffstat (limited to 'pkgs/development/libraries/qt-5')
-rw-r--r-- | pkgs/development/libraries/qt-5/5.6/qtbase.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase.patch b/pkgs/development/libraries/qt-5/5.6/qtbase.patch index 0e21a17665b..8381d597864 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtbase.patch +++ b/pkgs/development/libraries/qt-5/5.6/qtbase.patch @@ -377,7 +377,7 @@ index 4c68cfd72f..f422f18266 100644 check_examples { diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index 4a1d265a8b..abe0da95f6 100644 +index 4a1d265a8b..d346424b5b 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -70,7 +70,7 @@ defineTest(qtHaveModule) { @@ -385,7 +385,7 @@ index 4a1d265a8b..abe0da95f6 100644 cmd = $$eval(QT_TOOL.$${2}.binary) isEmpty(cmd) { - cmd = $$[QT_HOST_BINS]/$$2 -+ cmd = $$system("type -p $$2") ++ cmd = $$system("command -v $$2") exists($${cmd}.pl) { cmd = perl -w $$system_path($${cmd}.pl) } else: contains(QMAKE_HOST.os, Windows) { |