cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #273955 from zeuner/haskell-alsa-local

Browse source 
haskellPackages.PortMidi: fix ALSA plugins load path
This commit is contained in:
maralorn 2024-01-01 14:15:49 +01:00 committed by GitHub
commit 77480e1fa4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -1318,6 +1318,16 @@ self: super: {
testToolDepends = (drv.testToolDepends or []) ++ [pkgs.postgresql];
}) super.beam-postgres;
# PortMidi needs an environment variable to have ALSA find its plugins:
# https://github.com/NixOS/nixpkgs/issues/6860
PortMidi = overrideCabal (drv: {
patches = (drv.patches or []) ++ [ ./patches/portmidi-alsa-plugins.patch ];
postPatch = (drv.postPatch or "") + ''
substituteInPlace portmidi/pm_linux/pmlinuxalsa.c \
--replace @alsa_plugin_dir@ "${pkgs.alsa-plugins}/lib/alsa-lib"
'';
}) super.PortMidi;
# Fix for base >= 4.11
scat = overrideCabal (drv: {
patches = [(fetchpatch {

31
pkgs/development/haskell-modules/patches/portmidi-alsa-plugins.patch Normal file
View file

@ -0,0 +1,31 @@
diff -Naurd PortMidi-0.2.0.0/portmidi/pm_linux/pmlinuxalsa.c PortMidi-0.2.0.0-alsafix/portmidi/pm_linux/pmlinuxalsa.c
--- PortMidi-0.2.0.0/portmidi/pm_linux/pmlinuxalsa.c 2023-12-13 11:35:12.517413022 +0000
+++ PortMidi-0.2.0.0-alsafix/portmidi/pm_linux/pmlinuxalsa.c 2023-12-13 11:35:12.565413037 +0000
@@ -719,6 +719,18 @@
}
+static void set_alsa_plugin_path( void )
+{
+ char *existing;
+
+ existing = getenv("ALSA_PLUGIN_DIR");
+ if (NULL != existing) {
+ return;
+ }
+ setenv("ALSA_PLUGIN_DIR", "@alsa_plugin_dir@", 0);
+}
+
+
PmError pm_linuxalsa_init( void )
{
int err;
@@ -726,6 +738,8 @@
snd_seq_port_info_t *pinfo;
unsigned int caps;
+ set_alsa_plugin_path();
+
/* Previously, the last parameter was SND_SEQ_NONBLOCK, but this
* would cause messages to be dropped if the ALSA buffer fills up.
* The correct behavior is for writes to block until there is