Merge remote-tracking branch 'upstream/master' into HEAD

This commit is contained in:
Frederik Rietdijk
2016-10-26 13:06:43 +02:00
177 changed files with 4107 additions and 1641 deletions

View File

@@ -1,19 +1,20 @@
{ stdenv, fetchurl, cmake, alsaLib, udev, qt4 }:
{ stdenv, fetchurl, cmake, alsaLib, udev, qtbase,
qtsvg, qttools, makeQtWrapper }:
let
version = "0.18.1";
version = "0.21.0";
in
stdenv.mkDerivation {
name = "qastools-${version}";
src = fetchurl {
url = "mirror://sourceforge/qastools/qastools_${version}.tar.bz2";
sha256 = "1sac6a0j1881wgpv4491b2f4jnhqkab6xyldmcg1wfqb5qkdgzvg";
url = "mirror://sourceforge/project/qastools/${version}/qastools_${version}.tar.bz2";
sha256 = "1zl9cn5h43n63yp3z1an87xvw554k9hlcz75ddb30lvpcczkmwrh";
};
buildInputs = [
cmake alsaLib udev qt4
cmake alsaLib udev qtbase qtsvg qttools makeQtWrapper
];
cmakeFlags = [