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

amarok: 3.2.2 -> 3.3.0

parent 2ef18469

pkgs/applications/audio/amarok/default.nix→pkgs/by-name/am/amarok/package.nix

+54 −58
Original line number Diff line number Diff line
@@ -2,36 +2,19 @@ 
  stdenv,

  fetchurl,

  lib,

  cmake,

  extra-cmake-modules,

  kdoctools,

  qca-qt5,

  qjson,

  qtquickcontrols2,

  qtscript,

  qtwebengine,

  karchive,

  kcmutils,

  kconfig,

  kdnssd,

  kguiaddons,

  kinit,

  kirigami2,

  knewstuff,

  knotifyconfig,

  ktexteditor,

  kwindowsystem,

  pkg-config,

  kdePackages,

  fftw,

  phonon,

  plasma-framework,

  threadweaver,

  breeze-icons,

  wrapQtAppsHook,

  curl,

  ffmpeg,

  gdk-pixbuf,

  gst_all_1,

  libaio,

  liblastfm,

  libmtp,

  libsysprof-capture,

  libunwind,

  loudmouth,

  lzo,

  lz4,
@@ -43,11 +26,11 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "amarok";

  version = "3.2.2";

  version = "3.3.0";



  src = fetchurl {

    url = "mirror://kde/stable/amarok/${finalAttrs.version}/amarok-${finalAttrs.version}.tar.xz";

    sha256 = "sha256-/N48N9H4FezIiTD+bR6k1LCx7Tsz/NMt9VQq+HTdKrA=";

    hash = "sha256-Lc5YezwUv5IOpNiQdpZOuXT8Q0VwFHKA/NHkPPFP8aw=";

  };



  outputs = [
@@ -55,39 +38,15 @@ stdenv.mkDerivation (finalAttrs: { 
    "doc"

  ];



  nativeBuildInputs = [

    extra-cmake-modules

    kdoctools

    wrapQtAppsHook

  ];



  propagatedBuildInputs = [

    qca-qt5

    qjson

    qtquickcontrols2

    qtscript

    qtwebengine

    karchive

    kcmutils

    kconfig

    kdnssd

    kguiaddons

    kinit

    kirigami2

    knewstuff

    knotifyconfig

    ktexteditor

    kwindowsystem

    phonon

    plasma-framework

    threadweaver

  buildInputs = [

    curl

    fftw

    ffmpeg

    gdk-pixbuf

    libaio

    liblastfm

    libmtp

    libsysprof-capture

    libunwind

    loudmouth

    lz4

    lzo
@@ -95,15 +54,52 @@ stdenv.mkDerivation (finalAttrs: { 
    snappy

    taglib

    taglib_extras

    breeze-icons

  ];

  ]

  ++ (with kdePackages; [

    qca

    qt5compat

    qtbase

    qtdeclarative

    qtwebengine

    kcmutils

    kcoreaddons

    kdnssd

    kio

    kpackage

    kstatusnotifieritem

    ktexteditor

    threadweaver

  ])

  ++ (with gst_all_1; [

    gstreamer

    gst-plugins-base

    gst-plugins-good

  ]);



  nativeBuildInputs = [

    cmake

    pkg-config

  ]

  ++ (with kdePackages; [

    extra-cmake-modules

    kdoctools

    qttools

    wrapQtAppsHook

  ]);



  env.LANG = "C.UTF-8";



  enableParallelBuilding = true;

  postInstall = ''

    qtWrapperArgs+=(

      --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"

    )

  '';



  meta = with lib; {

  meta = {

    homepage = "https://amarok.kde.org";

    description = "Powerful music player with an intuitive interface";

    license = licenses.gpl2Plus;

    maintainers = with maintainers; [ peterhoeg ];

    license = lib.licenses.gpl2Plus;

    maintainers = with lib.maintainers; [ ];

    mainProgram = "amarok";

  };

})

pkgs/top-level/all-packages.nix

+0 −3
Original line number Diff line number Diff line
@@ -11579,9 +11579,6 @@ with pkgs; 


  airwave = libsForQt5.callPackage ../applications/audio/airwave { };



  amarok = libsForQt5.callPackage ../applications/audio/amarok { };

  amarok-kf5 = amarok; # for compatibility



  androidStudioPackages = recurseIntoAttrs (callPackage ../applications/editors/android-studio { });

  android-studio = androidStudioPackages.stable;

  android-studio-full = android-studio.full;