diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2015-09-27 10:28:24 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-09-27 15:09:47 -0500 |
| commit | 5ecc06293a56583001e33b5dd7340192fcdefc72 (patch) | |
| tree | 9f4c5d00261ebe03658cc77d5e66c2b695ee59c7 /pkgs | |
| parent | 51496d6c6d278427f79a40e0760b9b2918d5b32a (diff) | |
mudlet: build with Qt 5.5
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/games/mudlet/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/games/mudlet/default.nix b/pkgs/games/mudlet/default.nix index 6fa0b8144d43a..8b51d6174039a 100644 --- a/pkgs/games/mudlet/default.nix +++ b/pkgs/games/mudlet/default.nix @@ -1,4 +1,5 @@ -{ fetchurl, pkgs, stdenv, makeWrapper, qt5, yajl, libzip, hunspell, boost, lua5_1, luafilesystem, luazip, lrexlib, luasqlite3 }: +{ fetchurl, pkgs, stdenv, makeWrapper, qtbase, yajl, libzip, hunspell +, boost, lua5_1, luafilesystem, luazip, lrexlib, luasqlite3 }: stdenv.mkDerivation rec { name = "mudlet-${version}"; @@ -9,7 +10,10 @@ stdenv.mkDerivation rec { sha256 = "08fhqd323kgz5s17ac5z9dhkjxcmwvcmvhzy0x1vw4rayhijfrd7"; }; - buildInputs = [ pkgs.unzip qt5.base lua5_1 hunspell libzip yajl boost makeWrapper luafilesystem luazip lrexlib luasqlite3 ]; + buildInputs = [ + pkgs.unzip qtbase lua5_1 hunspell libzip yajl boost makeWrapper + luafilesystem luazip lrexlib luasqlite3 + ]; configurePhase = "cd src && qmake"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index df84c2fcd0f51..bf5c63b1fe27f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12136,7 +12136,7 @@ let mrxvt = callPackage ../applications/misc/mrxvt { }; - mudlet = callPackage ../games/mudlet { + mudlet = qt5Libs.callPackage ../games/mudlet { inherit (lua51Packages) luafilesystem lrexlib luazip luasqlite3; }; |