From 3f9d48168b305ff13d716ed3cc13217757c9f96d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 15 Jun 2018 11:52:08 +0100 Subject: [PATCH] python.pkgs.pythonix: 0.1.0 -> 0.1.4 also fix the build --- .../python-modules/pythonix/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pythonix/default.nix b/pkgs/development/python-modules/pythonix/default.nix index 6248ed7bf66a..7c8d51f2f43e 100644 --- a/pkgs/development/python-modules/pythonix/default.nix +++ b/pkgs/development/python-modules/pythonix/default.nix @@ -1,21 +1,26 @@ -{ stdenv, fetchFromGitHub, ninja, meson, pkgconfig, nixUnstable, isPy3k }: +{ stdenv, fetchFromGitHub, ninja, boost, meson, pkgconfig, nix, isPy3k }: -assert isPy3k; stdenv.mkDerivation rec { name = "pythonix-${version}"; - version = "0.1.0"; + version = "0.1.4"; src = fetchFromGitHub { owner = "Mic92"; repo = "pythonix"; rev = "v${version}"; - sha256 = "1piblysypyr442a6najk4mdh87xc377i2fdbfw6fr569z60mnnnj"; + sha256 = "1q1fagfwzvmcm1n3a0liay7m5krazmhw9l001m90rrz2x7vrsqwk"; }; - nativeBuildInputs = [ meson pkgconfig ninja ]; + disabled = !isPy3k; - buildInputs = [ nixUnstable ]; + nativeBuildInputs = [ meson ninja pkgconfig ]; + + buildInputs = [ nix boost ]; + + checkPhase = '' + ninja test + ''; meta = with stdenv.lib; { description = '' @@ -23,6 +28,5 @@ stdenv.mkDerivation rec { ''; maintainers = [ maintainers.mic92 ]; license = licenses.mit; - platforms = platforms.linux; }; }