diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-02-11 00:36:09 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-11 00:36:09 +0000 |
commit | 5f9df376839fd1e7455f01af23681c874e6c63dd (patch) | |
tree | 0caabe12dd56980c2d23e23c1731383b674c275a /pkgs/applications/radio | |
parent | 7d94bb26bb82aeee9378d6be0e323910ebe47281 (diff) | |
parent | 41d270c2aaa2cfbd217be8d1ead911c633199b75 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/radio')
-rw-r--r-- | pkgs/applications/radio/gnuradio/ais.nix | 34 |
1 files changed, 25 insertions, 9 deletions
diff --git a/pkgs/applications/radio/gnuradio/ais.nix b/pkgs/applications/radio/gnuradio/ais.nix index 94556561439dc..8d6e8509772cf 100644 --- a/pkgs/applications/radio/gnuradio/ais.nix +++ b/pkgs/applications/radio/gnuradio/ais.nix @@ -1,10 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, boost, gnuradio -, makeWrapper, cppunit, gr-osmosdr, log4cpp -, pythonSupport ? true, python, swig +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, boost +, gnuradio +, makeWrapper +, cppunit +, gr-osmosdr +, log4cpp +, pythonSupport ? true +, python +, swig +, fetchpatch }: -assert pythonSupport -> python != null && swig != null; - stdenv.mkDerivation { pname = "gr-ais"; version = "2015-12-20"; @@ -12,14 +22,20 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "bistromath"; repo = "gr-ais"; - # Upstream PR: https://github.com/bistromath/gr-ais/commit/8502d0252a2a1a9b8d1a71795eaeb5d820684054 - rev = "8502d0252a2a1a9b8d1a71795eaeb5d820684054"; - sha256 = "1b9j0kc74cw12a7jv4lii77dgzqzg2s8ndzp4xmisxksgva1qfvh"; + rev = "cdc1f52745853f9c739c718251830eb69704b26e"; + sha256 = "1vl3kk8xr2mh5lf31zdld7yzmwywqffffah8iblxdzblgsdwxfl6"; }; + patches = [ + (fetchpatch { + url = "https://github.com/bistromath/gr-ais/commit/8502d0252a2a1a9b8d1a71795eaeb5d820684054.patch"; + sha256 = "1cwalphldvf6dbhzwz1gi53z0cb4921qsvlz4138q7m6dxccvssg"; + }) + ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config ]; buildInputs = [ boost gnuradio cppunit gr-osmosdr log4cpp ] - ++ lib.optionals pythonSupport [ python swig ]; + ++ lib.optionals pythonSupport [ python swig ]; postInstall = '' for prog in "$out"/bin/*; do |