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

Merge pull request #42800 from lukeadams/gr-v2

Browse Source 
gnuradio: fix issues with last pr
This commit is contained in:
Matthew Bauer 2018-06-29 22:26:20 -04:00 committed by GitHub
commit d1f691e2cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/misc/gnuradio/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, writeText, makeWrapper { stdenv, fetchFromGitHub, writeText, makeWrapper
# Dependencies documented @ https://gnuradio.org/doc/doxygen/build_guide.html # Dependencies documented @ https://gnuradio.org/doc/doxygen/build_guide.html
# => core dependencies # => core dependencies
, ninja, cmake, pkgconfig, git, boost, cppunit, fftw , cmake, pkgconfig, git, boost, cppunit, fftw
# => python wrappers # => python wrappers
# May be able to upgrade to swig3 # May be able to upgrade to swig3
, python, swig2, numpy, scipy, matplotlib , python, swig2, numpy, scipy, matplotlib
@ -32,12 +32,12 @@ stdenv.mkDerivation rec {
owner = "gnuradio"; owner = "gnuradio";
repo = "gnuradio"; repo = "gnuradio";
rev = "v${version}"; rev = "v${version}";
sha256 = "0fqxn1k41xqd52i5z528zdhkn52i9z5hl6cc75ggdx9iqxhvb3jj"; sha256 = "1qpa53axqavdv2ykby7rwh7xmhvv964xq1d7rcvbwkry7dngrbib";
fetchSubmodules = true; fetchSubmodules = true;
}; };
nativeBuildInputs = [ nativeBuildInputs = [
cmake pkgconfig git makeWrapper cppunit orc ninja cmake pkgconfig git makeWrapper cppunit orc
]; ];
buildInputs = [ buildInputs = [