gr-ais: fetch commit from master and use fetchpatch for PR commit
This commit is contained in:
parent
0b90d29486
commit
b00ab7489e
@ -1,10 +1,20 @@
|
|||||||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, boost, gnuradio
|
{ lib
|
||||||
, makeWrapper, cppunit, gr-osmosdr, log4cpp
|
, stdenv
|
||||||
, pythonSupport ? true, python, swig
|
, fetchFromGitHub
|
||||||
|
, cmake
|
||||||
|
, pkg-config
|
||||||
|
, boost
|
||||||
|
, gnuradio
|
||||||
|
, makeWrapper
|
||||||
|
, cppunit
|
||||||
|
, gr-osmosdr
|
||||||
|
, log4cpp
|
||||||
|
, pythonSupport ? true
|
||||||
|
, python
|
||||||
|
, swig
|
||||||
|
, fetchpatch
|
||||||
}:
|
}:
|
||||||
|
|
||||||
assert pythonSupport -> python != null && swig != null;
|
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
pname = "gr-ais";
|
pname = "gr-ais";
|
||||||
version = "2015-12-20";
|
version = "2015-12-20";
|
||||||
@ -12,11 +22,17 @@ stdenv.mkDerivation {
|
|||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "bistromath";
|
owner = "bistromath";
|
||||||
repo = "gr-ais";
|
repo = "gr-ais";
|
||||||
# Upstream PR: https://github.com/bistromath/gr-ais/commit/8502d0252a2a1a9b8d1a71795eaeb5d820684054
|
rev = "cdc1f52745853f9c739c718251830eb69704b26e";
|
||||||
rev = "8502d0252a2a1a9b8d1a71795eaeb5d820684054";
|
sha256 = "1vl3kk8xr2mh5lf31zdld7yzmwywqffffah8iblxdzblgsdwxfl6";
|
||||||
sha256 = "1b9j0kc74cw12a7jv4lii77dgzqzg2s8ndzp4xmisxksgva1qfvh";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/bistromath/gr-ais/commit/8502d0252a2a1a9b8d1a71795eaeb5d820684054.patch";
|
||||||
|
sha256 = "1cwalphldvf6dbhzwz1gi53z0cb4921qsvlz4138q7m6dxccvssg";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake makeWrapper pkg-config ];
|
nativeBuildInputs = [ cmake makeWrapper pkg-config ];
|
||||||
buildInputs = [ boost gnuradio cppunit gr-osmosdr log4cpp ]
|
buildInputs = [ boost gnuradio cppunit gr-osmosdr log4cpp ]
|
||||||
++ lib.optionals pythonSupport [ python swig ];
|
++ lib.optionals pythonSupport [ python swig ];
|
||||||
|
Loading…
x
Reference in New Issue
Block a user