From 640036c10ee78ad7cff305c462cb6342a961b58f Mon Sep 17 00:00:00 2001 From: h4rl Date: Mon, 26 May 2025 12:21:36 +0200 Subject: [PATCH 1/2] miniaudio: export miniaudio header --- pkgs/by-name/mi/miniaudio/package.nix | 34 +++++++++++++++++++++------ 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/mi/miniaudio/package.nix b/pkgs/by-name/mi/miniaudio/package.nix index 5f591c1cecba..adece2e438ce 100644 --- a/pkgs/by-name/mi/miniaudio/package.nix +++ b/pkgs/by-name/mi/miniaudio/package.nix @@ -2,32 +2,52 @@ lib, stdenv, fetchFromGitHub, + testers, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "miniaudio"; version = "0.11.22"; src = fetchFromGitHub { owner = "mackron"; repo = "miniaudio"; - rev = version; + rev = finalAttrs.version; hash = "sha256-o/7sfBcrhyXEakccOAogQqm8dO4Szj1QSpaIHg6OSt4="; }; - installPhase = '' - mkdir -p $out - cp -r $src/* $out/ + postInstall = '' + mkdir -p $out/include + mkdir -p $out/lib/pkgconfig + + cp $src/miniaudio.h $out/include + ln -s $out/include/miniaudio.h $out + + cp -r $src/extras $out/ + + cat <$out/lib/pkgconfig/miniaudio.pc + prefix=$out + includedir=$out/include + + Name: miniaudio + Description: An audio playback and capture library in a single source file. + Version: $version + Cflags: -I$out/include + Libs: -lm -lpthread -latomic + EOF ''; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "Single header audio playback and capture library written in C"; homepage = "https://github.com/mackron/miniaudio"; - changelog = "https://github.com/mackron/miniaudio/blob/${src.rev}/CHANGES.md"; + changelog = "https://github.com/mackron/miniaudio/blob/${finalAttrs.version}/CHANGES.md"; license = with licenses; [ unlicense # or mit0 ]; maintainers = [ maintainers.jansol ]; + pkgConfigModules = [ "miniaudio" ]; platforms = platforms.all; }; -} +}) From f29a5f158bbc56a2f84ed13a352c8a2316d3f7b8 Mon Sep 17 00:00:00 2001 From: h4rl Date: Sat, 7 Jun 2025 02:31:42 +0200 Subject: [PATCH 2/2] ja2-stracciatella: mark as broken --- pkgs/by-name/ja/ja2-stracciatella/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ja/ja2-stracciatella/package.nix b/pkgs/by-name/ja/ja2-stracciatella/package.nix index 3fb6f4dea863..5ced41656169 100644 --- a/pkgs/by-name/ja/ja2-stracciatella/package.nix +++ b/pkgs/by-name/ja/ja2-stracciatella/package.nix @@ -101,6 +101,8 @@ stdenv.mkDerivation rec { ''; meta = { + # Fails to build on x86_64-linux as of 2025-03-16 and potentially earlier + broken = true; description = "Jagged Alliance 2, with community fixes"; license = "SFI Source Code license agreement"; homepage = "https://ja2-stracciatella.github.io/";