diff options
| author | Robin Gloster <mail@glob.in> | 2016-03-28 15:16:29 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-03-28 15:16:29 +0000 |
| commit | f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3 (patch) | |
| tree | 0f17999d3a5444f16f09e0c1d7f3075e0224e731 /pkgs/applications/networking/instant-messengers/vacuum | |
| parent | 3f45f0948d6fe158bed063adb66850ded0ba4861 (diff) | |
| parent | c61445357e2a92470bee43a71a10baef1a3196e4 (diff) | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/vacuum')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/vacuum/default.nix | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix index 12466379bf940..5148992779ace 100644 --- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix +++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix @@ -1,31 +1,32 @@ -{ stdenv, fetchurl, qt4, openssl, xproto, libX11 -, libXScrnSaver, scrnsaverproto, xz +{ stdenv, lib, fetchurl + , qt4, openssl + , xproto, libX11, libXScrnSaver, scrnsaverproto + , xz, zlib }: - stdenv.mkDerivation rec { - name="${baseName}-${version}"; - baseName = "vacuum-im"; + name = "vacuum-im-${version}"; version = "1.2.4"; src = fetchurl { - url="https://googledrive.com/host/0B7A5K_290X8-d1hjQmJaSGZmTTA/vacuum-1.2.4.tar.gz"; - sha256="10qxpfbbaagqcalhk0nagvi5irbbz5hk31w19lba8hxf6pfylrhf"; + url = "https://googledrive.com/host/0B7A5K_290X8-d1hjQmJaSGZmTTA/vacuum-${version}.tar.gz"; + sha256 = "10qxpfbbaagqcalhk0nagvi5irbbz5hk31w19lba8hxf6pfylrhf"; }; - configurePhase = "qmake INSTALL_PREFIX=$out -recursive vacuum.pro"; - - hardeningDisable = [ "format" ]; - buildInputs = [ - qt4 openssl xproto libX11 libXScrnSaver scrnsaverproto xz + qt4 openssl xproto libX11 libXScrnSaver scrnsaverproto xz zlib ]; + configurePhase = '' + qmake INSTALL_PREFIX=$out -recursive vacuum.pro + ''; + + hardeningDisable = [ "format" ]; + meta = with stdenv.lib; { description = "An XMPP client fully composed of plugins"; - maintainers = with maintainers; [ raskin ]; - platforms = with platforms; linux; - license = with licenses; gpl3; + maintainers = [ maintainers.raskin ]; + platforms = platforms.linux; + license = licenses.gpl3; homepage = "http://code.google.com/p/vacuum-im/"; }; } - |