From 94f44a689552a4d9fb0a2bd046b939460d7bb01b Mon Sep 17 00:00:00 2001 From: freezeboy Date: Thu, 5 Nov 2020 17:47:20 +0100 Subject: [PATCH] samplv1: 0.9.13 -> 0.9.18, migrate to Qt5.15 Rewrite without stdenv --- pkgs/applications/audio/samplv1/default.nix | 17 ++++++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index 86f8f666d80..17b3f1c3745 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/applications/audio/samplv1/default.nix @@ -1,19 +1,22 @@ -{ stdenv, fetchurl, pkgconfig, libjack2, alsaLib, liblo, libsndfile, lv2, qt5 }: +{ mkDerivation, lib, fetchurl, pkgconfig, libjack2 +, alsaLib, liblo, libsndfile, lv2, qtbase, qttools +, rubberband +}: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "samplv1"; - version = "0.9.13"; + version = "0.9.18"; src = fetchurl { url = "mirror://sourceforge/samplv1/${pname}-${version}.tar.gz"; - sha256 = "0clsp6s5qfnh0xaxbd35vq2ppi72q9dfayrzlgl73800a8p7gh9m"; + sha256 = "ePhM9OTLJp1Wa2D9Y1Dqq/69WlEhEp3ih9yNUIJU5Y4="; }; - buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools]; + nativeBuildInputs = [ qttools pkgconfig ]; - nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qtbase rubberband ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An old-school all-digital polyphonic sampler synthesizer with stereo fx"; homepage = "http://samplv1.sourceforge.net/"; license = licenses.gpl2Plus; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aa3845c639f..8f9f8d719bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25690,7 +25690,7 @@ in inherit (darwin.apple_sdk.frameworks) Cocoa; }; - samplv1 = callPackage ../applications/audio/samplv1 { qt5 = qt514; }; + samplv1 = libsForQt5.callPackage ../applications/audio/samplv1 { }; sauerbraten = callPackage ../games/sauerbraten {};