diff options
Diffstat (limited to 'pkgs/applications/editors/poke/default.nix')
| -rw-r--r-- | pkgs/applications/editors/poke/default.nix | 69 |
1 files changed, 23 insertions, 46 deletions
diff --git a/pkgs/applications/editors/poke/default.nix b/pkgs/applications/editors/poke/default.nix index 4d715d8c7cc4d..604758d0df5ae 100644 --- a/pkgs/applications/editors/poke/default.nix +++ b/pkgs/applications/editors/poke/default.nix @@ -1,37 +1,35 @@ { lib , stdenv , fetchurl -, gettext , help2man , pkg-config , texinfo , boehmgc , readline -, guiSupport ? false, makeWrapper, tcl, tcllib, tk -, miSupport ? true, json_c , nbdSupport ? !stdenv.isDarwin, libnbd -, textStylingSupport ? true +, textStylingSupport ? true, gettext , dejagnu -# update script only + # update script only , writeScript }: let isCross = stdenv.hostPlatform != stdenv.buildPlatform; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation (finalAttrs: { pname = "poke"; - version = "3.2"; + version = "4.1"; src = fetchurl { - url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-dY5VHdU6bM5U7JTY/CH6TWtSon0cJmcgbVmezcdPDZc="; + url = "mirror://gnu/poke/poke-${finalAttrs.version}.tar.gz"; + hash = "sha256-COyupB9zdKzUI44Su/l+jNXlctWRfpVrc7nUMCbp10A="; }; outputs = [ "out" "dev" "info" "lib" ] - # help2man can't cross compile because it runs `poke --help` to - # generate the man page - ++ lib.optional (!isCross) "man"; + # help2man can't cross compile because it runs `poke --help` to + # generate the man page + ++ lib.optional (!isCross) "man"; postPatch = '' patchShebangs . @@ -40,53 +38,33 @@ in stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ - gettext pkg-config texinfo ] ++ lib.optionals (!isCross) [ help2man - ] ++ lib.optionals guiSupport [ - makeWrapper - tcl.tclPackageHook ]; buildInputs = [ boehmgc readline ] - ++ lib.optionals guiSupport [ tcl tcllib tk ] - ++ lib.optional miSupport json_c - ++ lib.optional nbdSupport libnbd - ++ lib.optional textStylingSupport gettext - ++ lib.optional (!isCross) dejagnu; + ++ lib.optional nbdSupport libnbd + ++ lib.optional textStylingSupport gettext + ++ lib.optional finalAttrs.finalPackage.doCheck dejagnu; configureFlags = [ # libpoke depends on $datadir/poke, so we specify the datadir in # $lib, and later move anything else it doesn't depend on to $out "--datadir=${placeholder "lib"}/share" - ] ++ lib.optionals guiSupport [ - "--enable-gui" - "--with-tcl=${tcl}/lib" - "--with-tk=${tk}/lib" - "--with-tkinclude=${tk.dev}/include" ]; enableParallelBuilding = true; - doCheck = !isCross; - nativeCheckInputs = lib.optionals (!isCross) [ dejagnu ]; + doCheck = true; + nativeCheckInputs = [ dejagnu ]; postInstall = '' moveToOutput share/emacs "$out" moveToOutput share/vim "$out" ''; - # Prevent tclPackageHook from auto-wrapping all binaries, we only - # need to wrap poke-gui - dontWrapTclBinaries = true; - - postFixup = lib.optionalString guiSupport '' - wrapProgram "$out/bin/poke-gui" \ - --prefix TCLLIBPATH ' ' "$TCLLIBPATH" - ''; - passthru = { updateScript = writeScript "update-poke" '' #!/usr/bin/env nix-shell @@ -97,18 +75,17 @@ in stdenv.mkDerivation rec { # Expect the text in format of '<a href="...">poke 2.0</a>' new_version="$(curl -s https://www.jemarch.net/poke | pcregrep -o1 '>poke ([0-9.]+)</a>')" - update-source-version ${pname} "$new_version" + update-source-version poke "$new_version" ''; }; - meta = with lib; { + meta = { description = "Interactive, extensible editor for binary data"; homepage = "http://www.jemarch.net/poke"; - changelog = "https://git.savannah.gnu.org/cgit/poke.git/plain/ChangeLog?h=releases/poke-${version}"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ AndersonTorres kira-bruneau ]; - platforms = platforms.unix; + changelog = "https://git.savannah.gnu.org/cgit/poke.git/plain/ChangeLog?h=releases/poke-${finalAttrs.version}"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ AndersonTorres kira-bruneau ]; + platforms = lib.platforms.unix; + broken = stdenv.isDarwin && stdenv.isAarch64; }; -} - -# TODO: Enable guiSupport by default once it's more than just a stub +}) |