This commit is contained in:
Aleksana
2026-01-02 15:57:07 +00:00
committed by GitHub
8 changed files with 4 additions and 106 deletions
@@ -24,8 +24,6 @@
ladspaH,
jackSupport ? true,
libjack2,
lashSupport ? false,
lash,
ossSupport ? true,
portaudioSupport ? true,
portaudio,
@@ -113,7 +111,6 @@ stdenv.mkDerivation rec {
ladspaH
]
++ lib.optionals jackSupport [ libjack2 ]
++ lib.optionals lashSupport [ lash ]
++ lib.optionals portaudioSupport [ portaudio ]
++ lib.optionals sndioSupport [ sndio ]
++ lib.optionals (guiModule == "fltk") [
-2
View File
@@ -6,7 +6,6 @@
pkg-config,
alsa-lib,
ladspa-sdk,
lash,
libarchive,
libjack2,
liblo,
@@ -35,7 +34,6 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
alsa-lib
ladspa-sdk
lash
libarchive
libjack2
liblo
+3 -10
View File
@@ -4,7 +4,6 @@
fetchFromGitHub,
pkg-config,
scons,
lash,
libjack2,
jack ? libjack2,
alsa-lib,
@@ -14,22 +13,17 @@
stdenv.mkDerivation (finalAttrs: {
pname = "jackmix";
version = "0.6.0";
version = "0.6.1-unstable-2024-03-26";
src = fetchFromGitHub {
owner = "kampfschlaefer";
repo = "jackmix";
tag = finalAttrs.version;
sha256 = "0p59411vk38lccn24r7nih10jpgg9i46yc26zpc3x13amxwwpd4h";
rev = "f0f29a7111f704f369f1ecd6c29a713ce21f767a";
hash = "sha256-6dz7U6umkdBOLx1MQOEeY51OrEtKlFpVMBudBTe6ehM=";
};
patches = [
./no_error.patch
(fetchpatch {
name = "sconstruct-python3.patch";
url = "https://github.com/kampfschlaefer/jackmix/commit/3a0c868b267728fdbc69cc3dc1941edac27d97f6.patch";
hash = "sha256-MLgxIiZ0+C1IVEci9Q347DR+SJUlPG2N3iPvuhRptJU=";
})
];
nativeBuildInputs = [
@@ -39,7 +33,6 @@ stdenv.mkDerivation (finalAttrs: {
];
buildInputs = [
libsForQt5.qtbase
lash
jack
alsa-lib
];
-11
View File
@@ -1,11 +0,0 @@
diff -rupN liblash/lash.c lash-0.5.4/liblash/lash.c
--- a/liblash/lash.c 2007-03-09 10:34:40.000000000 -0500
+++ b/liblash/lash.c 2012-07-22 18:17:46.003963521 -0400
@@ -22,6 +22,7 @@
#include <string.h>
#include <strings.h>
#include <pthread.h>
+#include <sys/resource.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <sys/socket.h>
-62
View File
@@ -1,62 +0,0 @@
{
lib,
stdenv,
fetchurl,
alsa-lib,
gtk2,
libjack2,
libuuid,
libxml2,
makeWrapper,
pkg-config,
readline,
}:
stdenv.mkDerivation rec {
pname = "lash";
version = "0.5.4";
src = fetchurl {
url = "mirror://savannah/lash/${pname}-${version}.tar.gz";
sha256 = "05kc4brcx8mncai0rj2gz4s4bsrsy9q8xlnaddf75i0m8jl7snhh";
};
# http://permalink.gmane.org/gmane.linux.redhat.fedora.extras.cvs/822346
patches = [
./socket.patch
./gcc-47.patch
];
nativeBuildInputs = [
pkg-config
makeWrapper
];
buildInputs = [
alsa-lib
gtk2
libjack2
libxml2
readline
];
propagatedBuildInputs =
assert libuuid != null;
[ libuuid ];
NIX_LDFLAGS = "-lm -lpthread -luuid";
postInstall = ''
for i in lash_control lash_panel
do wrapProgram "$out/bin/$i" --prefix LD_LIBRARY_PATH ":" "${libuuid}/lib"
done
'';
meta = {
description = "Linux Audio Session Handler";
longDescription = ''
Session management system for GNU/Linux audio applications.
'';
homepage = "https://www.nongnu.org/lash";
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.linux;
maintainers = [ ];
};
}
-16
View File
@@ -1,16 +0,0 @@
Via http://bugs.gentoo.org/show_bug.cgi?id=229603
--- lash-0.5.4/liblash/socket.c 2008-06-26 15:20:44.227064193 +0200
+++ lash-0.5.4/liblash/socket.c 2008-06-26 15:21:18.245063129 +0200
@@ -20,6 +20,11 @@
#define _POSIX_SOURCE /* addrinfo */
+#ifdef LASH_BUILD
+#define _GNU_SOURCE
+#include "config.h"
+#endif /* LASH_BUILD */
+
#include <stdint.h>
#include <sys/types.h>
#include <sys/socket.h>
-2
View File
@@ -9,7 +9,6 @@
dssi,
fluidsynth,
ladspaH,
lash,
libinstpatch,
libjack2,
liblo,
@@ -51,7 +50,6 @@ stdenv.mkDerivation (finalAttrs: {
dssi
fluidsynth
ladspaH
lash
libinstpatch
libjack2
liblo
+1
View File
@@ -835,6 +835,7 @@ mapAliases {
languageMachines.uctodata = uctodata; # Added 2025-10-7
lanzaboote-tool = throw "lanzaboote-tool has been removed due to lack of integration maintenance with nixpkgs. Consider using the Nix expressions provided by https://github.com/nix-community/lanzaboote"; # Added 2025-07-23
larynx = throw "'larynx' has been renamed to/replaced by 'piper-tts'"; # Converted to throw 2025-10-27
lash = throw "'lash' has been removed, as it is unmaintained upstream"; # Added 2026-01-02
LASzip2 = throw "'LASzip2' has been renamed to/replaced by 'laszip_2'"; # Converted to throw 2025-10-27
LASzip = throw "'LASzip' has been renamed to/replaced by 'laszip'"; # Converted to throw 2025-10-27
latinmodern-math = throw "'latinmodern-math' has been renamed to/replaced by 'lmmath'"; # Converted to throw 2025-10-27