gr-ais: fetch commit from master and use fetchpatch for PR commit

+25 -9
+25 -9
pkgs/applications/radio/gnuradio/ais.nix
··· 1 - { lib, stdenv, fetchFromGitHub, cmake, pkg-config, boost, gnuradio 2 - , makeWrapper, cppunit, gr-osmosdr, log4cpp 3 - , pythonSupport ? true, python, swig 4 }: 5 - 6 - assert pythonSupport -> python != null && swig != null; 7 8 stdenv.mkDerivation { 9 pname = "gr-ais"; ··· 12 src = fetchFromGitHub { 13 owner = "bistromath"; 14 repo = "gr-ais"; 15 - # Upstream PR: https://github.com/bistromath/gr-ais/commit/8502d0252a2a1a9b8d1a71795eaeb5d820684054 16 - rev = "8502d0252a2a1a9b8d1a71795eaeb5d820684054"; 17 - sha256 = "1b9j0kc74cw12a7jv4lii77dgzqzg2s8ndzp4xmisxksgva1qfvh"; 18 }; 19 20 nativeBuildInputs = [ cmake makeWrapper pkg-config ]; 21 buildInputs = [ boost gnuradio cppunit gr-osmosdr log4cpp ] 22 - ++ lib.optionals pythonSupport [ python swig ]; 23 24 postInstall = '' 25 for prog in "$out"/bin/*; do
··· 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , cmake 5 + , pkg-config 6 + , boost 7 + , gnuradio 8 + , makeWrapper 9 + , cppunit 10 + , gr-osmosdr 11 + , log4cpp 12 + , pythonSupport ? true 13 + , python 14 + , swig 15 + , fetchpatch 16 }: 17 18 stdenv.mkDerivation { 19 pname = "gr-ais"; ··· 22 src = fetchFromGitHub { 23 owner = "bistromath"; 24 repo = "gr-ais"; 25 + rev = "cdc1f52745853f9c739c718251830eb69704b26e"; 26 + sha256 = "1vl3kk8xr2mh5lf31zdld7yzmwywqffffah8iblxdzblgsdwxfl6"; 27 }; 28 29 + patches = [ 30 + (fetchpatch { 31 + url = "https://github.com/bistromath/gr-ais/commit/8502d0252a2a1a9b8d1a71795eaeb5d820684054.patch"; 32 + sha256 = "1cwalphldvf6dbhzwz1gi53z0cb4921qsvlz4138q7m6dxccvssg"; 33 + }) 34 + ]; 35 + 36 nativeBuildInputs = [ cmake makeWrapper pkg-config ]; 37 buildInputs = [ boost gnuradio cppunit gr-osmosdr log4cpp ] 38 + ++ lib.optionals pythonSupport [ python swig ]; 39 40 postInstall = '' 41 for prog in "$out"/bin/*; do