From ab28c94a5bdf7f9d72b910e0c966f036ff55e7e7 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Sat, 2 Nov 2024 16:01:16 +0000 Subject: [PATCH 1/4] distrho: move to by-name Signed-off-by: Fernando Rodrigues --- .../default.nix => by-name/di/distrho-ports/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/audio/distrho/default.nix => by-name/di/distrho-ports/package.nix} (100%) diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/by-name/di/distrho-ports/package.nix similarity index 100% rename from pkgs/applications/audio/distrho/default.nix rename to pkgs/by-name/di/distrho-ports/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c64bfa6a756a..d2c274e980ef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28582,8 +28582,6 @@ with pkgs; dirt = callPackage ../applications/audio/dirt { }; - distrho = callPackage ../applications/audio/distrho { }; - dit = callPackage ../applications/editors/dit { }; djvulibre = callPackage ../applications/misc/djvulibre { }; From 1c7f59847f56487d5d535d7980d9df2fe662c0f9 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Sat, 2 Nov 2024 16:06:39 +0000 Subject: [PATCH 2/4] distrho-ports: format with nixfmt-rfc-style Signed-off-by: Fernando Rodrigues --- pkgs/by-name/di/distrho-ports/package.nix | 51 ++++++++++++++--------- 1 file changed, 32 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/di/distrho-ports/package.nix b/pkgs/by-name/di/distrho-ports/package.nix index 1da0b6ee0d22..3c007ca05335 100644 --- a/pkgs/by-name/di/distrho-ports/package.nix +++ b/pkgs/by-name/di/distrho-ports/package.nix @@ -1,22 +1,24 @@ -{ lib -, stdenv -, alsa-lib -, fetchFromGitHub -, fftwFloat -, freetype -, libGL -, libX11 -, libXcursor -, libXext -, libXrender -, meson -, ninja -, pkg-config +{ + lib, + stdenv, + alsa-lib, + fetchFromGitHub, + fftwFloat, + freetype, + libGL, + libX11, + libXcursor, + libXext, + libXrender, + meson, + ninja, + pkg-config, }: -let rpathLibs = [ - fftwFloat -]; +let + rpathLibs = [ + fftwFloat + ]; in stdenv.mkDerivation rec { pname = "distrho-ports"; @@ -29,7 +31,11 @@ stdenv.mkDerivation rec { sha256 = "00fgqwayd20akww3n2imyqscmyrjyc9jj0ar13k9dhpaxqk2jxbf"; }; - nativeBuildInputs = [ pkg-config meson ninja ]; + nativeBuildInputs = [ + pkg-config + meson + ninja + ]; buildInputs = rpathLibs ++ [ alsa-lib @@ -91,7 +97,14 @@ stdenv.mkDerivation rec { vitalium wolpertinger ''; - license = with licenses; [ gpl2Only gpl3Only gpl2Plus lgpl2Plus lgpl3Only mit ]; + license = with licenses; [ + gpl2Only + gpl3Only + gpl2Plus + lgpl2Plus + lgpl3Only + mit + ]; maintainers = [ ]; platforms = [ "x86_64-linux" ]; }; From 863a15c6c9fca9ec68619366762b8d6ab7871707 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Sat, 2 Nov 2024 17:44:40 +0000 Subject: [PATCH 3/4] distrho: remove nested `with lib;` from meta, turn the longDescription into a markdown list, and use the new style for the platform Signed-off-by: Fernando Rodrigues --- pkgs/by-name/di/distrho-ports/package.nix | 74 +++++++++++------------ 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/pkgs/by-name/di/distrho-ports/package.nix b/pkgs/by-name/di/distrho-ports/package.nix index 3c007ca05335..4ba3a9c9fb3d 100644 --- a/pkgs/by-name/di/distrho-ports/package.nix +++ b/pkgs/by-name/di/distrho-ports/package.nix @@ -57,47 +57,47 @@ stdenv.mkDerivation rec { done ''; - meta = with lib; { + meta = { homepage = "http://distrho.sourceforge.net/ports"; description = "Linux audio plugins and LV2 ports"; longDescription = '' Includes: - arctican-function - arctican-pilgrim - dexed - drowaudio-distortion - drowaudio-distortionshaper - drowaudio-flanger - drowaudio-reverb - drowaudio-tremolo - drumsynth - easySSP - eqinox - HiReSam - juce-opl - klangfalter - LUFSMeter - LUFSMeter-Multi - luftikus - obxd - pitchedDelay - refine - stereosourceseparation - swankyamp - tal-dub-3 - tal-filter - tal-filter-2 - tal-noisemaker - tal-reverb - tal-reverb-2 - tal-reverb-3 - tal-vocoder-2 - temper - vex - vitalium - wolpertinger + - arctican-function + - arctican-pilgrim + - dexed + - drowaudio-distortion + - drowaudio-distortionshaper + - drowaudio-flanger + - drowaudio-reverb + - drowaudio-tremolo + - drumsynth + - easySSP + - eqinox + - HiReSam + - juce-opl + - klangfalter + - LUFSMeter + - LUFSMeter-Multi + - luftikus + - obxd + - pitchedDelay + - refine + - stereosourceseparation + - swankyamp + - tal-dub-3 + - tal-filter + - tal-filter-2 + - tal-noisemaker + - tal-reverb + - tal-reverb-2 + - tal-reverb-3 + - tal-vocoder-2 + - temper + - vex + - vitalium + - wolpertinger ''; - license = with licenses; [ + license = with lib.licenses; [ gpl2Only gpl3Only gpl2Plus @@ -106,6 +106,6 @@ stdenv.mkDerivation rec { mit ]; maintainers = [ ]; - platforms = [ "x86_64-linux" ]; + platforms = lib.systems.inspect.patternLogicalAnd lib.systems.inspect.patterns.isLinux lib.systems.inspect.patterns.isx86; }; } From 5be13c7eadfac346d2f78863db2d95c34d11ddf7 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Sat, 2 Nov 2024 17:44:56 +0000 Subject: [PATCH 4/4] distrho: 2021-03-15 -> 2021-03-15-unstable-2024-05-01, fix build Signed-off-by: Fernando Rodrigues --- pkgs/by-name/di/distrho-ports/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/di/distrho-ports/package.nix b/pkgs/by-name/di/distrho-ports/package.nix index 4ba3a9c9fb3d..dcee3bbadd74 100644 --- a/pkgs/by-name/di/distrho-ports/package.nix +++ b/pkgs/by-name/di/distrho-ports/package.nix @@ -20,14 +20,14 @@ let fftwFloat ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "distrho-ports"; - version = "2021-03-15"; + version = "2021-03-15-unstable-2024-05-01"; src = fetchFromGitHub { owner = "DISTRHO"; repo = "DISTRHO-Ports"; - rev = version; + rev = "b3596e6a690eb0556e69e8b6d943fee2dfbb04fb"; sha256 = "00fgqwayd20akww3n2imyqscmyrjyc9jj0ar13k9dhpaxqk2jxbf"; }; @@ -47,6 +47,8 @@ stdenv.mkDerivation rec { libXrender ]; + env.NIX_CFLAGS_COMPILE = toString [ "-fpermissive" ]; + postFixup = '' for file in \ $out/lib/lv2/vitalium.lv2/vitalium.so \