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: d7d31fea7e7e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ac551299e80c
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 19, 2018

  1. gpm: patch to fix w/musl, good for general use

    @dtzWill
    dtzWill committed Jul 19, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c74045c View commit details

  2. Merge pull request #43759 from dtzWill/fix/gpm-musl 

    gpm: patch to fix w/musl, good for general use
    @dtzWill
    dtzWill authored Jul 19, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ac55129 View commit details
Showing with 17 additions and 2 deletions.
  1. +17 −2 pkgs/servers/gpm/default.nix
19 changes: 17 additions & 2 deletions pkgs/servers/gpm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 <sys/types.h>' -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
'';