fribidi: fix cross compilation (#64655)

This commit is contained in:
Tadeo Kondrak 2019-08-03 08:27:50 +02:00 committed by Jörg Thalheim
parent 5e32d10aeb
commit 8a604d2dbc

View File

@ -1,7 +1,6 @@
{ stdenv { stdenv
, fetchurl , fetchurl
, fetchpatch , fetchpatch
, meson , meson
, ninja , ninja
, pkgconfig , pkgconfig
@ -10,7 +9,6 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "fribidi"; pname = "fribidi";
version = "1.0.5"; version = "1.0.5";
@ -18,7 +16,7 @@ stdenv.mkDerivation rec {
# NOTE: 2018-06-06 v1.0.5: Only URL tarball has "Have pre-generated man pages: true", which works-around upstream usage of some rare ancient `c2man` fossil application. # NOTE: 2018-06-06 v1.0.5: Only URL tarball has "Have pre-generated man pages: true", which works-around upstream usage of some rare ancient `c2man` fossil application.
src = fetchurl { src = fetchurl {
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.bz2"; url = "https://github.com/fribidi/fribidi/releases/download/v${version}/${pname}-${version}.tar.bz2";
sha256 = "1kp4b1hpx2ky20ixgy2xhj5iygfl7ps5k9kglh1z5i7mhykg4r3a"; sha256 = "1kp4b1hpx2ky20ixgy2xhj5iygfl7ps5k9kglh1z5i7mhykg4r3a";
}; };
@ -33,10 +31,11 @@ stdenv.mkDerivation rec {
patchShebangs test patchShebangs test
''; '';
nativeBuildInputs = [ meson ninja pkgconfig ]; nativeBuildInputs = [ meson ninja pkgconfig ]
buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
checkInptus = [ python3 ]; doCheck = true;
checkInputs = [ python3 ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/fribidi/fribidi; homepage = https://github.com/fribidi/fribidi;