kmsxx: 2020-08-04 -> 2021-07-26 unbreak

This commit is contained in:
Artturin 2021-08-07 03:51:16 +03:00 committed by Jonathan Ringer
parent 5ff1bd08e6
commit 3a3f82631f
2 changed files with 25 additions and 12 deletions

View file

@ -1,22 +1,37 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libdrm { lib
, withPython ? false, python ? null }: , stdenv
, fetchFromGitHub
, meson
, ninja
, cmake
, pkg-config
, libdrm
, fmt
, libevdev
, withPython ? false
, python3Packages
}:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "kmsxx"; pname = "kmsxx";
version = "2020-08-04"; version = "2021-07-26";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tomba"; owner = "tomba";
repo = "kmsxx"; repo = "kmsxx";
fetchSubmodules = true; fetchSubmodules = true;
rev = "38bee3092f2d477f1baebfcae464f888d3d04bbe"; rev = "54f591ec0de61dd192baf781c9b2ec87d5b461f7";
sha256 = "0xz4m9bk0naawxwpx5cy1j3cm6c8c9m5y551csk88y88x1g0z0xh"; sha256 = "sha256-j+20WY4a2iTKZnYjXhxbNnZZ53K3dHpDMTp+ZulS+7c=";
}; };
cmakeFlags = lib.optional (!withPython) "-DKMSXX_ENABLE_PYTHON=OFF"; # Didn't detect pybind11 without cmake
nativeBuildInputs = [ meson ninja pkg-config ] ++ lib.optionals withPython [ cmake ];
buildInputs = [ libdrm fmt libevdev ]
++ lib.optionals withPython (with python3Packages; [ python pybind11 ]);
nativeBuildInputs = [ cmake pkg-config ]; dontUseCmakeConfigure = true;
buildInputs = [ libdrm ] ++ lib.optionals withPython [ python ];
mesonFlags = lib.optional (!withPython) "-Dpykms=disabled";
meta = with lib; { meta = with lib; {
description = "C++11 library, utilities and python bindings for Linux kernel mode setting"; description = "C++11 library, utilities and python bindings for Linux kernel mode setting";
@ -24,6 +39,5 @@ stdenv.mkDerivation {
license = licenses.mpl20; license = licenses.mpl20;
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ ];
platforms = platforms.linux; platforms = platforms.linux;
broken = true; # marked broken 2021-03-26
}; };
} }

View file

@ -3944,10 +3944,9 @@ in {
kmapper = callPackage ../development/python-modules/kmapper { }; kmapper = callPackage ../development/python-modules/kmapper { };
kmsxx = toPythonModule ((callPackage ../development/libraries/kmsxx { kmsxx = toPythonModule (pkgs.kmsxx.override {
inherit (pkgs.kmsxx) stdenv;
withPython = true; withPython = true;
}).overrideAttrs (oldAttrs: { name = "${python.libPrefix}-${pkgs.kmsxx.name}"; })); });
knack = callPackage ../development/python-modules/knack { }; knack = callPackage ../development/python-modules/knack { };