firestr: Qt 5 infrastructure update

This commit is contained in:
Thomas Tuegel 2015-12-19 20:47:06 -06:00
parent de5898a495
commit fc13f37f2c
2 changed files with 4 additions and 4 deletions

View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, boost, botan, snappy, libopus, libuuid, qt5 { stdenv, fetchFromGitHub, cmake, boost, botan, snappy, libopus, libuuid
, libXScrnSaver, openssl }: , libXScrnSaver, openssl, qtbase, qtmultimedia }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "firestr-0.8"; name = "firestr-0.8";
@ -11,7 +11,7 @@ stdenv.mkDerivation {
sha256 = "0s2kdi8rw3i3f8gbiy0ykyi6xj5n8p80m0d1i86mhh8jpagvbfzb"; sha256 = "0s2kdi8rw3i3f8gbiy0ykyi6xj5n8p80m0d1i86mhh8jpagvbfzb";
}; };
buildInputs = [ cmake boost botan snappy libopus libuuid qt5.base qt5.multimedia buildInputs = [ cmake boost botan snappy libopus libuuid qtbase qtmultimedia
libXScrnSaver openssl ]; libXScrnSaver openssl ];
patches = ./return.patch; patches = ./return.patch;

View File

@ -11795,7 +11795,7 @@ let
inherit (pkgs.gnome) libgnome libgnomeui; inherit (pkgs.gnome) libgnome libgnomeui;
}; };
firestr = callPackage ../applications/networking/p2p/firestr firestr = qt5.callPackage ../applications/networking/p2p/firestr
{ boost = boost155; { boost = boost155;
}; };