From 6ce11c544143fed16cb0c95853f413eaf8992605 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 6 Jan 2022 14:58:57 +0100 Subject: [PATCH] metersLv2: refactor --- .../applications/audio/meters_lv2/default.nix | 75 ++++++++++--------- 1 file changed, 41 insertions(+), 34 deletions(-) diff --git a/pkgs/applications/audio/meters_lv2/default.nix b/pkgs/applications/audio/meters_lv2/default.nix index b21b859596e1..86c7e64a6e64 100644 --- a/pkgs/applications/audio/meters_lv2/default.nix +++ b/pkgs/applications/audio/meters_lv2/default.nix @@ -1,46 +1,53 @@ -{ lib, stdenv, fetchurl, pkg-config -, lv2, libGLU, libGL, gtk2, cairo, pango, fftwFloat, libjack2 }: +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, lv2 +, libGLU +, libGL +, gtk2 +, cairo +, pango +, fftwFloat +, libjack2 +}: -let +stdenv.mkDerivation rec { + pname = "meters.lv2"; version = "0.9.10"; - name = "meters.lv2-${version}"; - - # robtk submodule is pegged to this version robtkVersion = "0.6.2"; - robtkName = "robtk-${robtkVersion}"; - - src = fetchurl { - name = "${name}.tar.gz"; - url = "https://github.com/x42/meters.lv2/archive/v${version}.tar.gz"; - sha256 = "0yfyn7j8g50w671b1z7ph4ppjx8ddj5c6nx53syp5y5mfr1b94nx"; - }; - - robtkSrc = fetchurl { - name = "${robtkName}.tar.gz"; - url = "https://github.com/x42/robtk/archive/v${robtkVersion}.tar.gz"; - sha256 = "1v79xys1k2923wpivdjd44vand6c4agwvnrqi4c8kdv9r07b559v"; - }; - -in -stdenv.mkDerivation { - inherit name; nativeBuildInputs = [ pkg-config ]; buildInputs = [ lv2 libGLU libGL gtk2 cairo pango fftwFloat libjack2 ]; - srcs = [ src robtkSrc ]; - sourceRoot = name; + src = fetchFromGitHub { + owner = "x42"; + repo = "meters.lv2"; + rev = "v${version}"; + sha256 = "sha256-u2KIsaia0rAteQoEh6BLNCiRHFufHYF95z6J/EMgeSE="; + }; - postUnpack = "mv ${robtkName}/* ${name}/robtk"; # */ + robtkSrc = fetchFromGitHub { + owner = "x42"; + repo = "robtk"; + rev = "v${robtkVersion}"; + sha256 = "sha256-zeRMobfKW0+wJwYVem74tglitkI6DSoK75Auywcu4Tw="; + }; + + postUnpack = '' + rm -rf $sourceRoot/robtk/ + ln -s ${robtkSrc} $sourceRoot/robtk + ''; - preConfigure = "makeFlagsArray=( PREFIX=$out )"; meter_VERSION = version; + enableParallelBuilding = true; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; - meta = with lib; - { description = "Collection of audio level meters with GUI in LV2 plugin format"; - homepage = "http://x42.github.io/meters.lv2/"; - maintainers = with maintainers; [ ehmry ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; + meta = with lib; { + description = "Collection of audio level meters with GUI in LV2 plugin format"; + homepage = "https://x42.github.io/meters.lv2/"; + maintainers = with maintainers; [ ehmry ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; }