diff options
author | Maciej Krüger <mkg20001@gmail.com> | 2021-05-18 18:07:55 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-18 18:07:55 +0200 |
commit | 40f26dfd652647880a6ec5b7d2f61acf47ff534f (patch) | |
tree | 0ef795201dd234fa662db652e26b7d74767d63e2 /pkgs/applications | |
parent | 3e6d8a74afc0114e38840e0937fbe9ff5cc65a7d (diff) | |
parent | 21ac35737efe9cb4ec285733671cf88b73f6dd14 (diff) | |
download | nixpkgs-40f26dfd652647880a6ec5b7d2f61acf47ff534f.tar nixpkgs-40f26dfd652647880a6ec5b7d2f61acf47ff534f.tar.gz nixpkgs-40f26dfd652647880a6ec5b7d2f61acf47ff534f.tar.bz2 nixpkgs-40f26dfd652647880a6ec5b7d2f61acf47ff534f.tar.lz nixpkgs-40f26dfd652647880a6ec5b7d2f61acf47ff534f.tar.xz nixpkgs-40f26dfd652647880a6ec5b7d2f61acf47ff534f.tar.zst nixpkgs-40f26dfd652647880a6ec5b7d2f61acf47ff534f.zip |
Merge pull request #123532 from mkg20001/blessfix
bless: 0.6.2 -> 0.6.3
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/editors/bless/default.nix | 55 |
1 files changed, 20 insertions, 35 deletions
diff --git a/pkgs/applications/editors/bless/default.nix b/pkgs/applications/editors/bless/default.nix index 24fc8440bbd..e613747aeab 100644 --- a/pkgs/applications/editors/bless/default.nix +++ b/pkgs/applications/editors/bless/default.nix @@ -1,73 +1,58 @@ { lib, stdenv , fetchFromGitHub -, autoreconfHook , pkg-config , mono +, meson +, ninja , gtk-sharp-2_0 , gettext , makeWrapper , glib , gtk2-x11 -, gnome2 +, libxslt +, docbook_xsl +, python3 }: stdenv.mkDerivation rec { pname = "bless"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "afrantzis"; repo = pname; rev = "v${version}"; - sha256 = "04ra2mcx3pkhzbhcz0zwfmbpqj6cwisrypi6xbc2d6pxd4hdafn1"; + hash = "sha256-rS+vJX0y9v1TiPsRfABroHiTuENQKEOxNsyKwagRuHM="; }; + postPatch = '' + sed "s|get_option('tests')|false|g" -i meson.build + patchShebangs . + ''; + buildInputs = [ gtk-sharp-2_0 mono # runtime only deps glib gtk2-x11 - gnome2.libglade ]; nativeBuildInputs = [ pkg-config - autoreconfHook + meson + ninja gettext makeWrapper + libxslt + docbook_xsl + python3 ]; - configureFlags = [ - # scrollkeeper is a gnome2 package, so it must be old and we shouldn't really support it - # NOTE: that sadly doesn't turn off the compilation of the manual with scrollkeeper, so we have to fake the binaries below - "--without-scrollkeeper" - ]; - - autoreconfPhase = '' - mkdir _bin - - # this fakes the scrollkeeper commands, to keep the build happy - for f in scrollkeeper-preinstall scrollkeeper-update; do - echo "true" > ./_bin/$f - chmod +x ./_bin/$f - done - - export PATH="$PWD/_bin:$PATH" - - # and it also wants to install that file - touch ./doc/user/bless-manual.omf - - # patch mono path - sed "s|^mono|${mono}/bin/mono|g" -i src/bless-script.in - - ./autogen.sh - ''; - preFixup = '' - MPATH="${gtk-sharp-2_0}/lib/mono/gtk-sharp-2.0:${glib.out}/lib:${gtk2-x11}/lib:${gnome2.libglade}/lib:${gtk-sharp-2_0}/lib" - wrapProgram $out/bin/bless --prefix MONO_PATH : "$MPATH" --prefix LD_LIBRARY_PATH : "$MPATH" - ''; + 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 ]} + ''; meta = with lib; { homepage = "https://github.com/afrantzis/bless"; |