kmscon: unstable-2018-09-07 -> 9.0.0

+28 -8
+28 -8
pkgs/os-specific/linux/kmscon/default.nix
··· 1 - { lib, stdenv 1 + { lib 2 + , stdenv 2 3 , fetchFromGitHub 3 - , autoreconfHook 4 + , fetchpatch 5 + , meson 4 6 , libtsm 5 7 , systemd 6 8 , libxkbcommon 7 9 , libdrm 8 - , libGLU, libGL 10 + , libGLU 11 + , libGL 9 12 , pango 10 13 , pixman 11 14 , pkg-config 12 15 , docbook_xsl 13 16 , libxslt 17 + , mesa 18 + , ninja 14 19 }: 15 20 16 21 stdenv.mkDerivation rec { 17 22 pname = "kmscon"; 18 - version = "unstable-2018-09-07"; 23 + version = "9.0.0"; 19 24 20 25 src = fetchFromGitHub { 21 26 owner = "Aetf"; 22 27 repo = "kmscon"; 23 - rev = "01dd0a231e2125a40ceba5f59fd945ff29bf2cdc"; 24 - sha256 = "0q62kjsvy2iwy8adfiygx2bfwlh83rphgxbis95ycspqidg9py87"; 28 + rev = "v${version}"; 29 + sha256 = "sha256-8owyyzCrZVbWXcCR+RA+m0MOrdzW+efI+rIMWEVEZ1o="; 25 30 }; 26 31 27 32 buildInputs = [ 28 - libGLU libGL 33 + libGLU 34 + libGL 29 35 libdrm 30 36 libtsm 31 37 libxkbcommon ··· 33 39 pango 34 40 pixman 35 41 systemd 42 + mesa 36 43 ]; 37 44 38 45 nativeBuildInputs = [ 39 - autoreconfHook 46 + meson 47 + ninja 40 48 docbook_xsl 41 49 pkg-config 42 50 ]; 51 + 52 + patches = [ 53 + (fetchpatch { 54 + name = "0001-tests-fix-warnings.patch"; 55 + url = "https://github.com/Aetf/kmscon/commit/b65f4269b03de580923ab390bde795e7956b633f.patch"; 56 + sha256 = "sha256-ngflPwmNMM/2JzhV+hHiH3efQyoSULfqEywzWox9iAQ="; 57 + }) 58 + ]; 59 + 60 + # _FORTIFY_SOURCE requires compiling with optimization (-O) 61 + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-O" 62 + + " -Wno-error=maybe-uninitialized"; # https://github.com/Aetf/kmscon/issues/49 43 63 44 64 configureFlags = [ 45 65 "--enable-multi-seat"