From eae54e1af2fe63d922db8e161d0339b256ab311b Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sun, 2 Nov 2025 23:07:05 +0100 Subject: [PATCH 1/2] gxmatcheq: modernize --- pkgs/by-name/gx/gxmatcheq-lv2/package.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/gx/gxmatcheq-lv2/package.nix b/pkgs/by-name/gx/gxmatcheq-lv2/package.nix index 5a037d1a4ef0..1845be27c664 100644 --- a/pkgs/by-name/gx/gxmatcheq-lv2/package.nix +++ b/pkgs/by-name/gx/gxmatcheq-lv2/package.nix @@ -8,16 +8,15 @@ lv2, pkg-config, }: - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "GxMatchEQ.lv2"; version = "0.1"; src = fetchFromGitHub { owner = "brummer10"; repo = "GxMatchEQ.lv2"; - rev = "V${version}"; - sha256 = "0azdmgzqwjn26nx38iw13666a1i4y2bv39wk89pf6ihdi46klf72"; + rev = "V${finalAttrs.version}"; + hash = "sha256-4jg6DYkNRuNuQpOnsZfwJAZljBmBRzS6NcJKjv+r7Ss="; }; nativeBuildInputs = [ pkg-config ]; @@ -33,10 +32,10 @@ stdenv.mkDerivation rec { installFlags = [ "INSTALL_DIR=$(out)/lib/lv2" ]; - meta = with lib; { + meta = { homepage = "https://github.com/brummer10/GxMatchEQ.lv2"; description = "Matching Equalizer to apply EQ curve from one source to another source"; - maintainers = [ maintainers.magnetophon ]; - license = licenses.gpl3; + maintainers = with lib.maintainers; [ magnetophon ]; + license = lib.licenses.gpl3; }; -} +}) From 18042df49653f6aa69d601727d16cf4e2c76cc7e Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sun, 2 Nov 2025 23:08:02 +0100 Subject: [PATCH 2/2] gxmatcheq: fix build --- pkgs/by-name/gx/gxmatcheq-lv2/package.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/gx/gxmatcheq-lv2/package.nix b/pkgs/by-name/gx/gxmatcheq-lv2/package.nix index 1845be27c664..340f1b9a895c 100644 --- a/pkgs/by-name/gx/gxmatcheq-lv2/package.nix +++ b/pkgs/by-name/gx/gxmatcheq-lv2/package.nix @@ -1,6 +1,7 @@ { lib, stdenv, + gcc13Stdenv, fetchFromGitHub, xorg, xorgproto, @@ -8,7 +9,12 @@ lv2, pkg-config, }: -stdenv.mkDerivation (finalAttrs: { +let + # see: https://github.com/brummer10/GxMatchEQ.lv2/issues/8 + # Use gcc13 on Linux, but default stdenv (clang) elsewhere + buildStdenv = if stdenv.hostPlatform.isLinux then gcc13Stdenv else stdenv; +in +buildStdenv.mkDerivation (finalAttrs: { pname = "GxMatchEQ.lv2"; version = "0.1";