Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs

Conflicts:
	nixpkgs/nixos/modules/config/console.nix
	nixpkgs/nixos/modules/services/mail/mailman.nix
	nixpkgs/nixos/modules/services/mail/public-inbox.nix
	nixpkgs/nixos/modules/services/mail/rss2email.nix
	nixpkgs/nixos/modules/services/networking/ssh/sshd.nix
	nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix
	nixpkgs/pkgs/applications/networking/irc/weechat/default.nix
	nixpkgs/pkgs/applications/window-managers/sway/default.nix
	nixpkgs/pkgs/build-support/go/module.nix
	nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
	nixpkgs/pkgs/development/interpreters/python/default.nix
	nixpkgs/pkgs/development/node-packages/overrides.nix
	nixpkgs/pkgs/development/tools/b4/default.nix
	nixpkgs/pkgs/servers/dict/dictd-db.nix
	nixpkgs/pkgs/servers/mail/public-inbox/default.nix
	nixpkgs/pkgs/tools/security/pinentry/default.nix
	nixpkgs/pkgs/tools/text/unoconv/default.nix
	nixpkgs/pkgs/top-level/all-packages.nix

1 files changed, 69 insertions, 0 deletions

diff --git a/nixpkgs/pkgs/development/libraries/zmusic/default.nix b/nixpkgs/pkgs/development/libraries/zmusic/default.nix
new file mode 100644
index 000000000000..e950c6ed3d7f
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/zmusic/default.nix
@@ -0,0 +1,69 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, fetchpatch
+, alsa-lib
+, cmake
+, fluidsynth
+, libsndfile
+, mpg123
+, ninja
+, pkg-config
+, soundfont-fluid
+, zlib
+}:
+
+stdenv.mkDerivation rec {
+  pname = "zmusic";
+  version = "1.1.12";
+
+  src = fetchFromGitHub {
+    owner = "ZDoom";
+    repo = "ZMusic";
+    rev = version;
+    hash = "sha256-waxgn4Dg8One2Hv7J2efMoYo5mmaMSMiPQSNq57kbvE=";
+  };
+
+  outputs = [ "out" "dev" ];
+
+  patches = [
+    (fetchpatch {
+      name = "system-fluidsynth.patch";
+      url = "https://git.alpinelinux.org/aports/plain/testing/zmusic/system-fluidsynth.patch?id=59bac94da374cb01bc2a0e49d9e9287812fa1ac0";
+      hash = "sha256-xKaqiNk1Kt9yNLB22IVmSEtGeOtxrCi7YtFCmhNr0MI=";
+    })
+  ];
+
+  postPatch = ''
+    substituteInPlace source/mididevices/music_fluidsynth_mididevice.cpp \
+      --replace "/usr/share/sounds/sf2" "${soundfont-fluid}/share/soundfonts" \
+      --replace "FluidR3_GM.sf2" "FluidR3_GM2-2.sf2"
+  '';
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+    pkg-config
+  ];
+
+  buildInputs = [
+    alsa-lib
+    fluidsynth
+    libsndfile
+    mpg123
+    zlib
+  ];
+
+  meta = with lib; {
+    description = "GZDoom's music system as a standalone library";
+    homepage = "https://github.com/ZDoom/ZMusic";
+    license = with licenses; [
+      free
+      gpl3Plus
+      lgpl21Plus
+      lgpl3Plus
+    ];
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ azahi lassulus ];
+  };
+}