diff options
author | Graham Christensen <graham@grahamc.com> | 2016-03-23 09:17:22 -0500 |
---|---|---|
committer | Graham Christensen <graham@grahamc.com> | 2016-03-23 09:24:55 -0500 |
commit | aba56e7f595c10d62f7b280f18699f0ba2828876 (patch) | |
tree | f6dfe642157059e0264c8c2b76324e34e333a506 /pkgs | |
parent | 6648ef5d25aecb404fd70ec2036473271d9f8b32 (diff) |
vacuum: port to mkDerivation, add zlib for hydra failure
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/vacuum/default.nix | 66 |
1 files changed, 20 insertions, 46 deletions
diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix index 205c21adab427..d7798273e7c69 100644 --- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix +++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix @@ -1,56 +1,30 @@ -x@{builderDefsPackage +{ stdenv, lib, fetchurl , qt4, openssl , xproto, libX11, libXScrnSaver, scrnsaverproto - , xz - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; + , xz, zlib +}: +stdenv.mkDerivation rec { + name = "vacuum-im-${version}"; + version = "1.2.4"; - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - version="1.2.4"; - baseName="vacuum-im"; - name="${baseName}-${version}"; - url="https://googledrive.com/host/0B7A5K_290X8-d1hjQmJaSGZmTTA/vacuum-1.2.4.tar.gz"; - sha256="10qxpfbbaagqcalhk0nagvi5irbbz5hk31w19lba8hxf6pfylrhf"; + src = fetchurl { + url = "https://googledrive.com/host/0B7A5K_290X8-d1hjQmJaSGZmTTA/vacuum-${version}.tar.gz"; + sha256 = "10qxpfbbaagqcalhk0nagvi5irbbz5hk31w19lba8hxf6pfylrhf"; }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.sha256; - }; - - inherit (sourceInfo) name version; - inherit buildInputs; - /* doConfigure should be removed if not needed */ - phaseNames = ["addInputs" "doQMake" "doMakeInstall"]; + buildInputs = [ + qt4 openssl xproto libX11 libXScrnSaver scrnsaverproto xz zlib + ]; - doQMake = a.fullDepEntry ('' + configurePhase = '' qmake INSTALL_PREFIX=$out -recursive vacuum.pro - '') ["doUnpack" "addInputs"]; - - meta = { + ''; + + meta = with stdenv.lib; { description = "An XMPP client fully composed of plugins"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - license = with a.lib.licenses; - gpl3; + maintainers = [ maintainers.raskin ]; + platforms = platforms.linux; + license = licenses.gpl3; homepage = "http://code.google.com/p/vacuum-im/"; }; - passthru = { - updateInfo = { - downloadPage = "http://code.google.com/p/vacuum-im/downloads/list?can=2&q=&colspec=Filename"; - }; - }; -}) x - +} |