summary refs log tree commit diff
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2019-10-13 13:28:45 +0200
committerVladimír Čunát <v@cunat.cz>2019-10-13 13:28:45 +0200
commit26ec15c267d8ddc193dbb05aa8f98928518176d9 (patch)
treed5fa4b6bde80d0c645f393436171d07af8b4f2be
parent5e9bf0f042ab72ded9f868847f6809b0fa16d5a6 (diff)
downloadnixpkgs-26ec15c267d8ddc193dbb05aa8f98928518176d9.tar
nixpkgs-26ec15c267d8ddc193dbb05aa8f98928518176d9.tar.gz
nixpkgs-26ec15c267d8ddc193dbb05aa8f98928518176d9.tar.bz2
nixpkgs-26ec15c267d8ddc193dbb05aa8f98928518176d9.tar.lz
nixpkgs-26ec15c267d8ddc193dbb05aa8f98928518176d9.tar.xz
nixpkgs-26ec15c267d8ddc193dbb05aa8f98928518176d9.tar.zst
nixpkgs-26ec15c267d8ddc193dbb05aa8f98928518176d9.zip
qt511.qmake: fix after 756b46a4
5.11 was forgotten by accident, apparently.
This fixes build of qt511.qtsvg, for example (and many reverse deps).
-rw-r--r--pkgs/development/libraries/qt-5/5.11/default.nix4
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 a2effccd77c..e22dc4dbae3 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;