diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-22 16:49:09 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-22 16:49:09 +0200 |
| commit | e9379f7416d04b6b7ff475816b0aa395c1e3f7f9 (patch) | |
| tree | a7da61f3fa5ed53454e210a59094a162711fcc3f /pkgs/games | |
| parent | 253b84a1eb2609ea7d71a236040515dc7c131b1b (diff) | |
| parent | 685c34555ccd3d0eb07501783b7ca9d67e03aa18 (diff) | |
| download | nixlib-e9379f7416d04b6b7ff475816b0aa395c1e3f7f9.tar nixlib-e9379f7416d04b6b7ff475816b0aa395c1e3f7f9.tar.gz nixlib-e9379f7416d04b6b7ff475816b0aa395c1e3f7f9.tar.bz2 nixlib-e9379f7416d04b6b7ff475816b0aa395c1e3f7f9.tar.lz nixlib-e9379f7416d04b6b7ff475816b0aa395c1e3f7f9.tar.xz nixlib-e9379f7416d04b6b7ff475816b0aa395c1e3f7f9.tar.zst nixlib-e9379f7416d04b6b7ff475816b0aa395c1e3f7f9.zip | |
Merge branch 'staging'
This includes a fix to closure-size regression that moved share/doc/*/ to share/doc/
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/chessx/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/games/mudlet/default.nix | 10 |
2 files changed, 7 insertions, 9 deletions
diff --git a/pkgs/games/chessx/default.nix b/pkgs/games/chessx/default.nix index 39ec3670e54e..63a1adb7155a 100644 --- a/pkgs/games/chessx/default.nix +++ b/pkgs/games/chessx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgconfig, zlib, qtbase, qtsvg, qttools, qtmultimedia, fetchurl }: +{ stdenv, pkgconfig, zlib, qtbase, qtsvg, qttools, qtmultimedia, qmakeHook, fetchurl }: stdenv.mkDerivation rec { name = "chessx-${version}"; version = "1.3.2"; @@ -6,9 +6,6 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/chessx/chessx-${version}.tgz"; sha256 = "b136cf56d37d34867cdb9538176e1703b14f61b3384885b6f100580d0af0a3ff"; }; - preConfigure = '' - qmake -spec linux-g++ chessx.pro - ''; buildInputs = [ stdenv pkgconfig @@ -17,6 +14,7 @@ stdenv.mkDerivation rec { qttools qtmultimedia zlib + qmakeHook ]; enableParallelBuilding = true; diff --git a/pkgs/games/mudlet/default.nix b/pkgs/games/mudlet/default.nix index 8b51d6174039..d684cc22c38f 100644 --- a/pkgs/games/mudlet/default.nix +++ b/pkgs/games/mudlet/default.nix @@ -1,5 +1,5 @@ -{ fetchurl, pkgs, stdenv, makeWrapper, qtbase, yajl, libzip, hunspell -, boost, lua5_1, luafilesystem, luazip, lrexlib, luasqlite3 }: +{ fetchurl, unzip, stdenv, makeWrapper, qtbase, yajl, libzip, hunspell +, boost, lua5_1, luafilesystem, luazip, lrexlib, luasqlite3, qmakeHook }: stdenv.mkDerivation rec { name = "mudlet-${version}"; @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { }; buildInputs = [ - pkgs.unzip qtbase lua5_1 hunspell libzip yajl boost makeWrapper - luafilesystem luazip lrexlib luasqlite3 + unzip qtbase lua5_1 hunspell libzip yajl boost makeWrapper + luafilesystem luazip lrexlib luasqlite3 qmakeHook ]; - configurePhase = "cd src && qmake"; + preConfigure = "cd src"; installPhase = let luaZipPath = "${luazip}/lib/lua/5.1/?.so"; |