public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #76898 from markuskowa/fix-soapysdr 

soapysdr: add as python module
This commit is contained in:
markuskowa 2020-01-05 13:41:28 +01:00 committed by GitHub
parent 97dca00890 4097ffcc29
commit 87021d3ca1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/radio/soapysdr/default.nix
View File

@ -1,7 +1,8 @@
{ stdenv, lib, lndir, makeWrapper
, fetchFromGitHub, cmake
, libusb, pkgconfig
, python, swig2, numpy, ncurses
, usePython ? false
, python, ncurses, swig2
, extraPackages ? []
} :
@ -24,12 +25,14 @@ in stdenv.mkDerivation {
};
nativeBuildInputs = [ cmake makeWrapper pkgconfig ];
buildInputs = [ libusb ncurses numpy python swig2 ];
buildInputs = [ libusb ncurses ]
++ lib.optionals usePython [ python swig2 ];
propagatedBuildInputs = lib.optional usePython python.pkgs.numpy;
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DUSE_PYTHON_CONFIG=ON"
];
] ++ lib.optional usePython "-DUSE_PYTHON_CONFIG=ON";
postFixup = lib.optionalString (lib.length extraPackages != 0) ''
# Join all plugins via symlinking

3
pkgs/top-level/all-packages.nix
View File

@ -14114,12 +14114,11 @@ in
soapyhackrf = callPackage ../applications/radio/soapyhackrf { };
soapysdr = callPackage ../applications/radio/soapysdr { inherit (python3Packages) python numpy; };
soapysdr = callPackage ../applications/radio/soapysdr { };
soapyremote = callPackage ../applications/radio/soapyremote { };
soapysdr-with-plugins = callPackage ../applications/radio/soapysdr {
inherit (python3Packages) python numpy;
extraPackages = [
limesuite
soapyairspy

12
pkgs/top-level/python-packages.nix
View File

@ -1339,6 +1339,16 @@ in {
snapcast = callPackage ../development/python-modules/snapcast { };
soapysdr = toPythonModule (pkgs.soapysdr.override {
python = self.python;
usePython = true;
});
soapysdr-with-plugins = toPythonModule (pkgs.soapysdr-with-plugins.override {
python = self.python;
usePython = true;
});
sparse = callPackage ../development/python-modules/sparse { };
spglib = callPackage ../development/python-modules/spglib { };
@ -1967,7 +1977,7 @@ in {
certifi = callPackage ../development/python-modules/certifi { };
certipy = callPackage ../development/python-modules/certipy {};
characteristic = callPackage ../development/python-modules/characteristic { };
chart-studio = callPackage ../development/python-modules/chart-studio { };