Merge pull request #226302 from Tungsten842/sdrangel
This commit is contained in:
commit
7048a48bc7
|
@ -23,7 +23,6 @@
|
|||
, limesuite
|
||||
, libbladeRF
|
||||
, mbelib
|
||||
, mkDerivation
|
||||
, ninja
|
||||
, ocl-icd
|
||||
, opencv3
|
||||
|
@ -45,10 +44,11 @@
|
|||
, sgp4
|
||||
, soapysdr-with-plugins
|
||||
, uhd
|
||||
, wrapQtAppsHook
|
||||
, zlib
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sdrangel";
|
||||
version = "7.13.0";
|
||||
|
||||
|
@ -59,7 +59,7 @@ mkDerivation rec {
|
|||
hash = "sha256-xG41FNlMfqH5MaGVFFENP0UFEkZYiWhtpNSPh2s4Irk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja pkg-config ];
|
||||
nativeBuildInputs = [ cmake ninja pkg-config wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [
|
||||
airspy
|
||||
|
@ -106,12 +106,10 @@ mkDerivation rec {
|
|||
|
||||
cmakeFlags = [
|
||||
"-DAPT_DIR=${aptdec}"
|
||||
"-DDAB_INCLUDE_DIR:PATH=${dab_lib}/include/dab_lib"
|
||||
"-DLIBSERIALDV_INCLUDE_DIR:PATH=${serialdv}/include/serialdv"
|
||||
"-DLIMESUITE_INCLUDE_DIR:PATH=${limesuite}/include"
|
||||
"-DLIMESUITE_LIBRARY:FILEPATH=${limesuite}/lib/libLimeSuite${stdenv.hostPlatform.extensions.sharedLibrary}"
|
||||
"-DDAB_DIR=${dab_lib}"
|
||||
"-DSGP4_DIR=${sgp4}"
|
||||
"-DSOAPYSDR_DIR=${soapysdr-with-plugins}"
|
||||
"-Wno-dev"
|
||||
];
|
||||
|
||||
LD_LIBRARY_PATH = "${ocl-icd}/lib";
|
||||
|
|
|
@ -1,23 +1,24 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
|
||||
, libpng, libsndfile
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, libpng
|
||||
, libsndfile
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aptdec";
|
||||
version = "unstable-2022-05-18";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Xerbo";
|
||||
repo = "aptdec";
|
||||
rev = "b1cc7480732349a7c772124f984b58f4c734c91b";
|
||||
sha256 = "sha256-Fi9IkZcvqxpmHzqucpCr++37bmTtMy18P4LPznoaYIY=";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5Pr2PlCPSEIWnThJXKcQEudmxhLJC2sVa9BfAOEKHB4=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
# fixes https://github.com/Xerbo/aptdec/issues/15
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt --replace "-Werror" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ libpng libsndfile ];
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config }:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "sgp4";
|
||||
version = "unstable-2021-01-11";
|
||||
version = "unstable-2022-11-13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dnwrnr";
|
||||
repo = "sgp4";
|
||||
rev = "ca9d4d97af4ee62461de6f13e0c85d1dc6000040";
|
||||
sha256 = "sha256-56It/71R10U+Hnhw2tC16e5fZdyfQ8DLx6LVq65Rjvc=";
|
||||
rev = "6a448b4850e5fbf8c1ca03bb5f6013a9fdc1fd91";
|
||||
hash = "sha256-gfJQOLhys5wKzZCxFVqbo+5l7jPeGPzrvYsdZKPSCJc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
Loading…
Reference in a new issue