diff --git a/pkgs/applications/audio/ladspa-sdk/default.nix b/pkgs/by-name/la/ladspa-sdk/package.nix similarity index 82% rename from pkgs/applications/audio/ladspa-sdk/default.nix rename to pkgs/by-name/la/ladspa-sdk/package.nix index 0103db6a7422..6f154ea224d8 100644 --- a/pkgs/applications/audio/ladspa-sdk/default.nix +++ b/pkgs/by-name/la/ladspa-sdk/package.nix @@ -4,22 +4,22 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ladspa-sdk"; version = "1.15"; src = fetchurl { - url = "https://www.ladspa.org/download/ladspa_sdk_${version}.tgz"; + url = "https://www.ladspa.org/download/ladspa_sdk_${finalAttrs.version}.tgz"; sha256 = "1vgx54cgsnc3ncl9qbgjbmq12c444xjafjkgr348h36j16draaa2"; }; - sourceRoot = "ladspa_sdk_${version}/src"; + sourceRoot = "ladspa_sdk_${finalAttrs.version}/src"; strictDeps = true; patchPhase = '' sed -i 's@/usr/@$(out)/@g' Makefile substituteInPlace Makefile \ - --replace /tmp/test.wav $NIX_BUILD_TOP/${sourceRoot}/test.wav + --replace /tmp/test.wav $NIX_BUILD_TOP/${finalAttrs.sourceRoot}/test.wav ''; makeFlags = [ @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.magnetophon ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/applications/audio/ladspa-sdk/ladspah.nix b/pkgs/by-name/la/ladspaH/package.nix similarity index 84% rename from pkgs/applications/audio/ladspa-sdk/ladspah.nix rename to pkgs/by-name/la/ladspaH/package.nix index fae714eb19ae..7c2515002b1c 100644 --- a/pkgs/applications/audio/ladspa-sdk/ladspah.nix +++ b/pkgs/by-name/la/ladspaH/package.nix @@ -3,11 +3,11 @@ stdenv, fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ladspa.h"; version = "1.15"; src = fetchurl { - url = "https://www.ladspa.org/download/ladspa_sdk_${version}.tgz"; + url = "https://www.ladspa.org/download/ladspa_sdk_${finalAttrs.version}.tgz"; sha256 = "1vgx54cgsnc3ncl9qbgjbmq12c444xjafjkgr348h36j16draaa2"; }; @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.magnetophon ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2431e91887a0..45b2ee319010 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11647,14 +11647,10 @@ with pkgs; kvirc = libsForQt5.callPackage ../applications/networking/irc/kvirc { }; - ladspaH = callPackage ../applications/audio/ladspa-sdk/ladspah.nix { }; - ladspaPlugins = callPackage ../applications/audio/ladspa-plugins { fftw = fftwSinglePrec; }; - ladspa-sdk = callPackage ../applications/audio/ladspa-sdk { }; - lemonbar = callPackage ../applications/window-managers/lemonbar { }; lemonbar-xft = callPackage ../applications/window-managers/lemonbar/xft.nix { };