From c31e8384dd91864330b19105e932be0fc8e9673c Mon Sep 17 00:00:00 2001 From: Marvin Dostal Date: Sat, 5 Oct 2024 20:32:41 +0200 Subject: [PATCH 1/2] lilv: add meson options to include Nix and NixOS specific paths for the default lv2 plugin search --- pkgs/development/libraries/audio/lilv/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix index fdd50d8af937..89b3f77a405a 100644 --- a/pkgs/development/libraries/audio/lilv/default.nix +++ b/pkgs/development/libraries/audio/lilv/default.nix @@ -32,10 +32,20 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ lv2 ]; mesonFlags = [ - "-Ddocs=disabled" + (lib.mesonOption "docs" "disabled") # Tests require building a shared library. (lib.mesonEnable "tests" (!stdenv.hostPlatform.isStatic)) - ]; + ] # Add nix and NixOS specific lv2 paths + # The default values are from: https://github.com/lv2/lilv/blob/master/src/lilv_config.h + ++ lib.optional stdenv.isDarwin (lib.mesonOption "default_lv2_path" + "~/.lv2:~/Library/Audio/Plug-Ins/LV2:" + + "/usr/local/lib/lv2:/usr/lib/lv2:" + + "/Library/Audio/Plug-Ins/LV2:" + + "~/.nix-profile/lib/lv2") + ++ lib.optional stdenv.isLinux (lib.mesonOption "default_lv2_path" + "~/.lv2:/usr/local/lib/lv2:/usr/lib/lv2:" + + "~/.nix-profile/lib/lv2:/run/current-system/sw/lib/lv2:" + + "/etc/profiles/per-user/$USER/lib/lv2"); passthru = { tests = { From ba3ad022bad53bc1d1ca75c63f5981f98700b732 Mon Sep 17 00:00:00 2001 From: Marvin Dostal Date: Sun, 6 Oct 2024 16:19:57 +0200 Subject: [PATCH 2/2] lilv: remove unnecessary search path for LV2 plugins --- pkgs/development/libraries/audio/lilv/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix index 89b3f77a405a..f0c2aa304546 100644 --- a/pkgs/development/libraries/audio/lilv/default.nix +++ b/pkgs/development/libraries/audio/lilv/default.nix @@ -44,8 +44,7 @@ stdenv.mkDerivation rec { + "~/.nix-profile/lib/lv2") ++ lib.optional stdenv.isLinux (lib.mesonOption "default_lv2_path" "~/.lv2:/usr/local/lib/lv2:/usr/lib/lv2:" - + "~/.nix-profile/lib/lv2:/run/current-system/sw/lib/lv2:" - + "/etc/profiles/per-user/$USER/lib/lv2"); + + "~/.nix-profile/lib/lv2:/run/current-system/sw/lib/lv2"); passthru = { tests = {