diff options
author | Adam Joseph <54836058+amjoseph-nixpkgs@users.noreply.github.com> | 2023-08-17 05:04:38 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-17 05:04:38 +0000 |
commit | f606e484b288d69b9ba606eef85b29a3e93f869a (patch) | |
tree | 476c5263098cba9953a90efb6334244be3212f0e | |
parent | 53a053cb551f7efb2c22010e8c0e5423f0eff7ef (diff) | |
parent | d16b0690f8f73e2b085136591cab912d51fe944b (diff) |
Merge pull request #248412 from lopsided98/libiio-python-static
libiio: disable Python for static builds
-rw-r--r-- | pkgs/development/libraries/libiio/default.nix | 21 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 5 |
2 files changed, 16 insertions, 10 deletions
diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix index d217fbd823849..98ca22d2e90d7 100644 --- a/pkgs/development/libraries/libiio/default.nix +++ b/pkgs/development/libraries/libiio/default.nix @@ -4,7 +4,7 @@ , flex , bison , libxml2 -, python +, pythonSupport ? stdenv.hostPlatform.hasSharedLibraries, python , libusb1 , avahiSupport ? true, avahi , libaio @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { pname = "libiio"; version = "0.24"; - outputs = [ "out" "lib" "dev" "python" ]; + outputs = [ "out" "lib" "dev" ] + ++ lib.optional pythonSupport "python"; src = fetchFromGitHub { owner = "analogdevicesinc"; @@ -37,8 +38,9 @@ stdenv.mkDerivation rec { flex bison pkg-config + ] ++ lib.optionals pythonSupport ([ python - ] ++ lib.optional python.isPy3k python.pkgs.setuptools; + ] ++ lib.optional python.isPy3k python.pkgs.setuptools); buildInputs = [ libxml2 @@ -49,25 +51,26 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DUDEV_RULES_INSTALL_DIR=${placeholder "out"}/lib/udev/rules.d" - "-DPython_EXECUTABLE=${python.pythonForBuild.interpreter}" - "-DPYTHON_BINDINGS=on" # osx framework is disabled, # the linux-like directory structure is used for proper output splitting "-DOSX_PACKAGE=off" "-DOSX_FRAMEWORK=off" + ] ++ lib.optionals pythonSupport [ + "-DPython_EXECUTABLE=${python.pythonForBuild.interpreter}" + "-DPYTHON_BINDINGS=on" ] ++ lib.optionals (!avahiSupport) [ "-DHAVE_DNS_SD=OFF" ]; postPatch = '' - # Hardcode path to the shared library into the bindings. - sed "s#@libiio@#$lib/lib/libiio${stdenv.hostPlatform.extensions.sharedLibrary}#g" ${./hardcode-library-path.patch} | patch -p1 - substituteInPlace libiio.rules.cmakein \ --replace /bin/sh ${runtimeShell} + '' + lib.optionalString pythonSupport '' + # Hardcode path to the shared library into the bindings. + sed "s#@libiio@#$lib/lib/libiio${stdenv.hostPlatform.extensions.sharedLibrary}#g" ${./hardcode-library-path.patch} | patch -p1 ''; - postInstall = '' + postInstall = lib.optionalString pythonSupport '' # Move Python bindings into a separate output. moveToOutput ${python.sitePackages} "$python" ''; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5786bf18fbe10..904c5a47e6716 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5888,7 +5888,10 @@ self: super: with self; { inherit (pkgs.config) cudaSupport; }; - libiio = (toPythonModule (pkgs.libiio.override { inherit python; })).python; + libiio = (toPythonModule (pkgs.libiio.override { + pythonSupport = true; + inherit python; + })).python; libkeepass = callPackage ../development/python-modules/libkeepass { }; |