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/graphics | |
| parent | 3f3d33a07867116446ec9b5e2675ef1c8de8127d (diff) | |
| download | nixlib-210f6888023c1df8aff2d053a5e41f5e1effdfe7.tar nixlib-210f6888023c1df8aff2d053a5e41f5e1effdfe7.tar.gz nixlib-210f6888023c1df8aff2d053a5e41f5e1effdfe7.tar.bz2 nixlib-210f6888023c1df8aff2d053a5e41f5e1effdfe7.tar.lz nixlib-210f6888023c1df8aff2d053a5e41f5e1effdfe7.tar.xz nixlib-210f6888023c1df8aff2d053a5e41f5e1effdfe7.tar.zst nixlib-210f6888023c1df8aff2d053a5e41f5e1effdfe7.zip | |
qt5: rename qmakeHook to qmake
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/awesomebump/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/applications/graphics/phototonic/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/graphics/rapcad/default.nix | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/pkgs/applications/graphics/awesomebump/default.nix index b89e18ed148c..9e0916bab9cf 100644 --- a/pkgs/applications/graphics/awesomebump/default.nix +++ b/pkgs/applications/graphics/awesomebump/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, qtbase, qmakeHook, makeWrapper }: +{ lib, stdenv, fetchurl, qtbase, qmake, makeWrapper }: stdenv.mkDerivation { name = "awesomebump-4.0"; @@ -10,7 +10,8 @@ stdenv.mkDerivation { setSourceRoot = "sourceRoot=$(echo */Sources)"; - buildInputs = [ qtbase qmakeHook makeWrapper ]; + nativeBuildInputs = [ makeWrapper qmake ]; + buildInputs = [ qtbase ]; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/phototonic/default.nix b/pkgs/applications/graphics/phototonic/default.nix index 4782376d1e0b..8ce9d407aade 100644 --- a/pkgs/applications/graphics/phototonic/default.nix +++ b/pkgs/applications/graphics/phototonic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qtbase, qmakeHook, exiv2 }: +{ stdenv, fetchFromGitHub, qtbase, qmake, exiv2 }: stdenv.mkDerivation rec { name = "phototonic-${version}"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ qtbase exiv2 ]; - nativeBuildInputs = [ qmakeHook ]; + nativeBuildInputs = [ qmake ]; preConfigure = '' sed -i 's;/usr;$$PREFIX/;g' phototonic.pro diff --git a/pkgs/applications/graphics/rapcad/default.nix b/pkgs/applications/graphics/rapcad/default.nix index b7672a39d0df..451eaae79b2e 100644 --- a/pkgs/applications/graphics/rapcad/default.nix +++ b/pkgs/applications/graphics/rapcad/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchurl, cgal, boost, gmp, mpfr, flex, bison, dxflib, readline -, qtbase, qmakeHook, mesa_glu +, qtbase, qmake, mesa_glu }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ qmakeHook ]; + nativeBuildInputs = [ qmake ]; buildInputs = [ qtbase cgal boost gmp mpfr flex bison dxflib readline mesa_glu ]; meta = with stdenv.lib; { |