Merge pull request #166087 from bobby285271/bless
bless: fix build with meson 0.61
This commit is contained in:
commit
827c636b53
|
@ -1,4 +1,5 @@
|
|||
{ lib, stdenv
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, mono
|
||||
|
@ -12,6 +13,7 @@
|
|||
, libxslt
|
||||
, docbook_xsl
|
||||
, python3
|
||||
, itstool
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -25,11 +27,6 @@ stdenv.mkDerivation rec {
|
|||
hash = "sha256-rS+vJX0y9v1TiPsRfABroHiTuENQKEOxNsyKwagRuHM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed "s|get_option('tests')|false|g" -i meson.build
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
gtk-sharp-2_0
|
||||
mono
|
||||
|
@ -47,8 +44,17 @@ stdenv.mkDerivation rec {
|
|||
libxslt
|
||||
docbook_xsl
|
||||
python3
|
||||
itstool
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dtests=false" # requires NUnit
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
MPATH="${gtk-sharp-2_0}/lib/mono/gtk-sharp-2.0:${glib.out}/lib:${gtk2-x11}/lib:${gtk-sharp-2_0}/lib"
|
||||
wrapProgram $out/bin/bless --prefix MONO_PATH : "$MPATH" --prefix LD_LIBRARY_PATH : "$MPATH" --prefix PATH : ${lib.makeBinPath [ mono ]}
|
||||
|
|
Loading…
Reference in a new issue