Commit 92563907 authored by Peter H. Hoeg's avatar Peter H. Hoeg Committed by Peter Hoeg
Browse files

strawberry: move to pkgs/by-name

parent d5e211af

pkgs/applications/audio/strawberry/default.nix→pkgs/by-name/st/strawberry/package.nix

+10 −12
Original line number Diff line number Diff line
@@ -24,32 +24,30 @@ 
  nix-update-script,

  p11-kit,

  pkg-config,

  qtbase,

  qttools,

  qt6,

  sqlite,

  stdenv,

  taglib,

  util-linux,

  wrapQtAppsHook,

  sparsehash,

  rapidjson,

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "strawberry";

  version = "1.2.11";



  src = fetchFromGitHub {

    owner = "jonaski";

    repo = pname;

    rev = version;

    repo = "strawberry";

    rev = finalAttrs.finalPackage.version;

    hash = "sha256-AhNx2CdfE7ff3+L47X6lYPD8GA7imkDIJD5ESndn/cc=";

  };



  # 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 pictures/strawberry.png pictures/strawberry-grey.png

      --replace-fail pictures/strawberry.png pictures/strawberry-grey.png

  '';



  buildInputs =
@@ -67,7 +65,7 @@ stdenv.mkDerivation rec { 
      libmtp

      libpthreadstubs

      libtasn1

      qtbase

      qt6.qtbase

      sqlite

      taglib

      sparsehash
@@ -94,8 +92,8 @@ stdenv.mkDerivation rec { 
      cmake

      ninja

      pkg-config

      qttools

      wrapQtAppsHook

      qt6.qttools

      qt6.wrapQtAppsHook

    ]

    ++ lib.optionals stdenv.hostPlatform.isLinux [

      util-linux
@@ -115,11 +113,11 @@ stdenv.mkDerivation rec { 
  meta = {

    description = "Music player and music collection organizer";

    homepage = "https://www.strawberrymusicplayer.org/";

    changelog = "https://raw.githubusercontent.com/jonaski/strawberry/${version}/Changelog";

    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";

  };

}
 
})

pkgs/top-level/all-packages.nix

+0 −4
Original line number Diff line number Diff line
@@ -2818,10 +2818,6 @@ with pkgs; 


  sonobuoy = callPackage ../applications/networking/cluster/sonobuoy { };



  strawberry-qt6 = qt6Packages.callPackage ../applications/audio/strawberry { };



  strawberry = strawberry-qt6;



  schleuder = callPackage ../tools/security/schleuder { };



  schleuder-cli = callPackage ../tools/security/schleuder/cli { };