alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #126643 from veprbl/pr/box2d_liblangtag_darwin_fix

Browse source 
{box2d,liblangtag}: enable on darwin
This commit is contained in:
Michael Raskin 2021-06-12 16:02:59 +00:00 committed by GitHub
parent 0c6186fc78 36a4ae8c05
commit b843a5eab0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/libraries/box2d/default.nix
View file

@ -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;
};
}

27
pkgs/development/libraries/liblangtag/default.nix
View file

@ -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";
};