diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-10-16 11:17:12 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-10-16 11:17:12 +0200 |
| commit | 12441bdf9f09a4d355f927f9b2957a90d5c98822 (patch) | |
| tree | 9a57120c6f99ed0e7abc62e5ced7db816df79a6b /pkgs/development/libraries/qt-5 | |
| parent | 41abe12bb38266e421e61a1332953a6a0409ea5f (diff) | |
| parent | 22bbaf09fedc7ca9addc59c9b1738fc0b83fe2fd (diff) | |
| download | nixlib-12441bdf9f09a4d355f927f9b2957a90d5c98822.tar nixlib-12441bdf9f09a4d355f927f9b2957a90d5c98822.tar.gz nixlib-12441bdf9f09a4d355f927f9b2957a90d5c98822.tar.bz2 nixlib-12441bdf9f09a4d355f927f9b2957a90d5c98822.tar.lz nixlib-12441bdf9f09a4d355f927f9b2957a90d5c98822.tar.xz nixlib-12441bdf9f09a4d355f927f9b2957a90d5c98822.tar.zst nixlib-12441bdf9f09a4d355f927f9b2957a90d5c98822.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/libraries/qt-5')
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.11/default.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/development/libraries/qt-5/5.11/default.nix b/pkgs/development/libraries/qt-5/5.11/default.nix index a2effccd77c7..e22dc4dbae30 100644 --- a/pkgs/development/libraries/qt-5/5.11/default.nix +++ b/pkgs/development/libraries/qt-5/5.11/default.nix @@ -159,9 +159,7 @@ let qmake = makeSetupHook { deps = [ self.qtbase.dev ]; substitutions = { - inherit (stdenv) isDarwin; - qtbase_dev = self.qtbase.dev; - fix_qt_builtin_paths = ../hooks/fix-qt-builtin-paths.sh; + fix_qmake_libtool = ../hooks/fix-qmake-libtool.sh; }; } ../hooks/qmake-hook.sh; |