Merge pull request #247011 from wegank/guile-platforms-2
guile-modules: support more platforms
This commit is contained in:
commit
f53a9adc8f
|
@ -1,6 +1,8 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, autoreconfHook
|
||||
, guile
|
||||
, guile-commonmark
|
||||
, guile-reader
|
||||
|
@ -17,7 +19,24 @@ stdenv.mkDerivation rec {
|
|||
hash = "sha256-vPKLQ9hDJdimEAXwIBGgRRlefM8/77xFQoI+0J/lkNs=";
|
||||
};
|
||||
|
||||
# Symbol not found: inotify_init
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://git.dthompson.us/haunt.git/patch/?id=ab0b722b0719e3370a21359e4d511af9c4f14e60";
|
||||
hash = "sha256-TPNJKGlbDkV9RpdN274qMLoN3HlwfH/yHpxlpqOPw58=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://git.dthompson.us/haunt.git/patch/?id=7d0b71f6a3f0e714da5a5c43e52408e27f44c383";
|
||||
hash = "sha256-CW/h8CqsALKDuKRoN1bd/WEtFTvFj0VxtgmpatyrLm8=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://git.dthompson.us/haunt.git/patch/?id=1a91f3d0568fc095d8b0875c6553ef15b76efa4c";
|
||||
hash = "sha256-+3wUlTuzbyGibAsCiYWKvzPqUrFs7VwdhnADjnPuWIY=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
makeWrapper
|
||||
pkg-config
|
||||
];
|
||||
|
|
|
@ -6,8 +6,6 @@
|
|||
, texinfo
|
||||
}:
|
||||
|
||||
assert stdenv ? cc && stdenv.cc.isGNU;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "guile-lib";
|
||||
version = "0.2.7";
|
||||
|
@ -25,6 +23,8 @@ stdenv.mkDerivation rec {
|
|||
texinfo
|
||||
];
|
||||
|
||||
makeFlags = [ "GUILE_AUTO_COMPILE=0" ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
preCheck = ''
|
||||
|
@ -44,6 +44,6 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ vyp ];
|
||||
platforms = platforms.gnu ++ platforms.linux;
|
||||
platforms = guile.meta.platforms;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -36,6 +36,9 @@ stdenv.mkDerivation rec {
|
|||
done
|
||||
'';
|
||||
|
||||
# Undefined symbols for architecture arm64: "_u32_conv_from_encoding"
|
||||
env.NIX_LDFLAGS = "-lunistring";
|
||||
|
||||
# XXX: 1 of 65 tests failed.
|
||||
doCheck = false;
|
||||
|
||||
|
@ -50,6 +53,6 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
license = licenses.lgpl3Plus;
|
||||
maintainers = with maintainers; [ vyp ];
|
||||
platforms = platforms.gnu ++ platforms.linux;
|
||||
platforms = guile.meta.platforms;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, gperf
|
||||
, guile
|
||||
, guile-lib
|
||||
|
@ -46,6 +45,6 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
license = licenses.lgpl3Plus;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = platforms.gnu;
|
||||
platforms = guile.meta.platforms;
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue