bless: 0.6.2 -> 0.6.3

+20 -35
+20 -35
pkgs/applications/editors/bless/default.nix
··· 1 1 { lib, stdenv 2 2 , fetchFromGitHub 3 - , autoreconfHook 4 3 , pkg-config 5 4 , mono 5 + , meson 6 + , ninja 6 7 , gtk-sharp-2_0 7 8 , gettext 8 9 , makeWrapper 9 10 , glib 10 11 , gtk2-x11 11 - , gnome2 12 + , libxslt 13 + , docbook_xsl 14 + , python3 12 15 }: 13 16 14 17 stdenv.mkDerivation rec { 15 18 pname = "bless"; 16 - version = "0.6.2"; 19 + version = "0.6.3"; 17 20 18 21 src = fetchFromGitHub { 19 22 owner = "afrantzis"; 20 23 repo = pname; 21 24 rev = "v${version}"; 22 - sha256 = "04ra2mcx3pkhzbhcz0zwfmbpqj6cwisrypi6xbc2d6pxd4hdafn1"; 25 + hash = "sha256-rS+vJX0y9v1TiPsRfABroHiTuENQKEOxNsyKwagRuHM="; 23 26 }; 24 27 28 + postPatch = '' 29 + sed "s|get_option('tests')|false|g" -i meson.build 30 + patchShebangs . 31 + ''; 32 + 25 33 buildInputs = [ 26 34 gtk-sharp-2_0 27 35 mono 28 36 # runtime only deps 29 37 glib 30 38 gtk2-x11 31 - gnome2.libglade 32 39 ]; 33 40 34 41 nativeBuildInputs = [ 35 42 pkg-config 36 - autoreconfHook 43 + meson 44 + ninja 37 45 gettext 38 46 makeWrapper 47 + libxslt 48 + docbook_xsl 49 + python3 39 50 ]; 40 51 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 - 67 52 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 + ''; 71 56 72 57 meta = with lib; { 73 58 homepage = "https://github.com/afrantzis/bless";