diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-16 23:01:16 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-20 18:55:40 +0300 |
| commit | 62e3430b132397c57b154db3f4c871212a0d813d (patch) | |
| tree | e8d456a3b041180883515bac8ae0f8c4570628c1 /pkgs/applications/graphics/antimony | |
| parent | de7d8e64cf1895fa3153608295400e3b70a64b5e (diff) | |
| download | nixlib-62e3430b132397c57b154db3f4c871212a0d813d.tar nixlib-62e3430b132397c57b154db3f4c871212a0d813d.tar.gz nixlib-62e3430b132397c57b154db3f4c871212a0d813d.tar.bz2 nixlib-62e3430b132397c57b154db3f4c871212a0d813d.tar.lz nixlib-62e3430b132397c57b154db3f4c871212a0d813d.tar.xz nixlib-62e3430b132397c57b154db3f4c871212a0d813d.tar.zst nixlib-62e3430b132397c57b154db3f4c871212a0d813d.zip | |
antimony: move to qmakeHook
This reverts commit 9fa8fb1dec426ad79ff67e01f20d831c322d8525.
Diffstat (limited to 'pkgs/applications/graphics/antimony')
| -rw-r--r-- | pkgs/applications/graphics/antimony/default.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix index fa9a7e0fdd3f..50b33096e3d2 100644 --- 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; |