From c74045c47a51e4edfd143bda8f070694fddcc22d Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 18 Jul 2018 11:40:18 -0500 Subject: gpm: patch to fix w/musl, good for general use --- pkgs/servers/gpm/default.nix | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'pkgs/servers/gpm') diff --git a/pkgs/servers/gpm/default.nix b/pkgs/servers/gpm/default.nix index 3cb0d3931db..7636dca15d8 100644 --- a/pkgs/servers/gpm/default.nix +++ b/pkgs/servers/gpm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, automake, autoconf, libtool, flex, bison, texinfo +{ stdenv, fetchurl, automake, autoconf, libtool, flex, bison, texinfo, fetchpatch # Optional Dependencies , ncurses ? null @@ -13,7 +13,6 @@ stdenv.mkDerivation rec { }; postPatch = '' - sed '1i#include ' -i src/daemon/open_console.c substituteInPlace src/prog/gpm-root.y --replace __sigemptyset sigemptyset ''; @@ -22,6 +21,22 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + patches = [ + # musl compat patches, safe everywhere + (fetchpatch { + url = "https://raw.githubusercontent.com/gentoo/musl/5aed405d87dfa92a5cab1596f898e9dea07169b8/sys-libs/gpm/files/gpm-1.20.7-musl-missing-headers.patch"; + sha256 = "1g338m6j1sba84wlqp1r6rpabj5nm6ki577hjalg46czg0lfp20h"; + }) + # Touches same code as glibc fix in postPatch above, but on the non-glibc route + (fetchpatch { + url = "https://raw.githubusercontent.com/gentoo/musl/5aed405d87dfa92a5cab1596f898e9dea07169b8/sys-libs/gpm/files/gpm-1.20.7-musl-portable-sigaction.patch"; + sha256 = "0hfdqm9977hd5dpzn05y0a6jbj55w1kp4hd9gyzmg9wslmxni4rg"; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/gentoo/musl/5aed405d87dfa92a5cab1596f898e9dea07169b8/sys-libs/gpm/files/gpm-1.20.7-sysmacros.patch"; + sha256 = "0lg4l9phvy2n8gy17qsn6zn0qq52vm8g01pgq5kqpr8sd3fb21c2"; + }) + ]; preConfigure = '' ./autogen.sh ''; -- cgit 1.4.1