From 977ce750b829151788ad5ee38f3bf8c7c8ede2a4 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 9 Jan 2020 19:49:38 -0600
Subject: [PATCH] qmidinet: fix by using qt's mkDerivation
---
pkgs/applications/audio/qmidinet/default.nix | 10 +++++-----
pkgs/top-level/all-packages.nix | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/pkgs/applications/audio/qmidinet/default.nix b/pkgs/applications/audio/qmidinet/default.nix
index 98e384561e4e..2b79818543f8 100644
--- a/pkgs/applications/audio/qmidinet/default.nix
+++ b/pkgs/applications/audio/qmidinet/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, qt5, alsaLib, libjack2 }:
+{ mkDerivation, lib, fetchurl, pkgconfig, qtbase, qttools, alsaLib, libjack2 }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
version = "0.6.1";
pname = "qmidinet";
@@ -11,15 +11,15 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
- buildInputs = [ qt5.qtbase qt5.qttools alsaLib libjack2 ];
+ buildInputs = [ qtbase qttools alsaLib libjack2 ];
nativeBuildInputs = [ pkgconfig ];
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "A MIDI network gateway application that sends and receives MIDI data (ALSA Sequencer and/or JACK MIDI) over the network";
homepage = http://qmidinet.sourceforge.net/;
license = licenses.gpl2Plus;
maintainers = [ maintainers.magnetophon ];
- platforms = stdenv.lib.platforms.linux;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bb8fe3285247..ef9ebc140504 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20938,7 +20938,7 @@ in
qmetro = callPackage ../applications/misc/qmetro { };
- qmidinet = callPackage ../applications/audio/qmidinet { };
+ qmidinet = libsForQt5.callPackage ../applications/audio/qmidinet { };
qmidiroute = callPackage ../applications/audio/qmidiroute { };