From bc7b0f5e607308aaf9beea906f2ea98e4d612ced Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Fri, 26 Jan 2024 12:36:51 +0100 Subject: [PATCH 1/2] ir.lv2: use new src closes #282694 --- pkgs/applications/audio/ir.lv2/default.nix | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/audio/ir.lv2/default.nix b/pkgs/applications/audio/ir.lv2/default.nix index 6c2b9c5be9cf..e96cb939639d 100644 --- a/pkgs/applications/audio/ir.lv2/default.nix +++ b/pkgs/applications/audio/ir.lv2/default.nix @@ -1,27 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, fftw, gtk2, lv2, libsamplerate, libsndfile, pkg-config, zita-convolver }: +{ lib, stdenv, fetchgit, fftw, gtk2, lv2, libsamplerate, libsndfile, pkg-config, zita-convolver }: stdenv.mkDerivation rec { pname = "ir.lv2"; - version = "1.2.4"; + version = "0-unstable-2018-06-21"; - src = fetchFromGitHub { - owner = "tomszilagyi"; - repo = "ir.lv2"; - rev = version; - sha256 = "1p6makmgr898fakdxzl4agh48qqwgv1k1kwm8cgq187n0mhiknp6"; + src = fetchgit { + url = "https://git.hq.sig7.se/ir.lv2.git"; + rev = "38bf3ec7d370d8234dd55be99c14cf9533b43c60"; + sha256 = "sha256-5toZYQX2oIAfQ5XPMMN+HGNE4FOE/t6mciih/OpU1dw="; }; buildInputs = [ fftw gtk2 lv2 libsamplerate libsndfile zita-convolver ]; nativeBuildInputs = [ pkg-config ]; - postPatch = '' - # Fix build with lv2 1.18: https://github.com/tomszilagyi/ir.lv2/pull/20 - find . -type f -exec fgrep -q LV2UI_Descriptor {} \; \ - -exec sed -i {} -e 's/const struct _\?LV2UI_Descriptor/const LV2UI_Descriptor/' \; - ''; - - postBuild = "make convert4chan"; installPhase = '' From bd720a1050f3f1a463f90d5179d0b8c1e9908640 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 7 Feb 2024 23:51:41 +0100 Subject: [PATCH 2/2] ir.lv2: fix build with gcc 13 --- pkgs/applications/audio/ir.lv2/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/audio/ir.lv2/default.nix b/pkgs/applications/audio/ir.lv2/default.nix index e96cb939639d..90b816d1290d 100644 --- a/pkgs/applications/audio/ir.lv2/default.nix +++ b/pkgs/applications/audio/ir.lv2/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; + env.NIX_CFLAGS_COMPILE = "-fpermissive"; + postBuild = "make convert4chan"; installPhase = ''