mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 23:20:55 +00:00
Code Issues Wiki Activity

Merge pull request #93634 from sikmir/hyx

Browse source
This commit is contained in:
Jörg Thalheim 2020-08-05 09:17:35 +01:00 committed by GitHub
parent 7b0fd2105c f585a26878
commit 8e2b14aceb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 48 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
pkgs/tools/text/hyx/default.nix
View file

@ -1,14 +1,25 @@
{ lib, stdenv, fetchurl }:
let
# memstream — POSIX memory streams for BSD
memstream = fetchurl {
url = "https://piumarta.com/software/memstream/memstream-0.1.tar.gz";
sha256 = "0kvdb897g7nyviaz72arbqijk2g2wa61cmi3l5yh48rzr49r3a3a";
};
in
stdenv.mkDerivation rec {
name = "hyx-0.1.5";
pname = "hyx";
version = "2020-06-09";
src = fetchurl {
url = "https://yx7.cc/code/hyx/${name}.tar.xz";
sha256 = "0gd8fbdyw12jwffa5dgcql4ry22xbdhqdds1qwzk1rkcrkgnc1mg";
url = "https://yx7.cc/code/hyx/hyx-${lib.replaceStrings [ "-" ] [ "." ] version}.tar.xz";
sha256 = "1x8dmll93hrnj24kn5knpwj36y6r1v2ygwynpjwrg2hwd4c1a8hi";
};
patches = [ ./no-wall-by-default.patch ];
postUnpack = lib.optionalString stdenv.isDarwin ''
tar --strip=1 -C $sourceRoot -xf ${memstream} --wildcards "memstream-0.1/memstream.[hc]"
'';
patches = lib.optional stdenv.isDarwin ./memstream.patch;
installPhase = ''
install -vD hyx $out/bin/hyx
@ -19,6 +30,6 @@ stdenv.mkDerivation rec {
homepage = "https://yx7.cc/code/";
license = licenses.mit;
maintainers = with maintainers; [ fpletz ];
platforms = platforms.linux;
platforms = with platforms; linux ++ darwin;
};
}

31
pkgs/tools/text/hyx/memstream.patch Normal file
View file

@ -0,0 +1,31 @@
diff -Naur hyx-2020.06.09.org/Makefile hyx-2020.06.09/Makefile
--- hyx-2020.06.09.org/Makefile 2020-06-09 15:19:50.000000000 +0300
+++ hyx-2020.06.09/Makefile 2020-07-22 11:46:40.000000000 +0300
@@ -1,6 +1,6 @@
all: CFLAGS ?= -O2 -Wl,-s \
- -Wl,-z,relro,-z,now -fpic -pie -D_FORTIFY_SOURCE=2 -fstack-protector-all
+ -D_FORTIFY_SOURCE=2 -fstack-protector-all
all: CFLAGS += -std=c99 -pedantic -Wall -Wextra -DNDEBUG
all: hyx
@@ -13,7 +13,7 @@
hyx: *.h *.c
$(CC) \
$(CFLAGS) \
- hyx.c common.c blob.c history.c view.c input.c \
+ hyx.c common.c blob.c history.c view.c input.c memstream.c \
-o hyx
clean:
diff -Naur hyx-2020.06.09.org/view.c hyx-2020.06.09/view.c
--- hyx-2020.06.09.org/view.c 2020-06-09 15:19:50.000000000 +0300
+++ hyx-2020.06.09/view.c 2020-07-22 11:49:09.000000000 +0300
@@ -4,6 +4,7 @@
#include "view.h"
#include "input.h"
#include "ansi.h"
+#include "memstream.h"
#include <stdlib.h>
#include <stdio.h>

11
pkgs/tools/text/hyx/no-wall-by-default.patch
View file

@ -1,11 +0,0 @@
--- hyx-0.1.5.org/Makefile 2018-06-02 17:14:37.000000000 +0100
+++ hyx-0.1.5/Makefile 2018-11-10 09:25:49.569961762 +0000
@@ -1,7 +1,7 @@
all: CFLAGS ?= -O2 -Wl,-s \
-Wl,-z,relro,-z,now -fpic -pie -D_FORTIFY_SOURCE=2 -fstack-protector-all
-all: CFLAGS += -std=c99 -pedantic -Wall -Wextra -DNDEBUG
+all: CFLAGS += -std=c99 -DNDEBUG
all: hyx
debug: CFLAGS ?= -O0 -g \