From 0b084cd7afc8fa706026339cb0d0a982377a6397 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 5 May 2022 19:43:05 +0300 Subject: [PATCH 1/3] monkeysAudio: Fix compilation using an older version of gcc Fixes this issue: > /nix/store/...-gcc-11.2.0/include/c++/11.2.0/cmath:1930:1: error: expected declaration before '}' token > 1930 | } // extern "C++" > | ^ --- pkgs/applications/audio/monkeys-audio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/monkeys-audio/default.nix b/pkgs/applications/audio/monkeys-audio/default.nix index 62b63f7e1cab..805513b6a056 100644 --- a/pkgs/applications/audio/monkeys-audio/default.nix +++ b/pkgs/applications/audio/monkeys-audio/default.nix @@ -1,6 +1,6 @@ -{lib, stdenv, fetchurl}: +{lib, gcc10Stdenv, fetchurl}: -stdenv.mkDerivation rec { +gcc10Stdenv.mkDerivation rec { version = "3.99-u4-b5"; pname = "monkeys-audio"; From f8ee62b3dccac88700dbfb5c7650cd718259386b Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 7 May 2022 21:20:50 +0300 Subject: [PATCH 2/3] monkeysAudio: Add -old suffix to pname - to update URL --- pkgs/applications/audio/monkeys-audio/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/monkeys-audio/default.nix b/pkgs/applications/audio/monkeys-audio/default.nix index 805513b6a056..59fe50229814 100644 --- a/pkgs/applications/audio/monkeys-audio/default.nix +++ b/pkgs/applications/audio/monkeys-audio/default.nix @@ -2,11 +2,21 @@ gcc10Stdenv.mkDerivation rec { version = "3.99-u4-b5"; - pname = "monkeys-audio"; + pname = "monkeys-audio-old"; patches = [ ./buildfix.diff ]; src = fetchurl { + /* + The real homepage is , but in fact we are + getting an old, ported to Linux version of the sources, made by (quoting + from the AUTHORS file found in the source): + + Frank Klemm : First port to linux (with makefile) + + SuperMMX : Package the source, include the frontend and shared lib, + porting to Big Endian platform and adding other non-win32 enhancement. + */ url = "https://deb-multimedia.org/pool/main/m/${pname}/${pname}_${version}.orig.tar.gz"; sha256 = "0kjfwzfxfx7f958b2b1kf8yj655lp0ppmn0sh57gbkjvj8lml7nz"; }; From 44a91b715327dc058b30265a9c787da640095f26 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 7 May 2022 21:31:35 +0300 Subject: [PATCH 3/3] monkeysAudio: Update license --- pkgs/applications/audio/monkeys-audio/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/monkeys-audio/default.nix b/pkgs/applications/audio/monkeys-audio/default.nix index 59fe50229814..05647af2201a 100644 --- a/pkgs/applications/audio/monkeys-audio/default.nix +++ b/pkgs/applications/audio/monkeys-audio/default.nix @@ -24,7 +24,10 @@ gcc10Stdenv.mkDerivation rec { meta = with lib; { description = "Lossless audio codec"; platforms = platforms.linux; - license = licenses.lgpl2; + # This is not considered a GPL license, but it seems rather free although + # it's not standard, see a quote of it: + # https://github.com/NixOS/nixpkgs/pull/171682#issuecomment-1120260551 + license = licenses.free; maintainers = [ ]; }; }