Unverified Commit d99fe722 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #287212 from Aleksanaa/netease-cloud-music-gtk 

netease-cloud-music-gtk: 2.2.0 -> 2.3.0
parents 8bab381a 73c7533d

pkgs/applications/audio/netease-cloud-music-gtk/default.nix→pkgs/by-name/ne/netease-cloud-music-gtk/package.nix

+14 −10
Original line number Diff line number Diff line
@@ -16,26 +16,26 @@ 
, openssl

, dbus

, libadwaita

, glib-networking

, gst_all_1

, Foundation

, SystemConfiguration

, libsoup_3

}:



stdenv.mkDerivation rec {

  pname = "netease-cloud-music-gtk";

  version = "2.2.0";

  version = "2.3.0";



  src = fetchFromGitHub {

    owner = "gmg137";

    repo = pname;

    rev = version;

    hash = "sha256-9qUzRmm3WQEVjzhzHMT1vNw3r3ymWGlBWXnnPsYGSnk=";

    hash = "sha256-/HvP82QqN+dWb5XJelsayeo4sz/pVvCKQ9RKQJv7PAI=";

  };



  cargoDeps = rustPlatform.importCargoLock {

    lockFile = ./Cargo.lock;

    outputHashes = {

      "netease-cloud-music-api-1.2.0" = "sha256-MR1yVPrNzhZC65mQen88t7NbLfRcoWvT6DMSLGCMeTY=";

      "netease-cloud-music-api-1.3.0" = "sha256-SzMu+klhcLi+jDYc9RZUWrBph5TjfddV0STHaijuQ8Q=";

    };

  };
@@ -62,22 +62,26 @@ stdenv.mkDerivation rec { 
    openssl

    dbus

    libadwaita

    glib-networking

  ] ++ (with gst_all_1; [

    gstreamer

    gst-plugins-base

    gst-plugins-good

    gst-plugins-bad

    gst-plugins-ugly

  ]) ++ lib.optionals stdenv.isDarwin [

    Foundation

    SystemConfiguration

  ];

  ]);



  # FIXME: gst-plugins-good missing libsoup breaks streaming

  # (https://github.com/nixos/nixpkgs/issues/271960)

  preFixup = ''

    gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libsoup_3 ]}")

  '';



  meta = with lib; {

    description = "A Rust + GTK based netease cloud music player";

    homepage = "https://github.com/gmg137/netease-cloud-music-gtk";

    license = licenses.gpl3Plus;

    maintainers = with maintainers; [ diffumist ];

    maintainers = with maintainers; [ diffumist aleksana ];

    mainProgram = "netease-cloud-music-gtk4";

    platforms = platforms.linux;

  };

pkgs/top-level/all-packages.nix

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














  netease-music-tui = callPackage ../applications/audio/netease-music-tui { };



























  netease-cloud-music-gtk = callPackage ../applications/audio/netease-cloud-music-gtk {













    inherit (darwin.apple_sdk.frameworks) Foundation SystemConfiguration;













  };



























  nordic = libsForQt5.callPackage ../data/themes/nordic { };





























  nordzy-cursor-theme = callPackage ../data/icons/nordzy-cursor-theme { };