about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2019-11-05 11:25:49 +0100
committerFrederik Rietdijk <freddyrietdijk@fridh.nl>2019-11-05 12:19:35 +0100
commitd9b0ef5b0a1534b2b6ffd96ec4def88a29fc9d97 (patch)
tree97d05ef97827cd01bbaafc2fbea852a0fbb3abdd
parenteb98b1d1d299870c706a7b74b11fa1351f775496 (diff)
downloadnixlib-d9b0ef5b0a1534b2b6ffd96ec4def88a29fc9d97.tar
nixlib-d9b0ef5b0a1534b2b6ffd96ec4def88a29fc9d97.tar.gz
nixlib-d9b0ef5b0a1534b2b6ffd96ec4def88a29fc9d97.tar.bz2
nixlib-d9b0ef5b0a1534b2b6ffd96ec4def88a29fc9d97.tar.lz
nixlib-d9b0ef5b0a1534b2b6ffd96ec4def88a29fc9d97.tar.xz
nixlib-d9b0ef5b0a1534b2b6ffd96ec4def88a29fc9d97.tar.zst
nixlib-d9b0ef5b0a1534b2b6ffd96ec4def88a29fc9d97.zip
pythonPackages.meson: init
Add meson as Python package so it can easily be used by mesonpep517 for
PEP 517 builds.
-rw-r--r--pkgs/top-level/python-packages.nix18
1 files changed, 13 insertions, 5 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 40532bda4505..5c2b009731e5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -717,7 +717,7 @@ in {
   jwcrypto = callPackage ../development/python-modules/jwcrypto { };
 
   kconfiglib = callPackage ../development/python-modules/kconfiglib { };
-  
+
   labelbox = callPackage ../development/python-modules/labelbox { };
 
   lammps-cython = callPackage ../development/python-modules/lammps-cython {
@@ -919,7 +919,7 @@ in {
   pybullet = callPackage ../development/python-modules/pybullet { };
 
   pycairo = callPackage ../development/python-modules/pycairo {
-    inherit (pkgs) pkgconfig;
+    inherit (pkgs) meson pkgconfig;
   };
 
   pycategories = callPackage ../development/python-modules/pycategories { };
@@ -979,7 +979,7 @@ in {
   };
 
   pygobject3 = callPackage ../development/python-modules/pygobject/3.nix {
-    inherit (pkgs) pkgconfig;
+    inherit (pkgs) meson pkgconfig;
   };
 
   pygtail = callPackage ../development/python-modules/pygtail { };
@@ -2470,7 +2470,7 @@ in {
   grip = callPackage ../development/python-modules/grip { };
 
   gst-python = callPackage ../development/python-modules/gst-python {
-    inherit (pkgs) pkgconfig;
+    inherit (pkgs) meson pkgconfig;
     gst-plugins-base = pkgs.gst_all_1.gst-plugins-base;
   };
 
@@ -2795,7 +2795,7 @@ in {
   python-axolotl-curve25519 = callPackage ../development/python-modules/python-axolotl-curve25519 { };
 
   pythonix = callPackage ../development/python-modules/pythonix {
-    inherit (pkgs) pkgconfig;
+    inherit (pkgs) meson pkgconfig;
   };
 
   pyramid = callPackage ../development/python-modules/pyramid { };
@@ -3852,6 +3852,14 @@ in {
 
   mesa = callPackage ../development/python-modules/mesa { };
 
+  meson = disabledIf (pythonOlder "3.5") (toPythonModule ((pkgs.meson.override {
+    python3Packages = self;
+  }).overrideAttrs(oldAttrs: {
+     # We do not want the setup hook in Python packages
+     # because the build is performed differently.
+    setupHook = null;
+  })));
+
   metaphone = callPackage ../development/python-modules/metaphone { };
 
   mezzanine = callPackage ../development/python-modules/mezzanine { };