diff options
| author | Maciej Krüger <mkg20001@gmail.com> | 2022-03-29 13:55:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-29 13:55:18 +0200 |
| commit | 827c636b53725f3a0c7f8f174bf05c42cf493498 (patch) | |
| tree | 99941ce0eab10d0fd563ad148352faca7e5ea89f /pkgs/applications/editors | |
| parent | 3d04846fc729243e214be774d35f18d7d1cac37b (diff) | |
| parent | 0bc4ac64dbdd9549bde7245ed9e5e6a8e28b4ee8 (diff) | |
| download | nixlib-827c636b53725f3a0c7f8f174bf05c42cf493498.tar nixlib-827c636b53725f3a0c7f8f174bf05c42cf493498.tar.gz nixlib-827c636b53725f3a0c7f8f174bf05c42cf493498.tar.bz2 nixlib-827c636b53725f3a0c7f8f174bf05c42cf493498.tar.lz nixlib-827c636b53725f3a0c7f8f174bf05c42cf493498.tar.xz nixlib-827c636b53725f3a0c7f8f174bf05c42cf493498.tar.zst nixlib-827c636b53725f3a0c7f8f174bf05c42cf493498.zip | |
Merge pull request #166087 from bobby285271/bless
bless: fix build with meson 0.61
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/bless/default.nix | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/pkgs/applications/editors/bless/default.nix b/pkgs/applications/editors/bless/default.nix index e613747aeab1..f79d72792317 100644 --- a/pkgs/applications/editors/bless/default.nix +++ b/pkgs/applications/editors/bless/default.nix @@ -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 ]} |