diff options
author | symphorien <symphorien@users.noreply.github.com> | 2018-03-12 21:43:02 +0000 |
---|---|---|
committer | Franz Pletz <fpletz@fnordicwalking.de> | 2018-03-12 21:43:02 +0000 |
commit | 991e5ca486544a46eba957915902b9baa57896b1 (patch) | |
tree | 2e2cabb87d0505590f28f0c5c3705f2a0c54f117 /pkgs/applications/editors/wxhexeditor | |
parent | 07f908f56fb1e8a5bc44b83b10a4d95ae10d112e (diff) |
wxhexeditor: 0.22 -> 0.24 (#36832)
Diffstat (limited to 'pkgs/applications/editors/wxhexeditor')
-rw-r--r-- | pkgs/applications/editors/wxhexeditor/default.nix | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/pkgs/applications/editors/wxhexeditor/default.nix b/pkgs/applications/editors/wxhexeditor/default.nix index ad294480e60b7..85d9b0546d625 100644 --- a/pkgs/applications/editors/wxhexeditor/default.nix +++ b/pkgs/applications/editors/wxhexeditor/default.nix @@ -1,25 +1,35 @@ -{ stdenv, fetchurl, wxGTK, autoconf, automake, libtool, python, gettext, bash }: +{ stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python, gettext, bash }: stdenv.mkDerivation rec { name = "wxHexEditor-${version}"; - version = "v0.22"; + version = "v0.24"; - src = fetchurl { - url = "mirror://sourceforge/wxhexeditor/${name}-src.tar.bz2"; - sha256 = "15ir038g4lyw1q5bsay974hvj0nkg2yd9kccwxz808cd45fp411w"; + src = fetchFromGitHub { + repo = "wxHexEditor"; + owner = "EUA"; + rev = version; + sha256 = "08xnhaif8syv1fa0k6lc3jm7yg2k50b02lyds8w0jyzh4xi5crqj"; }; buildInputs = [ wxGTK autoconf automake libtool python gettext ]; - patchPhase = '' - substituteInPlace Makefile --replace "/usr/local" "$out" + preConfigure = "patchShebangs ."; + + prePatch = '' + substituteInPlace Makefile --replace "/usr" "$out" substituteInPlace Makefile --replace "mhash; ./configure" "mhash; ./configure --prefix=$out" - substituteInPlace udis86/autogen.sh --replace "/bin/bash" "${bash}/bin/bash" ''; + patches = [ + # https://github.com/EUA/wxHexEditor/issues/90 + (fetchpatch { + url = https://github.com/EUA/wxHexEditor/commit/d0fa3ddc3e9dc9b05f90b650991ef134f74eed01.patch; + sha256 = "1wcb70hrnhq72frj89prcqylpqs74xrfz3kdfdkq84p5qfz9svyj"; + }) + ]; + buildPhase = '' make OPTFLAGS="-fopenmp" - ''; meta = { |