diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-06-02 10:40:19 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-06-18 08:41:57 -0500 |
| commit | 210f6888023c1df8aff2d053a5e41f5e1effdfe7 (patch) | |
| tree | 376b0af02afa925c84a968cfcc74d296b6a09f6e /pkgs/applications/office | |
| parent | 3f3d33a07867116446ec9b5e2675ef1c8de8127d (diff) | |
qt5: rename qmakeHook to qmake
Diffstat (limited to 'pkgs/applications/office')
| -rw-r--r-- | pkgs/applications/office/cb2bib/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/office/mytetra/default.nix | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/applications/office/cb2bib/default.nix b/pkgs/applications/office/cb2bib/default.nix index abff61b881fc1..1004733a18b52 100644 --- a/pkgs/applications/office/cb2bib/default.nix +++ b/pkgs/applications/office/cb2bib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qmakeHook, qtbase, qtwebkit, qtx11extras, lzo, libX11 }: +{ stdenv, fetchurl, qmake, qtbase, qtwebkit, qtx11extras, lzo, libX11 }: stdenv.mkDerivation rec { name = pname + "-" + version; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0yz79v023w1229wzck3gij0iqah1xg8rg4a352q8idvg7bdmyfin"; }; buildInputs = [ qtbase qtwebkit qtx11extras lzo libX11 ]; - nativeBuildInputs = [ qmakeHook ]; + nativeBuildInputs = [ qmake ]; configurePhase = '' runHook preConfigure diff --git a/pkgs/applications/office/mytetra/default.nix b/pkgs/applications/office/mytetra/default.nix index b35e60cf2d617..be70cb89d6f38 100644 --- a/pkgs/applications/office/mytetra/default.nix +++ b/pkgs/applications/office/mytetra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qmakeHook, makeQtWrapper, qtsvg }: +{ stdenv, fetchurl, qmake, makeQtWrapper, qtsvg }: let version = "1.42.2"; @@ -9,7 +9,8 @@ in stdenv.mkDerivation rec { sha256 = "1ah44nf4ksxkh01a2zmgvvby4pwczhyq5vcp270rf6visp8v9804"; }; - buildInputs = [ qmakeHook makeQtWrapper qtsvg ]; + nativeBuildInputs = [ makeQtWrapper qmake ]; + buildInputs = [ qtsvg ]; hardeningDisable = [ "format" ]; |