From 9b1ba6515aabd763d2a15d57fa071064edbfde93 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Fri, 8 Dec 2017 01:25:29 +0100 Subject: [PATCH] qsampler: svn-2342 -> 0.4.3 --- pkgs/applications/audio/qsampler/default.nix | 19 +++++++++---------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/applications/audio/qsampler/default.nix index b47e3a72f4eb..1eb8d8decff1 100644 --- a/pkgs/applications/audio/qsampler/default.nix +++ b/pkgs/applications/audio/qsampler/default.nix @@ -1,18 +1,17 @@ -{ stdenv, fetchsvn, autoconf, automake, liblscp, libtool, pkgconfig -, qt4 }: +{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, qttools +, liblscp, libgig, qtbase }: stdenv.mkDerivation rec { - name = "qsampler-svn-${version}"; - version = "2342"; + name = "qsampler-${version}"; + version = "0.4.3"; - src = fetchsvn { - url = "https://svn.linuxsampler.org/svn/qsampler/trunk"; - rev = "${version}"; - sha256 = "17w3vgpgfmvl11wsd5ndk9zdggl3gbzv3wbd45dyf2al4i0miqnx"; + src = fetchurl { + url = "mirror://sourceforge/qsampler/${name}.tar.gz"; + sha256 = "1wg19022gyzy8rk9npfav9kz9z2qicqwwb2x5jz5hshzf3npx1fi"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake liblscp libtool qt4 ]; + nativeBuildInputs = [ autoconf automake libtool pkgconfig qttools ]; + buildInputs = [ liblscp libgig qtbase ]; preConfigure = "make -f Makefile.svn"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc92b9a8b53d..e2ac8f0081b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16389,7 +16389,7 @@ with pkgs; qrcode = callPackage ../tools/graphics/qrcode {}; - qsampler = callPackage ../applications/audio/qsampler { }; + qsampler = libsForQt5.callPackage ../applications/audio/qsampler { }; qscreenshot = callPackage ../applications/graphics/qscreenshot { qt = qt4;