antimony: move to qmakeHook

This reverts commit 9fa8fb1dec.
2016-04-16 23:01:16 +03:00 · 2016-04-16 23:01:16 +03:00 · 62e3430b13
parent de7d8e64cf
commit 62e3430b13
1 changed files with 4 additions and 6 deletions
--- a/pkgs/applications/graphics/antimony/default.nix
+++ b/pkgs/applications/graphics/antimony/default.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchgit, libpng, python3, boost, mesa, qtbase, ncurses }:
+{ stdenv, fetchgit, libpng, python3, boost, mesa, qtbase, qmakeHook, ncurses }:

 let
  gitRev    = "745eca3a2d2657c495d5509e9083c884e021d09c";
@ -31,16 +31,14 @@ in
      mesa qtbase ncurses
    ];

-    configurePhase = ''
-      runHook preConfigure
+    nativeBuildHooks = [ qmakeHook ];
+
+    preConfigure = ''
      export GITREV=${gitRev}
      export GITBRANCH=${gitBranch}
      export GITTAG=${gitTag}

      cd qt
-      export sourceRoot=$sourceRoot/qt
-      qmake antimony.pro PREFIX=$out
-      runHook postConfigure
    '';

    enableParallelBuilding = true;