From 43f85d9808664446df7f6a1af85e852a985ad977 Mon Sep 17 00:00:00 2001 From: Gus <58223632+thegu5@users.noreply.github.com> Date: Tue, 23 Dec 2025 17:34:04 -0500 Subject: [PATCH 1/2] pear-desktop: rename from youtube-music --- .../default.nix | 30 +++++++++---------- .../fix-mpris-desktop-entry.patch | 0 pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 +-- 4 files changed, 18 insertions(+), 17 deletions(-) rename pkgs/applications/audio/{youtube-music => pear-desktop}/default.nix (82%) rename pkgs/applications/audio/{youtube-music => pear-desktop}/fix-mpris-desktop-entry.patch (100%) diff --git a/pkgs/applications/audio/youtube-music/default.nix b/pkgs/applications/audio/pear-desktop/default.nix similarity index 82% rename from pkgs/applications/audio/youtube-music/default.nix rename to pkgs/applications/audio/pear-desktop/default.nix index a50a0b6c665b..347ac7a1b02d 100644 --- a/pkgs/applications/audio/youtube-music/default.nix +++ b/pkgs/applications/audio/pear-desktop/default.nix @@ -14,12 +14,12 @@ nix-update-script, }: stdenv.mkDerivation (finalAttrs: { - pname = "youtube-music"; + pname = "pear-desktop"; version = "3.11.0"; src = fetchFromGitHub { - owner = "th-ch"; - repo = "youtube-music"; + owner = "pear-devs"; + repo = "pear-desktop"; tag = "v${finalAttrs.version}"; hash = "sha256-M8YFpeauM55fpNyHSGQm8iZieV0oWqOieVThhglKKPE="; }; @@ -63,9 +63,9 @@ stdenv.mkDerivation (finalAttrs: { desktopItems = [ (makeDesktopItem { name = "com.github.th_ch.youtube_music"; - exec = "youtube-music %u"; - icon = "youtube-music"; - desktopName = "YouTube Music"; + exec = "pear-desktop %u"; + icon = "pear-desktop"; + desktopName = "Pear Desktop"; startupWMClass = "com.github.th_ch.youtube_music"; categories = [ "AudioVideo" ]; }) @@ -78,15 +78,15 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications,bin} mv pack/mac*/YouTube\ Music.app $out/Applications - ln -s "$out/Applications/YouTube Music.app/Contents/MacOS/YouTube Music" $out/bin/youtube-music + ln -s "$out/Applications/YouTube Music.app/Contents/MacOS/YouTube Music" $out/bin/pear-desktop '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' - mkdir -p "$out/share/youtube-music" - cp -r pack/*-unpacked/{locales,resources{,.pak}} "$out/share/youtube-music" + mkdir -p "$out/share/pear-desktop" + cp -r pack/*-unpacked/{locales,resources{,.pak}} "$out/share/pear-desktop" pushd assets/generated/icons/png for file in *.png; do - install -Dm0644 $file $out/share/icons/hicolor/''${file//.png}/apps/youtube-music.png + install -Dm0644 $file $out/share/icons/hicolor/''${file//.png}/apps/pear-desktop.png done popd '' @@ -96,8 +96,8 @@ stdenv.mkDerivation (finalAttrs: { ''; postFixup = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' - makeWrapper ${electron}/bin/electron $out/bin/youtube-music \ - --add-flags $out/share/youtube-music/resources/app.asar \ + makeWrapper ${electron}/bin/electron $out/bin/pear-desktop \ + --add-flags $out/share/pear-desktop/resources/app.asar \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true --wayland-text-input-version=3}}" \ --set-default ELECTRON_FORCE_IS_PACKAGED 1 \ --set-default ELECTRON_IS_DEV 0 \ @@ -108,8 +108,8 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Electron wrapper around YouTube Music"; - homepage = "https://th-ch.github.io/youtube-music/"; - changelog = "https://github.com/th-ch/youtube-music/blob/master/changelog.md#${ + homepage = "https://github.com/pear-devs/pear-desktop"; + changelog = "https://github.com/pear-devs/pear-desktop/blob/master/changelog.md#${ lib.replaceStrings [ "." ] [ "" ] finalAttrs.src.tag }"; license = lib.licenses.mit; @@ -117,7 +117,7 @@ stdenv.mkDerivation (finalAttrs: { aacebedo SuperSandro2000 ]; - mainProgram = "youtube-music"; + mainProgram = "pear-desktop"; platforms = [ "x86_64-linux" "aarch64-linux" diff --git a/pkgs/applications/audio/youtube-music/fix-mpris-desktop-entry.patch b/pkgs/applications/audio/pear-desktop/fix-mpris-desktop-entry.patch similarity index 100% rename from pkgs/applications/audio/youtube-music/fix-mpris-desktop-entry.patch rename to pkgs/applications/audio/pear-desktop/fix-mpris-desktop-entry.patch diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 94cb2ff099e1..dc11bf77f3c8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1751,6 +1751,7 @@ mapAliases { yaml-cpp_0_3 = throw "yaml-cpp_0_3 has been removed, as it was unused"; # Added 2025-09-16 yamlpath = throw "'yamlpath' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01 yeahwm = throw "'yeahwm' has been removed, as it was broken and unmaintained upstream."; # Added 2025-06-12 + youtube-music = lib.warnOnInstantiate "'youtube-music' has been renamed to 'pear-desktop'" pear-desktop; # Added 2025-12-23 yubikey-manager-qt = throw "'yubikey-manager-qt' has been removed due to being archived upstream. Consider using 'yubioath-flutter' instead."; # Added 2025-06-07 yubikey-personalization-gui = throw "'yubikey-personalization-gui' has been removed due to being archived upstream. Consider using 'yubioath-flutter' instead."; # Added 2025-06-07 zandronum-alpha = throw "'zandronum-alpha' has been removed as it was broken and the stable version has caught up"; # Added 2025-10-19 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9481ebb87b5a..d77cab5ddf91 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11651,6 +11651,8 @@ with pkgs; stdenv = gccStdenv; }; + pear-desktop = callPackage ../applications/audio/pear-desktop { }; + pianoteq = callPackage ../applications/audio/pianoteq { }; pidginPackages = recurseIntoAttrs ( @@ -12486,8 +12488,6 @@ with pkgs; youtube-dl-light = with python3Packages; toPythonApplication youtube-dl-light; - youtube-music = callPackage ../applications/audio/youtube-music { }; - yt-dlp-light = yt-dlp.override { atomicparsleySupport = false; ffmpegSupport = false; From 9e4cf98a68c2c23712ee853802b121fcca3b95f1 Mon Sep 17 00:00:00 2001 From: Gus <58223632+thegu5@users.noreply.github.com> Date: Tue, 23 Dec 2025 17:42:29 -0500 Subject: [PATCH 2/2] pear-desktop: migrate to by-name --- .../pe}/pear-desktop/fix-mpris-desktop-entry.patch | 0 .../default.nix => by-name/pe/pear-desktop/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{applications/audio => by-name/pe}/pear-desktop/fix-mpris-desktop-entry.patch (100%) rename pkgs/{applications/audio/pear-desktop/default.nix => by-name/pe/pear-desktop/package.nix} (100%) diff --git a/pkgs/applications/audio/pear-desktop/fix-mpris-desktop-entry.patch b/pkgs/by-name/pe/pear-desktop/fix-mpris-desktop-entry.patch similarity index 100% rename from pkgs/applications/audio/pear-desktop/fix-mpris-desktop-entry.patch rename to pkgs/by-name/pe/pear-desktop/fix-mpris-desktop-entry.patch diff --git a/pkgs/applications/audio/pear-desktop/default.nix b/pkgs/by-name/pe/pear-desktop/package.nix similarity index 100% rename from pkgs/applications/audio/pear-desktop/default.nix rename to pkgs/by-name/pe/pear-desktop/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d77cab5ddf91..9d24a18b08d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11651,8 +11651,6 @@ with pkgs; stdenv = gccStdenv; }; - pear-desktop = callPackage ../applications/audio/pear-desktop { }; - pianoteq = callPackage ../applications/audio/pianoteq { }; pidginPackages = recurseIntoAttrs (