git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #123532 from mkg20001/blessfix

bless: 0.6.2 -> 0.6.3

commit40f26dfd652647880a6ec5b7d2f61acf47ff534f authorMaciej Krüger <mkg20001@gmail.com> dateTue 18 May 2021, 18:07 (6 years ago) parent3e6d8a721ac357
1 file changed+20−35
pkgs/applications/editors/bless/default.nix+20−35
pkgs/applications/editors/bless/default.nix+20−35
@@ -1,73 +1,58 @@
11{ lib, stdenv
22, fetchFromGitHub
3−, autoreconfHook
43, pkg-config
54, mono
5+, meson
6+, ninja
67, gtk-sharp-2_0
78, gettext
89, makeWrapper
910, glib
1011, gtk2-x11
11−, gnome2
12+, libxslt
13+, docbook_xsl
14+, python3
1215}:
1316
1417stdenv.mkDerivation rec {
1518 pname = "bless";
16− version = "0.6.2";
19+ version = "0.6.3";
1720
1821 src = fetchFromGitHub {
1922 owner = "afrantzis";
2023 repo = pname;
2124 rev = "v${version}";
22− sha256 = "04ra2mcx3pkhzbhcz0zwfmbpqj6cwisrypi6xbc2d6pxd4hdafn1";
25+ hash = "sha256-rS+vJX0y9v1TiPsRfABroHiTuENQKEOxNsyKwagRuHM=";
2326 };
2427
28+ postPatch = ''
29+ sed "s|get_option('tests')|false|g" -i meson.build
30+ patchShebangs .
31+ '';
32+
2533 buildInputs = [
2634 gtk-sharp-2_0
2735 mono
2836 # runtime only deps
2937 glib
3038 gtk2-x11
31− gnome2.libglade
3239 ];
3340
3441 nativeBuildInputs = [
3542 pkg-config
36− autoreconfHook
43+ meson
44+ ninja
3745 gettext
3846 makeWrapper
47+ libxslt
48+ docbook_xsl
49+ python3
3950 ];
4051
41− configureFlags = [
42− # scrollkeeper is a gnome2 package, so it must be old and we shouldn't really support it
43− # NOTE: that sadly doesn't turn off the compilation of the manual with scrollkeeper, so we have to fake the binaries below
44− "--without-scrollkeeper"
45− ];
46−
47− autoreconfPhase = ''
48− mkdir _bin
49−
50− # this fakes the scrollkeeper commands, to keep the build happy
51− for f in scrollkeeper-preinstall scrollkeeper-update; do
52− echo "true" > ./_bin/$f
53− chmod +x ./_bin/$f
54− done
55−
56− export PATH="$PWD/_bin:$PATH"
57−
58− # and it also wants to install that file
59− touch ./doc/user/bless-manual.omf
60−
61− # patch mono path
62− sed "s|^mono|${mono}/bin/mono|g" -i src/bless-script.in
63−
64− ./autogen.sh
65− '';
66−
6752 preFixup = ''
68− 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"
69− wrapProgram $out/bin/bless --prefix MONO_PATH : "$MPATH" --prefix LD_LIBRARY_PATH : "$MPATH"
70− '';
53+ MPATH="${gtk-sharp-2_0}/lib/mono/gtk-sharp-2.0:${glib.out}/lib:${gtk2-x11}/lib:${gtk-sharp-2_0}/lib"
54+ wrapProgram $out/bin/bless --prefix MONO_PATH : "$MPATH" --prefix LD_LIBRARY_PATH : "$MPATH" --prefix PATH : ${lib.makeBinPath [ mono ]}
55+ '';
7156
7257 meta = with lib; {
7358 homepage = "https://github.com/afrantzis/bless";