From 24f34c1b90aabda177e156f51242e2df543cf57a Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 11 Jun 2021 23:58:57 -0400 Subject: [PATCH 1/2] box2d: enable on darwin --- pkgs/development/libraries/box2d/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix index 1b6ede9b3101..64349b1e3cf3 100644 --- a/pkgs/development/libraries/box2d/default.nix +++ b/pkgs/development/libraries/box2d/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "2D physics engine"; homepage = "https://box2d.org/"; maintainers = [ maintainers.raskin ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.zlib; }; } From 36a4ae8c05f4c8cd6b83bea0374d9bf98f301c11 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 12 Jun 2021 00:02:12 -0400 Subject: [PATCH 2/2] liblangtag: enable on darwin --- .../libraries/liblangtag/default.nix | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/liblangtag/default.nix b/pkgs/development/libraries/liblangtag/default.nix index 5c31197ebff2..5ba2ecc5d6bc 100644 --- a/pkgs/development/libraries/liblangtag/default.nix +++ b/pkgs/development/libraries/liblangtag/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromBitbucket, autoreconfHook, gtk-doc, gettext +{ lib, stdenv, fetchurl, autoreconfHook, gtk-doc, gettext , pkg-config, glib, libxml2, gobject-introspection, gnome-common, unzip }: @@ -6,11 +6,10 @@ stdenv.mkDerivation rec { pname = "liblangtag"; version = "0.6.3"; - src = fetchFromBitbucket { - owner = "tagoh"; - repo = pname; - rev = version; - sha256 = "10rycs8xrxzf9frzalv3qx8cs1jcildhrr4imzxdmr9f4l585z96"; + # Artifact tarball contains lt-localealias.h needed for darwin + src = fetchurl { + url = "https://bitbucket.org/tagoh/liblangtag/downloads/${pname}-${version}.tar.bz2"; + sha256 = "sha256-HxKiCgLsOo0i5U3tuLaDpDycFgvaG6M3vxBgYHrnM70="; }; core_zip = fetchurl { @@ -31,19 +30,19 @@ stdenv.mkDerivation rec { cp "${language_subtag_registry}" data/language-subtag-registry ''; - configureFlags = [ - "--with-locale-alias=${stdenv.cc.libc}/share/locale/locale.alias" - ]; + configureFlags = + lib.optional + (stdenv.hostPlatform.libc == "glibc") + "--with-locale-alias=${stdenv.cc.libc}/share/locale/locale.alias"; buildInputs = [ gettext glib libxml2 gobject-introspection gnome-common ]; nativeBuildInputs = [ autoreconfHook gtk-doc gettext pkg-config unzip ]; - meta = { - inherit version; + meta = with lib; { description = "An interface library to access tags for identifying languages"; - license = lib.licenses.mpl20; - maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.linux; + license = licenses.mpl20; + maintainers = [ maintainers.raskin ]; + platforms = platforms.unix; # There are links to a homepage that are broken by a BitBucket change homepage = "https://bitbucket.org/tagoh/liblangtag/overview"; };