From cf4a2bb111d4e3b414a3e42befef11b51b5944a1 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Sun, 8 Oct 2017 14:47:25 +0300 Subject: [PATCH] kmsxx, pykms: suggestions by @FRidh --- pkgs/development/libraries/kmsxx/default.nix | 9 +++++---- pkgs/top-level/python-packages.nix | 4 +--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix index 7dbe6084dc4..06a288ec4de 100644 --- a/pkgs/development/libraries/kmsxx/default.nix +++ b/pkgs/development/libraries/kmsxx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, pkgconfig, libdrm, pythonBindings ? null }: +{ stdenv, fetchgit, cmake, pkgconfig, libdrm, python }: stdenv.mkDerivation rec { name = "kmsxx-2017-10-03"; @@ -12,10 +12,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - cmakeFlags = stdenv.lib.optionalString (pythonBindings == null) [ "-DKMSXX_ENABLE_PYTHON=OFF" ]; - nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ libdrm ] ++ stdenv.lib.optional (pythonBindings != null) pythonBindings; + buildInputs = [ libdrm python ]; + + pythonPath = [ ]; + passthru.python = python; meta = with stdenv.lib; { description = "C++11 library, utilities and python bindings for Linux kernel mode setting"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b575bb59b62..b990ca52b97 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15604,9 +15604,7 @@ in { pika-pool = callPackage ../development/python-modules/pika-pool { }; platformio = callPackage ../development/python-modules/platformio { }; - pykms = callPackage ../development/libraries/kmsxx { - pythonBindings = python; - }; + pykms = callPackage ../development/libraries/kmsxx { }; pylibconfig2 = buildPythonPackage rec { name = "pylibconfig2-${version}";