From 8f4420f92ec1f32dcdc61769b68b1ea43ca3b717 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sat, 18 Oct 2025 05:37:35 -0700
Subject: [PATCH] bitwig-studio3: modernize, move to by-name/

---
 .../bi/bitwig-studio3/package.nix}             | 18 +++++++++---------
 pkgs/top-level/all-packages.nix                |  1 -
 2 files changed, 9 insertions(+), 10 deletions(-)
 rename pkgs/{applications/audio/bitwig-studio/bitwig-studio3.nix => by-name/bi/bitwig-studio3/package.nix} (81%)

diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/pkgs/by-name/bi/bitwig-studio3/package.nix
similarity index 81%
rename from pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
rename to pkgs/by-name/bi/bitwig-studio3/package.nix
index 7c6c91615465..a65d3b08be92 100644
--- a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
+++ b/pkgs/by-name/bi/bitwig-studio3/package.nix
@@ -21,13 +21,13 @@
   makeWrapper,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "bitwig-studio";
   version = "3.3.11";
 
   src = fetchurl {
-    url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb";
-    sha256 = "sha256-cF8gVPjM0KUcKOW09uFccp4/lzbUmZcBkVOwr/A/8Yw=";
+    url = "https://downloads.bitwig.com/stable/${finalAttrs.version}/bitwig-studio-${finalAttrs.version}.deb";
+    hash = "sha256-cF8gVPjM0KUcKOW09uFccp4/lzbUmZcBkVOwr/A/8Yw=";
   };
 
   nativeBuildInputs = [
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
     (lib.getLib stdenv.cc.cc)
   ];
 
-  ldLibraryPath = lib.strings.makeLibraryPath buildInputs;
+  ldLibraryPath = lib.strings.makeLibraryPath finalAttrs.buildInputs;
 
   installPhase = ''
     runHook preInstall
@@ -86,13 +86,13 @@ stdenv.mkDerivation rec {
       patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" $f
       wrapProgram $f \
         "''${gappsWrapperArgs[@]}" \
-        --prefix LD_LIBRARY_PATH : "${ldLibraryPath}" \
+        --prefix LD_LIBRARY_PATH : "${finalAttrs.ldLibraryPath}" \
         --prefix PATH : "${lib.makeBinPath [ ffmpeg ]}" \
         --suffix PATH : "${lib.makeBinPath [ xdg-utils ]}"
     done
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Digital audio workstation";
     longDescription = ''
       Bitwig Studio is a multi-platform music-creation system for
@@ -100,13 +100,13 @@ stdenv.mkDerivation rec {
       editing tools and a super-fast workflow.
     '';
     homepage = "https://www.bitwig.com/";
-    license = licenses.unfree;
+    license = lib.licenses.unfree;
     platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       bfortz
       michalrus
       mrVanDalo
     ];
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 573509982a6f..eb44eb97812c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10827,7 +10827,6 @@ with pkgs;
     callPackage ../applications/science/electronics/bitscope/packages.nix { }
   );
 
-  bitwig-studio3 = callPackage ../applications/audio/bitwig-studio/bitwig-studio3.nix { };
   bitwig-studio4 = callPackage ../applications/audio/bitwig-studio/bitwig-studio4.nix {
     libjpeg = libjpeg8;
   };