diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-29 12:06:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-29 12:06:05 +0000 |
| commit | 5a9b6a3f1a15e110bfef994ced7768096b5e23be (patch) | |
| tree | b7f75f80f4d7fb729735d677bd54c10a9ac13a5c /pkgs/applications/editors | |
| parent | 25c014324ba0657681bec17f25d5f70fc9e411e8 (diff) | |
| parent | e7da834115e855f2a5c802a8ab4c9c8e1a6d97ea (diff) | |
| download | nixpkgs-5a9b6a3f1a15e110bfef994ced7768096b5e23be.tar nixpkgs-5a9b6a3f1a15e110bfef994ced7768096b5e23be.tar.gz nixpkgs-5a9b6a3f1a15e110bfef994ced7768096b5e23be.tar.bz2 nixpkgs-5a9b6a3f1a15e110bfef994ced7768096b5e23be.tar.lz nixpkgs-5a9b6a3f1a15e110bfef994ced7768096b5e23be.tar.xz nixpkgs-5a9b6a3f1a15e110bfef994ced7768096b5e23be.tar.zst nixpkgs-5a9b6a3f1a15e110bfef994ced7768096b5e23be.zip | |
Merge master into staging-next
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 e613747aeab..f79d7279231 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 ]} |