Merge pull request #18402 from andjscott/mmex

[WIP] Money-Manager-Ex: 0.9.5.1 -> 1.2.7

authored by Jörg Thalheim and committed by GitHub fd1e79aa 34a9ed1f

+20 -18
+9 -15
pkgs/applications/office/mmex/default.nix
··· 1 - # To use this program, copy all that is in $out/opt/mmax into a writable directory, 2 - # and run it from there. This is the intended usage, as far as I understand. 3 4 - { fetchsvn, stdenv, wxGTK }: 5 6 - let version = "0.9.5.1"; 7 in 8 stdenv.mkDerivation { 9 name = "money-manager-ex-${version}"; 10 11 - src = fetchsvn { 12 - url = "https://moneymanagerex.svn.sourceforge.net/svnroot/moneymanagerex/tags/releases/${version}"; 13 - sha256 = "0mby1p01fyxk5pgd7h3919q91r10zbfk16rfz1kbchqxqz87x4jq"; 14 }; 15 16 preConfigure = '' ··· 18 export CXXFLAGS="$CFLAGS" 19 ''; 20 21 - installPhase = '' 22 - mkdir -p $out/opt/mmex 23 - cp -r mmex runtime/{*.txt,*.png,*.db3,en,help,*.wav,*.ico} $out/opt/mmex 24 - ''; 25 - 26 - buildInputs = [ wxGTK ]; 27 28 meta = { 29 description = "Easy-to-use personal finance software"; 30 - homepage = http://www.codelathe.com/mmex; 31 license = stdenv.lib.licenses.gpl2Plus; 32 maintainers = with stdenv.lib.maintainers; [viric]; 33 platforms = with stdenv.lib.platforms; linux; 34 - broken = true; 35 }; 36 }
··· 1 + { stdenv, fetchgit, sqlite, wxGTK30, gettext }: 2 3 4 + let 5 + version = "1.2.7"; 6 in 7 stdenv.mkDerivation { 8 name = "money-manager-ex-${version}"; 9 10 + src = fetchgit { 11 + url = "https://github.com/moneymanagerex/moneymanagerex.git"; 12 + rev = "refs/tags/v${version}"; 13 + sha256 = "0d6jcsj3m3b9mj68vfwr7dn67dws11p0pdys3spyyiv1464vmywi"; 14 }; 15 16 preConfigure = '' ··· 18 export CXXFLAGS="$CFLAGS" 19 ''; 20 21 + buildInputs = [ sqlite wxGTK30 gettext ]; 22 23 meta = { 24 description = "Easy-to-use personal finance software"; 25 + homepage = http://www.moneymanagerex.org/; 26 license = stdenv.lib.licenses.gpl2Plus; 27 maintainers = with stdenv.lib.maintainers; [viric]; 28 platforms = with stdenv.lib.platforms; linux; 29 }; 30 }
+8 -2
pkgs/development/libraries/wxGTK-3.0/default.nix
··· 1 { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto 2 , gstreamer, gst_plugins_base, GConf, setfile 3 - , withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true, 4 }: 5 6 assert withMesa -> mesa != null; 7 8 with stdenv.lib; 9 ··· 22 [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer 23 gst_plugins_base GConf ] 24 ++ optional withMesa mesa 25 ++ optional stdenv.isDarwin setfile; 26 27 nativeBuildInputs = [ pkgconfig ]; ··· 34 ++ optional withMesa "--with-opengl" 35 ++ optionals stdenv.isDarwin 36 # allow building on 64-bit 37 - [ "--with-cocoa" "--enable-universal-binaries" ]; 38 39 SEARCH_LIB = optionalString withMesa "${mesa}/lib"; 40
··· 1 { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto 2 , gstreamer, gst_plugins_base, GConf, setfile 3 + , withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true 4 + , withWebKit ? false, webkitgtk2 ? null 5 }: 6 7 + 8 assert withMesa -> mesa != null; 9 + assert withWebKit -> webkitgtk2 != null; 10 11 with stdenv.lib; 12 ··· 25 [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer 26 gst_plugins_base GConf ] 27 ++ optional withMesa mesa 28 + ++ optional withWebKit webkitgtk2 29 ++ optional stdenv.isDarwin setfile; 30 31 nativeBuildInputs = [ pkgconfig ]; ··· 38 ++ optional withMesa "--with-opengl" 39 ++ optionals stdenv.isDarwin 40 # allow building on 64-bit 41 + [ "--with-cocoa" "--enable-universal-binaries" ] 42 + ++ optionals withWebKit 43 + ["--enable-webview" "--enable-webview-webkit"]; 44 45 SEARCH_LIB = optionalString withMesa "${mesa}/lib"; 46
+3 -1
pkgs/top-level/all-packages.nix
··· 13637 13638 MMA = callPackage ../applications/audio/MMA { }; 13639 13640 - mmex = callPackage ../applications/office/mmex { }; 13641 13642 moc = callPackage ../applications/audio/moc { 13643 ffmpeg = ffmpeg_2;
··· 13637 13638 MMA = callPackage ../applications/audio/MMA { }; 13639 13640 + mmex = callPackage ../applications/office/mmex { 13641 + wxGTK30 = wxGTK30.override { withWebKit = true ; }; 13642 + }; 13643 13644 moc = callPackage ../applications/audio/moc { 13645 ffmpeg = ffmpeg_2;