diff options
author | ajs124 <git@ajs124.de> | 2022-05-26 03:43:43 +0200 |
---|---|---|
committer | Matthias Beyer <mail@beyermatthias.de> | 2023-08-08 21:25:39 +0200 |
commit | 533540bb99761c5339eb38e88cc233dd6a980e36 (patch) | |
tree | cd9f131d52c7ec333c1ef624b9ba41fdad8dfee3 /pkgs/applications/networking/instant-messengers/vacuum | |
parent | de24b1e3b1d97805d76f8c7ca7b3fb2d864bfe9e (diff) |
vacuum: 1.3.0.20160104 -> unstable-2021-12-09
qt4 -> qt5 (cherry picked from commit 2c2ebf360333dedcdc1400c5f024425cf7fc5947) Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/vacuum')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/vacuum/default.nix | 50 |
1 files changed, 29 insertions, 21 deletions
diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix index 0fc7e8b6d8ee2..f735907e46b82 100644 --- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix +++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix @@ -1,36 +1,44 @@ -{ lib, stdenv, fetchFromGitHub - , qt4, qmake4Hook, openssl - , xorgproto, libX11, libXScrnSaver - , xz, zlib +{ stdenv, lib, fetchFromGitHub +, qtbase +, qttools +, qtx11extras +, qtmultimedia +, qtwebkit +, wrapQtAppsHook +, cmake +, openssl +, xorgproto, libX11, libXScrnSaver +, xz, zlib }: stdenv.mkDerivation { pname = "vacuum-im"; - version = "1.3.0.20160104"; + version = "unstable-2021-12-09"; src = fetchFromGitHub { owner = "Vacuum-IM"; repo = "vacuum-im"; - rev = "1.3.0.20160104-Alpha"; - sha256 = "1jcw9c7s75y4c3m4skfc3cc0i519z39b23n997vj5mwcjplxyc76"; + rev = "0abd5e11dd3e2538b8c47f5a06febedf73ae99ee"; + sha256 = "0l9pln07zz874m1r6wnpc9vcdbpgvjdsy49cjjilc6s4p4b2c812"; }; + nativeBuildInputs = [ + wrapQtAppsHook + cmake + ]; buildInputs = [ - qt4 openssl xorgproto libX11 libXScrnSaver xz zlib + qtbase + qttools + qtx11extras + qtmultimedia + qtwebkit + openssl + xorgproto + libX11 + libXScrnSaver + xz + zlib ]; - # hack: needed to fix build issues in - # https://hydra.nixos.org/build/38322959/nixlog/1 - # should be an upstream issue but it's easy to fix - NIX_LDFLAGS = "-lz"; - - nativeBuildInputs = [ qmake4Hook ]; - - preConfigure = '' - qmakeFlags="$qmakeFlags INSTALL_PREFIX=$out" - ''; - - hardeningDisable = [ "format" ]; - meta = with lib; { description = "An XMPP client fully composed of plugins"; maintainers = [ maintainers.raskin ]; |