diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-16 22:59:18 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-20 18:55:50 +0300 |
| commit | 6554997eaa1756456f2bfa4952f371e5288e74c3 (patch) | |
| tree | 78818c99a71e35f572b03db0f5530e408515cfd1 /pkgs | |
| parent | 577ea10f6865f592429c40cdf0cfd9c3a9287eb3 (diff) | |
| download | nixpkgs-6554997eaa1756456f2bfa4952f371e5288e74c3.tar nixpkgs-6554997eaa1756456f2bfa4952f371e5288e74c3.tar.gz nixpkgs-6554997eaa1756456f2bfa4952f371e5288e74c3.tar.bz2 nixpkgs-6554997eaa1756456f2bfa4952f371e5288e74c3.tar.lz nixpkgs-6554997eaa1756456f2bfa4952f371e5288e74c3.tar.xz nixpkgs-6554997eaa1756456f2bfa4952f371e5288e74c3.tar.zst nixpkgs-6554997eaa1756456f2bfa4952f371e5288e74c3.zip | |
zeal: move to qmakeHook
This reverts commit 9cfc8d94bb22000d1b648066c3d8b580f27d1271.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/data/documentation/zeal/default.nix | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index dd681404e85..89e5d83df61 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, libarchive, pkgconfig, qtbase -, qtimageformats, qtwebkit, qtx11extras, xorg }: +, qtimageformats, qtwebkit, qtx11extras, xcbutilkeysyms, qmakeHook }: stdenv.mkDerivation rec { version = "0.2.1"; @@ -13,18 +13,12 @@ stdenv.mkDerivation rec { }; buildInputs = [ - xorg.xcbutilkeysyms pkgconfig qtbase qtimageformats qtwebkit qtx11extras libarchive + xcbutilkeysyms pkgconfig qtbase qtimageformats qtwebkit qtx11extras libarchive qmakeHook ]; - configurePhase = '' - runHook preConfigure - qmake PREFIX=/ - runHook postConfigure - ''; + qmakeFlags = [ "PREFIX=/" ]; - installPhase = '' - make INSTALL_ROOT=$out install - ''; + installFlags = [ "INSTALL_ROOT=$(out)" ]; enableParallelBuilding = true; |