diff options
author | 7c6f434c <7c6f434c@mail.ru> | 2023-08-08 22:09:47 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-08 22:09:47 +0000 |
commit | 90470003541507c3a419c84a9f22f5f78e1acbdc (patch) | |
tree | 7f1a860778926ebcb497c57e085c57aa3b4ed555 | |
parent | 27c92a78f34d72e43866155099af6d8be8a1ddd0 (diff) | |
parent | 533540bb99761c5339eb38e88cc233dd6a980e36 (diff) |
Merge pull request #247998 from matthiasbeyer/update-vacuum
vacuum: 1.3.0.20160104 -> unstable-2021-12-09
-rw-r--r-- | pkgs/applications/networking/instant-messengers/vacuum/default.nix | 50 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 30 insertions, 22 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 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6930b916ec8ce..538f4623d7ab7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14082,7 +14082,7 @@ with pkgs; v2ray-geoip = callPackage ../data/misc/v2ray-geoip { }; - vacuum = callPackage ../applications/networking/instant-messengers/vacuum { }; + vacuum = libsForQt5.callPackage ../applications/networking/instant-messengers/vacuum {}; validator-nu = callPackage ../tools/text/validator-nu { }; |