cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #166087 from bobby285271/bless

Browse source 
bless: fix build with meson 0.61
This commit is contained in:
Maciej Krüger 2022-03-29 13:55:18 +02:00 committed by GitHub
commit 827c636b53
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgs/applications/editors/bless/default.nix
View file

@ -1,4 +1,5 @@
{ lib, stdenv { stdenv
, lib
, fetchFromGitHub , fetchFromGitHub
, pkg-config , pkg-config
, mono , mono
@ -12,6 +13,7 @@
, libxslt , libxslt
, docbook_xsl , docbook_xsl
, python3 , python3
, itstool
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -25,11 +27,6 @@ stdenv.mkDerivation rec {
hash = "sha256-rS+vJX0y9v1TiPsRfABroHiTuENQKEOxNsyKwagRuHM="; hash = "sha256-rS+vJX0y9v1TiPsRfABroHiTuENQKEOxNsyKwagRuHM=";
}; };
postPatch = ''
sed "s|get_option('tests')|false|g" -i meson.build
patchShebangs .
'';
buildInputs = [ buildInputs = [
gtk-sharp-2_0 gtk-sharp-2_0
mono mono
@ -47,8 +44,17 @@ stdenv.mkDerivation rec {
libxslt libxslt
docbook_xsl docbook_xsl
python3 python3
itstool
]; ];
mesonFlags = [
"-Dtests=false" # requires NUnit
];
postPatch = ''
patchShebangs .
'';
preFixup = '' preFixup = ''
MPATH="${gtk-sharp-2_0}/lib/mono/gtk-sharp-2.0:${glib.out}/lib:${gtk2-x11}/lib:${gtk-sharp-2_0}/lib" 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 ]} wrapProgram $out/bin/bless --prefix MONO_PATH : "$MPATH" --prefix LD_LIBRARY_PATH : "$MPATH" --prefix PATH : ${lib.makeBinPath [ mono ]}