switch back to upstream strawberry

home/all.nix

@@ -20,7 +20,7 @@
     (chromium.override {
       enableWideVine = true;
     })
-    strawberry-master
+    strawberry
     spotify-player
     input-leap
     libreoffice-qt-fresh

packages/overlay.nix

@@ -32,9 +32,5 @@ final: prev: {
     path = ./prismlauncher-master/package.nix;
   }) { };
 
-  strawberry-master = prev.callPackage (builtins.path {
-    path = ./strawberry/package.nix;
-  }) { };
-
   widevine-firefox = prev.callPackage (builtins.path { path = ./widevine-firefox/package.nix; }) { };
 }

packages/strawberry/package.nix

@@ -1,133 +0,0 @@
-{
-  alsa-lib,
-  boost,
-  chromaprint,
-  cmake,
-  fetchFromGitHub,
-  fftw,
-  glib-networking,
-  gnutls,
-  gst_all_1,
-  kdsingleapplication,
-  lib,
-  libXdmcp,
-  libcdio,
-  libebur128,
-  libidn2,
-  libmtp,
-  libpthreadstubs,
-  libpulseaudio,
-  libselinux,
-  libsepol,
-  libtasn1,
-  ninja,
-  nix-update-script,
-  p11-kit,
-  pkg-config,
-  qt6,
-  sqlite,
-  stdenv,
-  taglib,
-  util-linux,
-  sparsehash,
-  rapidjson,
-
-  # tests
-  gtest,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "strawberry-master";
-  version = "git-master";
-
-  src = fetchFromGitHub {
-    owner = "jonaski";
-    repo = "strawberry";
-    rev = "02d76f17f7f4a862019c360d4f8f61dbb0978208";
-    hash = "sha256-/3dQbxwR09hriHZzrwUd0d4VYRBGMOtNDUyOWNmmKGk=";
-  };
-
-  # the big strawberry shown in the context menu is *very* much in your face, so use the grey version instead
-  postPatch = ''
-    substituteInPlace src/context/contextalbum.cpp \
-      --replace-fail pictures/strawberry.png pictures/strawberry-grey.png
-  '';
-
-  buildInputs = [
-    alsa-lib
-    boost
-    chromaprint
-    fftw
-    gnutls
-    kdsingleapplication
-    libXdmcp
-    libcdio
-    libebur128
-    libidn2
-    libmtp
-    libpthreadstubs
-    libtasn1
-    qt6.qtbase
-    sqlite
-    taglib
-    sparsehash
-    rapidjson
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libpulseaudio
-    libselinux
-    libsepol
-    p11-kit
-  ]
-  ++ (with gst_all_1; [
-    glib-networking
-    gst-libav
-    gst-plugins-bad
-    gst-plugins-base
-    gst-plugins-good
-    gst-plugins-ugly
-    gst-plugins-rs
-    gstreamer
-  ]);
-
-  nativeBuildInputs = [
-    cmake
-    ninja
-    pkg-config
-    qt6.qttools
-    qt6.wrapQtAppsHook
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isLinux [
-    util-linux
-  ];
-
-  cmakeFlags = with lib; [ (cmakeBool "ENABLE_GPOD" false) ];
-
-  checkInputs = [ gtest ];
-  checkTarget = "strawberry_tests";
-  preCheck = ''
-    # defaults to "xcb" otherwise, which requires a display
-    export QT_QPA_PLATFORM=offscreen
-  '';
-  doCheck = true;
-
-  postInstall = ''
-    qtWrapperArgs+=(
-      --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"
-      --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules"
-    )
-  '';
-
-  passthru.updateScript = nix-update-script { };
-
-  meta = {
-    description = "Music player and music collection organizer";
-    homepage = "https://www.strawberrymusicplayer.org/";
-    changelog = "https://raw.githubusercontent.com/jonaski/strawberry/${finalAttrs.finalPackage.version}/Changelog";
-    license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ peterhoeg ];
-    # upstream says darwin should work but they lack maintainers as of 0.6.6
-    platforms = lib.platforms.linux;
-    mainProgram = "strawberry";
-  };
-})