diff options
author | Robin Gloster <mail@glob.in> | 2016-08-12 09:46:53 +0000 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2016-08-12 09:46:53 +0000 |
commit | b7787d932ec9cbd82ea6bc7c69d8df159b606fdc (patch) | |
tree | c4b6af2e6b49732ce5c6982cb8512ce9b7f1f34d /pkgs/applications/networking/instant-messengers/vacuum | |
parent | bc025e83bd6c44df38851ef23da53359a0e62841 (diff) | |
parent | 532b2222965377e77ed884c463ee2751fb51dba3 (diff) | |
download | nixpkgs-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar nixpkgs-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar.gz nixpkgs-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar.bz2 nixpkgs-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar.lz nixpkgs-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar.xz nixpkgs-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar.zst nixpkgs-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.zip |
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 | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix index af2166aafe2..e8c1f50164d 100644 --- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix +++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix @@ -16,6 +16,11 @@ stdenv.mkDerivation rec { qt4 openssl xproto libX11 libXScrnSaver scrnsaverproto xz zlib ]; + # hack: needed to fix build issues in + # http://hydra.nixos.org/build/38322959/nixlog/1 + # should be an upstream issue but it's easy to fix + NIX_LDFLAGS = "-lz"; + nativeBuildInputs = [ qmake4Hook ]; preConfigure = '' |