Skip to content

Commit

Permalink
gpm: fix static build
Browse files Browse the repository at this point in the history
Patch I developed to add support for static build into upstream build system do
not apply cleanly on 1.20.7 release, so instead of backporting it, I decided to
switch to git snapshot instead.  It allowed to get rid of three other patches
in nix expression, since they are applied upstream.
=> telmich/gpm#42

I requested proper release, but chance seems to be slim.
=> telmich/gpm#33
  • Loading branch information
Dmitry Bogatov committed Nov 6, 2021
1 parent dc7c656 commit 993b7b9
Showing 1 changed file with 14 additions and 25 deletions.
39 changes: 14 additions & 25 deletions pkgs/servers/gpm/default.nix
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
{ lib, stdenv, fetchurl, automake, autoconf, libtool, flex, bison, texinfo, fetchpatch
{ lib, stdenv, fetchFromGitHub, automake, autoconf, libtool, flex, bison, texinfo, fetchpatch, pkgsStatic

# Optional Dependencies
, ncurses ? null
}:

stdenv.mkDerivation rec {
pname = "gpm";
version = "1.20.7";

src = fetchurl {
url = "https://www.nico.schottelius.org/software/gpm/archives/gpm-${version}.tar.bz2";
sha256 = "13d426a8h403ckpc8zyf7s2p5rql0lqbg2bv0454x0pvgbfbf4gh";
pname = "gpm-unstable";
version = "2020-06-17";

src = fetchFromGitHub {
owner = "telmich";
repo = "gpm";
rev = "e82d1a653ca94aa4ed12441424da6ce780b1e530";
sha256 = "0ndn6dwc87slvyqp2cnbb02a6hkjwb6zjhs6viysykv06hq7ihy6";
};

postPatch = ''
Expand All @@ -23,24 +25,9 @@ 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";
})
(fetchpatch {
# upstream build fix against -fno-common compilers like >=gcc-10
url = "https://github.com/telmich/gpm/commit/f04f24dd5ca5c1c13608b144ab66e2ccd47f106a.patch";
sha256 = "1q5hl5m61pci2f0x7r5in99rmqh328v1k0zj2693wdlafk9dabks";
(fetchpatch { # pull request telmich/gpm#42
url = "https://github.com/kaction/gpm/commit/217b4fe4c9b62298a4e9a54c1f07e3b52b013a09.patch";
sha256 = "1f74h12iph4z1dldbxk9imcq11805c3ai2xhbsqvx8jpjrcfp19q";
})
];
preConfigure = ''
Expand All @@ -51,13 +38,15 @@ stdenv.mkDerivation rec {
"--sysconfdir=/etc"
"--localstatedir=/var"
(if ncurses == null then "--without-curses" else "--with-curses")
(if stdenv.hostPlatform.isStatic then "--enable-shared=no" else "--enable-shared=yes")
];

# Provide libgpm.so for compatability
postInstall = ''
ln -sv $out/lib/libgpm.so.2 $out/lib/libgpm.so
'';

passthru.tests.static = pkgsStatic.gpm;
meta = with lib; {
homepage = "https://www.nico.schottelius.org/software/gpm/";
description = "A daemon that provides mouse support on the Linux console";
Expand Down

0 comments on commit 993b7b9

Please sign in to comment.