From 22baca7dfb478571d2fcc0302c8cb78dd64bbe49 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 31 Mar 2021 22:01:08 +0800 Subject: [PATCH] multimon-ng: drop qt4 qt4 was used to pull in X11 dependencies as well as qmake, but as upstream now supports cmake, just use that and be specific about the X11 dependency. --- .../radio/multimon-ng/default.nix | 23 ++++++------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/radio/multimon-ng/default.nix b/pkgs/applications/radio/multimon-ng/default.nix index aea0944b29b..67d7dbea174 100644 --- a/pkgs/applications/radio/multimon-ng/default.nix +++ b/pkgs/applications/radio/multimon-ng/default.nix @@ -1,10 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, qt4, qmake4Hook, libpulseaudio }: -let - version = "1.1.9"; -in -stdenv.mkDerivation { +{ lib, stdenv, fetchFromGitHub, cmake, libpulseaudio, libX11 }: + +stdenv.mkDerivation rec { pname = "multimon-ng"; - inherit version; + version = "1.1.9"; src = fetchFromGitHub { owner = "EliasOenal"; @@ -13,16 +11,9 @@ stdenv.mkDerivation { sha256 = "01716cfhxfzsab9zjply9giaa4nn4b7rm3p3vizrwi7n253yiwm2"; }; - buildInputs = [ qt4 libpulseaudio ]; + buildInputs = [ libpulseaudio libX11 ]; - nativeBuildInputs = [ qmake4Hook ]; - - qmakeFlags = [ "multimon-ng.pro" ]; - - installPhase = '' - mkdir -p $out/bin - cp multimon-ng $out/bin - ''; + nativeBuildInputs = [ cmake ]; meta = with lib; { description = "Multimon is a digital baseband audio protocol decoder"; @@ -39,6 +30,6 @@ stdenv.mkDerivation { homepage = "https://github.com/EliasOenal/multimon-ng"; license = licenses.gpl2Only; platforms = platforms.linux; - maintainers = [ maintainers.markuskowa ]; + maintainers = with maintainers; [ markuskowa ]; }; }