vacuum: 1.3.0.20160104 -> unstable-2021-12-09
qt4 -> qt5 (cherry picked from commit 2c2ebf360333dedcdc1400c5f024425cf7fc5947) Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
This commit is contained in:
parent
de24b1e3b1
commit
533540bb99
2 changed files with 31 additions and 23 deletions
|
@ -1,35 +1,43 @@
|
||||||
{ lib, stdenv, fetchFromGitHub
|
{ stdenv, lib, fetchFromGitHub
|
||||||
, qt4, qmake4Hook, openssl
|
, qtbase
|
||||||
|
, qttools
|
||||||
|
, qtx11extras
|
||||||
|
, qtmultimedia
|
||||||
|
, qtwebkit
|
||||||
|
, wrapQtAppsHook
|
||||||
|
, cmake
|
||||||
|
, openssl
|
||||||
, xorgproto, libX11, libXScrnSaver
|
, xorgproto, libX11, libXScrnSaver
|
||||||
, xz, zlib
|
, xz, zlib
|
||||||
}:
|
}:
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
pname = "vacuum-im";
|
pname = "vacuum-im";
|
||||||
version = "1.3.0.20160104";
|
version = "unstable-2021-12-09";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Vacuum-IM";
|
owner = "Vacuum-IM";
|
||||||
repo = "vacuum-im";
|
repo = "vacuum-im";
|
||||||
rev = "1.3.0.20160104-Alpha";
|
rev = "0abd5e11dd3e2538b8c47f5a06febedf73ae99ee";
|
||||||
sha256 = "1jcw9c7s75y4c3m4skfc3cc0i519z39b23n997vj5mwcjplxyc76";
|
sha256 = "0l9pln07zz874m1r6wnpc9vcdbpgvjdsy49cjjilc6s4p4b2c812";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
nativeBuildInputs = [
|
||||||
qt4 openssl xorgproto libX11 libXScrnSaver xz zlib
|
wrapQtAppsHook
|
||||||
|
cmake
|
||||||
|
];
|
||||||
|
buildInputs = [
|
||||||
|
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; {
|
meta = with lib; {
|
||||||
description = "An XMPP client fully composed of plugins";
|
description = "An XMPP client fully composed of plugins";
|
||||||
|
|
|
@ -14072,7 +14072,7 @@ with pkgs;
|
||||||
|
|
||||||
v2ray-geoip = callPackage ../data/misc/v2ray-geoip { };
|
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 { };
|
validator-nu = callPackage ../tools/text/validator-nu { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue