diff options
| author | Nikolay Korotkiy <sikmir@gmail.com> | 2019-09-12 00:18:11 +0300 |
|---|---|---|
| committer | Nikolay Korotkiy <sikmir@gmail.com> | 2019-09-12 10:03:39 +0300 |
| commit | d526e331f82cf8f9592994c20ec4cc7214ca9b7f (patch) | |
| tree | 0716439382bdca7dd475fb112b2415b548685155 /pkgs/applications/misc/xchm/default.nix | |
| parent | 2e47cb88ea081af47df986f17df341ac0265a8a4 (diff) | |
| download | nixpkgs-d526e331f82cf8f9592994c20ec4cc7214ca9b7f.tar nixpkgs-d526e331f82cf8f9592994c20ec4cc7214ca9b7f.tar.gz nixpkgs-d526e331f82cf8f9592994c20ec4cc7214ca9b7f.tar.bz2 nixpkgs-d526e331f82cf8f9592994c20ec4cc7214ca9b7f.tar.lz nixpkgs-d526e331f82cf8f9592994c20ec4cc7214ca9b7f.tar.xz nixpkgs-d526e331f82cf8f9592994c20ec4cc7214ca9b7f.tar.zst nixpkgs-d526e331f82cf8f9592994c20ec4cc7214ca9b7f.zip | |
xchm: 1.23 -> 1.30
Diffstat (limited to 'pkgs/applications/misc/xchm/default.nix')
| -rw-r--r-- | pkgs/applications/misc/xchm/default.nix | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/pkgs/applications/misc/xchm/default.nix b/pkgs/applications/misc/xchm/default.nix index a7a6500fd22..6a5e62f54e1 100644 --- a/pkgs/applications/misc/xchm/default.nix +++ b/pkgs/applications/misc/xchm/default.nix @@ -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; }; } |