From 7c9778ff076a2f9fe22e018943f228f72a2b0dd4 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 13 Apr 2023 10:56:11 +0300 Subject: [PATCH] xmp: minor cleanup --- pkgs/applications/audio/xmp/default.nix | 14 +++++++------- pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/audio/xmp/default.nix b/pkgs/applications/audio/xmp/default.nix index 14d425f688f..ae8a27f3248 100644 --- a/pkgs/applications/audio/xmp/default.nix +++ b/pkgs/applications/audio/xmp/default.nix @@ -4,13 +4,6 @@ stdenv.mkDerivation rec { pname = "xmp"; version = "4.1.0"; - meta = with lib; { - description = "Extended module player"; - homepage = "https://xmp.sourceforge.net/"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - }; - src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}/${pname}-${version}.tar.gz"; sha256 = "17i8fc7x7yn3z1x963xp9iv108gxfakxmdgmpv3mlm438w3n3g8x"; @@ -20,4 +13,11 @@ stdenv.mkDerivation rec { buildInputs = [ libxmp ] ++ lib.optionals stdenv.isLinux [ alsa-lib ] ++ lib.optionals stdenv.isDarwin [ AudioUnit CoreAudio ]; + + meta = with lib; { + description = "Extended module player"; + homepage = "https://xmp.sourceforge.net/"; + license = licenses.gpl2Plus; + platforms = platforms.unix; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 19acd6446c3..5d9ce40d4a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35069,8 +35069,7 @@ with pkgs; }; xmp = callPackage ../applications/audio/xmp { - inherit (darwin.apple_sdk.frameworks) AudioUnit; - inherit (darwin.apple_sdk.frameworks) CoreAudio; + inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio; }; xnee = callPackage ../tools/X11/xnee { };