Unverified Commit 684f53f7 authored by Robert Scott's avatar Robert Scott Committed by GitHub
Browse files

Merge pull request #247435 from lopsided98/libgpiod-python 

libgpiod: fix Python bindings
parents af90462b 6421f070

pkgs/development/libraries/libgpiod/default.nix

+7 −7
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, autoreconfHook, autoconf-archive, pkg-config, kmod

, enable-tools ? true

, enablePython ? false, python3, ncurses }:

{ lib, stdenv, fetchurl, autoreconfHook, autoconf-archive, pkg-config

, enable-tools ? true }:



stdenv.mkDerivation rec {

  pname = "libgpiod";
@@ -11,7 +10,6 @@ stdenv.mkDerivation rec { 
    hash = "sha256-tu2lU1YWCo5zkG49SOlZ74EpZ4fXZJdbEPJX6WYGaOk=";

  };



  buildInputs = [ kmod ] ++ lib.optionals enablePython [ python3 ncurses ];

  nativeBuildInputs = [

    autoconf-archive

    pkg-config
@@ -21,8 +19,7 @@ stdenv.mkDerivation rec { 
  configureFlags = [

    "--enable-tools=${if enable-tools then "yes" else "no"}"

    "--enable-bindings-cxx"

    "--prefix=${placeholder "out"}"

  ] ++ lib.optional enablePython "--enable-bindings-python";

  ];



  meta = with lib; {

    description = "C library and tools for interacting with the linux GPIO character device";
@@ -32,7 +29,10 @@ stdenv.mkDerivation rec { 
      data structures behind a straightforward API.

    '';

    homepage = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/about/";

    license = licenses.lgpl2;

    license = with licenses; [

      lgpl21Plus # libgpiod

      lgpl3Plus # C++ bindings

    ] ++ lib.optional enable-tools gpl2Plus;

    maintainers = [ maintainers.expipiplus1 ];

    platforms = platforms.linux;

  };

pkgs/development/python-modules/libgpiod/default.nix

0 → 100644
+25 −0
Original line number Diff line number Diff line 
{ lib

, buildPythonPackage

, libgpiod

}:

buildPythonPackage {

  inherit (libgpiod) pname version src;

  format = "setuptools";



  buildInputs = [ libgpiod ];



  preConfigure = ''

    cd bindings/python

  '';



  # Requires libgpiod built with --enable-tests

  doCheck = false;

  pythonImportsCheck = [ "gpiod" ];



  meta = with lib; {

    description = "Python bindings for libgpiod";

    homepage = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/about/";

    license = licenses.lgpl21Plus;

    maintainers = with maintainers; [ lopsided98 ];

  };

}

pkgs/top-level/python-packages.nix

+3 −4
Original line number Diff line number Diff line
@@ -5848,10 +5848,9 @@ self: super: with self; { 
    pythonSupport = true;

  });



  libgpiod = toPythonModule (pkgs.libgpiod.override {

    enablePython = true;

    python3 = python;

  });

  libgpiod = callPackage ../development/python-modules/libgpiod {

    inherit (pkgs) libgpiod;

  };



  libgpuarray = callPackage ../development/python-modules/libgpuarray {

    clblas = pkgs.clblas.override { inherit (self) boost; };