From c449a67e0176b5fc0027ace17d6d6b58a5b43b0c Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Thu, 4 Jul 2013 14:58:32 +1000 Subject: [PATCH] libmikmod: fix build on darwin * build with gccApple --- pkgs/development/libraries/libmikmod/default.nix | 12 +++++++----- pkgs/top-level/all-packages.nix | 7 ++++++- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libmikmod/default.nix b/pkgs/development/libraries/libmikmod/default.nix index cde3aecce078..8ef95650ce68 100644 --- a/pkgs/development/libraries/libmikmod/default.nix +++ b/pkgs/development/libraries/libmikmod/default.nix @@ -6,15 +6,17 @@ stdenv.mkDerivation rec { sha256 = "07k6iyx6pyzisncgdkd071w2dhm3rx6l34hbja3wbc7rpf888k3k"; }; buildInputs = [ texinfo ]; - meta = { + + meta = with stdenv.lib; { description = "A library for playing tracker music module files"; + homepage = http://mikmod.shlomifish.org/; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ astsmtl lovek323 ]; + platforms = platforms.unix; + longDescription = '' A library for playing tracker music module files supporting many formats, including MOD, S3M, IT and XM. ''; - homepage = http://mikmod.shlomifish.org/; - license = "LGPLv2+"; - maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e063024c0c56..66116c1266a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4676,7 +4676,12 @@ let libmicrohttpd = callPackage ../development/libraries/libmicrohttpd { }; - libmikmod = callPackage ../development/libraries/libmikmod { }; + libmikmod = callPackage ../development/libraries/libmikmod { + # resolve the "stray '@' in program" errors + stdenv = if stdenv.isDarwin + then overrideGCC stdenv gccApple + else stdenv; + }; libmilter = callPackage ../development/libraries/libmilter { };