Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 07f908f56fb1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 991e5ca48654
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Mar 12, 2018

  1. wxhexeditor: 0.22 -> 0.24 (#36832)

    @symphorien @fpletz
    symphorien authored and fpletz committed Mar 12, 2018
    Copy the full SHA
    991e5ca View commit details
Showing with 22 additions and 10 deletions.
  1. +19 −9 pkgs/applications/editors/wxhexeditor/default.nix
  2. +3 −1 pkgs/top-level/all-packages.nix
28 changes: 19 additions & 9 deletions pkgs/applications/editors/wxhexeditor/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 = {
4 changes: 3 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -18289,7 +18289,9 @@ with pkgs;

wtftw = callPackage ../applications/window-managers/wtftw {};

wxhexeditor = callPackage ../applications/editors/wxhexeditor { };
wxhexeditor = callPackage ../applications/editors/wxhexeditor {
wxGTK = wxGTK31;
};

wxcam = callPackage ../applications/video/wxcam {
inherit (gnome2) libglade;