From 3838f1d490d759f013072abe8bc1673b5c3c4907 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 31 May 2015 19:10:36 +0200 Subject: [PATCH] firestr: fix build (qt5.multimedia was missing) --- .../networking/p2p/firestr/default.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/networking/p2p/firestr/default.nix b/pkgs/applications/networking/p2p/firestr/default.nix index 65ec54cf0f7..e7be81def61 100644 --- a/pkgs/applications/networking/p2p/firestr/default.nix +++ b/pkgs/applications/networking/p2p/firestr/default.nix @@ -4,8 +4,6 @@ stdenv.mkDerivation { name = "firestr-0.8"; - buildInputs = [ cmake boost botan snappy libopus libuuid qt5.base libXScrnSaver openssl ]; - src = fetchFromGitHub { owner = "mempko"; repo = "firestr"; @@ -13,23 +11,25 @@ stdenv.mkDerivation { sha256 = "0s2kdi8rw3i3f8gbiy0ykyi6xj5n8p80m0d1i86mhh8jpagvbfzb"; }; + buildInputs = [ cmake boost botan snappy libopus libuuid qt5.base qt5.multimedia + libXScrnSaver openssl ]; + patches = ./return.patch; - postPatch = - '' + postPatch = '' substituteInPlace CMakeLists.txt \ --replace "set(Boost_USE_STATIC_LIBS on)" "" \ --replace "/usr/include/botan" "${botan}/include/botan" \ --replace "libopus.a" "libopus.so" \ --replace "libsnappy.a" "libsnappy.so" \ --replace "libbotan-1.10.a" "libbotan-1.10.so.0" - ''; + ''; - meta = with stdenv.lib; - { description = "Grass computing platform"; - homepage = http://firestr.com/; - license = licenses.gpl3; - maintainers = [ maintainers.emery ]; - platforms = platforms.linux; - }; + meta = with stdenv.lib; { + description = "Grass computing platform"; + homepage = http://firestr.com/; + license = licenses.gpl3; + maintainers = [ maintainers.emery ]; + platforms = platforms.linux; + }; }