diff options
author | Peter Hoeg <peter@hoeg.com> | 2020-08-05 11:25:36 +0800 |
---|---|---|
committer | Peter Hoeg <peter@hoeg.com> | 2020-08-05 11:25:36 +0800 |
commit | 7b6960156f6ef7592aecb8015eee4f8b0b166bdf (patch) | |
tree | 84781a1c23417b15c28c6a42489735dc94c6ee42 | |
parent | c94378d121565e8b0e3a5bfe572e33f9d1df7af7 (diff) | |
download | nixpkgs-7b6960156f6ef7592aecb8015eee4f8b0b166bdf.tar nixpkgs-7b6960156f6ef7592aecb8015eee4f8b0b166bdf.tar.gz nixpkgs-7b6960156f6ef7592aecb8015eee4f8b0b166bdf.tar.bz2 nixpkgs-7b6960156f6ef7592aecb8015eee4f8b0b166bdf.tar.lz nixpkgs-7b6960156f6ef7592aecb8015eee4f8b0b166bdf.tar.xz nixpkgs-7b6960156f6ef7592aecb8015eee4f8b0b166bdf.tar.zst nixpkgs-7b6960156f6ef7592aecb8015eee4f8b0b166bdf.zip |
kmscon: 8 -> unstable-2018-09-07
-rw-r--r-- | pkgs/os-specific/linux/kmscon/default.nix | 43 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kmscon/kmscon-8-glibc-2.26.patch | 25 |
2 files changed, 22 insertions, 46 deletions
diff --git a/pkgs/os-specific/linux/kmscon/default.nix b/pkgs/os-specific/linux/kmscon/default.nix index a79f762a8a2..29f99629df8 100644 --- a/pkgs/os-specific/linux/kmscon/default.nix +++ b/pkgs/os-specific/linux/kmscon/default.nix @@ -1,5 +1,6 @@ { stdenv -, fetchurl +, fetchFromGitHub +, autoreconfHook , libtsm , systemd , libxkbcommon @@ -13,32 +14,32 @@ }: stdenv.mkDerivation rec { - name = "kmscon-8"; - - src = fetchurl { - url = "https://www.freedesktop.org/software/kmscon/releases/${name}.tar.xz"; - sha256 = "0axfwrp3c8f4gb67ap2sqnkn75idpiw09s35wwn6kgagvhf1rc0a"; + pname = "kmscon"; + version = "unstable-2018-09-07"; + + src = fetchFromGitHub { + owner = "Aetf"; + repo = "kmscon"; + rev = "01dd0a231e2125a40ceba5f59fd945ff29bf2cdc"; + sha256 = "0q62kjsvy2iwy8adfiygx2bfwlh83rphgxbis95ycspqidg9py87"; }; buildInputs = [ + libGLU libGL + libdrm libtsm - systemd libxkbcommon - libdrm - libGLU libGL + libxslt pango pixman - pkgconfig - docbook_xsl - libxslt + systemd ]; - patches = [ ./kmscon-8-glibc-2.26.patch ]; - - # FIXME: Remove as soon as kmscon > 8 comes along. - postPatch = '' - sed -i -e 's/libsystemd-daemon libsystemd-login/libsystemd/g' configure - ''; + nativeBuildInputs = [ + autoreconfHook + docbook_xsl + pkgconfig + ]; configureFlags = [ "--enable-multi-seat" @@ -49,10 +50,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { description = "KMS/DRM based System Console"; homepage = "http://www.freedesktop.org/wiki/Software/kmscon/"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + license = licenses.mit; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/kmscon/kmscon-8-glibc-2.26.patch b/pkgs/os-specific/linux/kmscon/kmscon-8-glibc-2.26.patch deleted file mode 100644 index b70a750180e..00000000000 --- a/pkgs/os-specific/linux/kmscon/kmscon-8-glibc-2.26.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/src/pty.c b/src/pty.c -index 3494104..1443f4a 100644 ---- a/src/pty.c -+++ b/src/pty.c -@@ -299,7 +299,7 @@ static void setup_child(int master, struct winsize *ws) - if (ret) - log_warn("cannot reset blocked signals: %m"); - -- for (i = 1; i < SIGUNUSED; ++i) -+ for (i = 1; i < SIGSYS; ++i) - signal(i, SIG_DFL); - - ret = grantpt(master); -diff --git a/src/uterm_vt.c b/src/uterm_vt.c -index af377f5..fbe9e76 100644 ---- a/src/uterm_vt.c -+++ b/src/uterm_vt.c -@@ -40,6 +40,7 @@ - #include <sys/ioctl.h> - #include <sys/signalfd.h> - #include <sys/stat.h> -+#include <sys/sysmacros.h> - #include <termios.h> - #include <time.h> - #include <unistd.h> |