Skip to content

Commit

Permalink
Merge pull request #68523 from sikmir/xchm
Browse files Browse the repository at this point in the history
xchm: 1.23 -> 1.30
  • Loading branch information
Ma27 committed Sep 12, 2019
2 parents 99b291c + d526e33 commit 05764a9
Showing 1 changed file with 19 additions and 11 deletions.
30 changes: 19 additions & 11 deletions pkgs/applications/misc/xchm/default.nix
Original file line number Diff line number Diff line change
@@ -1,22 +1,30 @@
{stdenv, fetchurl, wxGTK, chmlib}:
{ stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, chmlib }:

stdenv.mkDerivation {
name = "xchm-1.23";
src = fetchurl {
url = mirror://sourceforge/xchm/xchm-1.23.tar.gz;
sha256 = "0qn0fyxcrn30ndq2asx31k0qkx3grbm16fb1y580wd2gjmh5r3wg";
stdenv.mkDerivation rec {
pname = "xchm";
version = "1.30";

src = fetchFromGitHub {
owner = "rzvncj";
repo = "xCHM";
rev = version;
sha256 = "1sjvh06m8jbb28k6y3knas3nkh1dfvff4mlwjs33x12ilhddhr8v";
};
buildInputs = [wxGTK chmlib];

postConfigure = ''
export NIX_LDFLAGS="$NIX_LDFLAGS $(${wxGTK}/lib/wx/config/* --libs | sed -e s@-pthread@@)"
echo $NIX_LDFLAGS
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ wxGTK30 chmlib ];

configureFlags = [ "--with-wx-prefix=${wxGTK30}" ];

preConfigure = ''
export LDFLAGS="$LDFLAGS $(${wxGTK30}/bin/wx-config --libs | sed -e s@-pthread@@) -lwx_gtk2u_aui-3.0"
'';

meta = with stdenv.lib; {
description = "A viewer for Microsoft HTML Help files";
homepage = http://xchm.sourceforge.net;
homepage = "https://github.com/rzvncj/xCHM";
license = licenses.gpl2;
maintainers = with maintainers; [ sikmir ];
platforms = platforms.linux;
};
}

0 comments on commit 05764a9

Please sign in to comment.