summary refs log tree commit diff
path: root/pkgs/os-specific/linux/kmscon/default.nix
diff options
context:
space:
mode:
authorPeter Hoeg <peter@hoeg.com>2020-08-05 11:25:36 +0800
committerPeter Hoeg <peter@hoeg.com>2020-08-05 11:25:36 +0800
commit7b6960156f6ef7592aecb8015eee4f8b0b166bdf (patch)
tree84781a1c23417b15c28c6a42489735dc94c6ee42 /pkgs/os-specific/linux/kmscon/default.nix
parentc94378d121565e8b0e3a5bfe572e33f9d1df7af7 (diff)
downloadnixpkgs-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
Diffstat (limited to 'pkgs/os-specific/linux/kmscon/default.nix')
-rw-r--r--pkgs/os-specific/linux/kmscon/default.nix43
1 files changed, 22 insertions, 21 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;
   };
 }