From 210f6888023c1df8aff2d053a5e41f5e1effdfe7 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 2 Jun 2017 10:40:19 -0500 Subject: qt5: rename qmakeHook to qmake --- pkgs/development/libraries/qt-5/5.6/default.nix | 4 ++-- pkgs/development/libraries/qt-5/5.8/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/development/libraries/qt-5') diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix index 2dccdd065df9..beb80bbd1b1f 100644 --- a/pkgs/development/libraries/qt-5/5.6/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/default.nix @@ -57,7 +57,7 @@ let propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []); nativeBuildInputs = (args.nativeBuildInputs or []) - ++ [ perl self.qmakeHook ]; + ++ [ perl self.qmake ]; NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true; @@ -127,7 +127,7 @@ let { deps = [ makeWrapper ]; } (if stdenv.isDarwin then ../make-qt-wrapper-darwin.sh else ../make-qt-wrapper.sh); - qmakeHook = + qmake = makeSetupHook { deps = [ self.qtbase.dev ]; } (if stdenv.isDarwin then ../qmake-hook-darwin.sh else ../qmake-hook.sh); diff --git a/pkgs/development/libraries/qt-5/5.8/default.nix b/pkgs/development/libraries/qt-5/5.8/default.nix index 5a737441fa8e..129858f8ac9e 100644 --- a/pkgs/development/libraries/qt-5/5.8/default.nix +++ b/pkgs/development/libraries/qt-5/5.8/default.nix @@ -48,7 +48,7 @@ let propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []); nativeBuildInputs = (args.nativeBuildInputs or []) - ++ [ perl self.qmakeHook ]; + ++ [ perl self.qmake ]; NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true; @@ -114,7 +114,7 @@ let { deps = [ makeWrapper ] ++ optionals (!stdenv.isDarwin) [ dconf.lib gtk3 ]; } (if stdenv.isDarwin then ../make-qt-wrapper-darwin.sh else ../make-qt-wrapper.sh); - qmakeHook = + qmake = makeSetupHook { deps = [ self.qtbase.dev ]; } (if stdenv.isDarwin then ../qmake-hook-darwin.sh else ../qmake-hook.sh); -- cgit 1.4.1