build(nix): add a patch to make viz1090 use the packaged mapdata
This commit is contained in:
parent
1922324b40
commit
26a610c1a3
|
@ -5,7 +5,9 @@
|
||||||
fetchFromGitea,
|
fetchFromGitea,
|
||||||
self,
|
self,
|
||||||
system,
|
system,
|
||||||
}:
|
}: let
|
||||||
|
viz1090-mapdata = self.packages.${system}.viz1090-mapdata;
|
||||||
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "viz1090";
|
pname = "viz1090";
|
||||||
version = "0.1.0";
|
version = "0.1.0";
|
||||||
|
@ -14,8 +16,8 @@ stdenv.mkDerivation rec {
|
||||||
domain = "git.vulpecula.zone";
|
domain = "git.vulpecula.zone";
|
||||||
owner = "tasiaiso";
|
owner = "tasiaiso";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "d1f53019b22a9e605506bed90fcffcdc5f7e6186";
|
rev = "1922324b40f84fd449cec3fbfdade8aa33597bf6";
|
||||||
hash = "sha256-gtv0u7o+5fqVgA0CHDWdZr0h9A1Nbky1+okHvSv1cVU=";
|
hash = "sha256-bPVFKbGtPXOitzzHb3yJ6XW3fRh8PF/7kfP7EJkJX3c=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = with pkgs; [
|
nativeBuildInputs = with pkgs; [
|
||||||
|
@ -28,11 +30,13 @@ stdenv.mkDerivation rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
self.packages.${system}.viz1090-mapdata
|
viz1090-mapdata
|
||||||
];
|
];
|
||||||
|
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
echo "--- a/Makefile
|
echo "diff --git a/Makefile b/Makefile
|
||||||
|
index 5e60779..d5b30ab 100644
|
||||||
|
--- a/Makefile
|
||||||
+++ b/Makefile
|
+++ b/Makefile
|
||||||
@@ -3,7 +3,7 @@
|
@@ -3,7 +3,7 @@
|
||||||
# sure that the variable PREFIX is defined, e.g. make PREFIX=/usr/local
|
# sure that the variable PREFIX is defined, e.g. make PREFIX=/usr/local
|
||||||
|
@ -42,17 +46,48 @@ stdenv.mkDerivation rec {
|
||||||
+CXXFLAGS=-O2 -std=c++11 -g -I ${pkgs.SDL2.dev}/include/SDL2/
|
+CXXFLAGS=-O2 -std=c++11 -g -I ${pkgs.SDL2.dev}/include/SDL2/
|
||||||
LIBS= -lm -lSDL2 -lSDL2_ttf -lSDL2_gfx -g
|
LIBS= -lm -lSDL2 -lSDL2_ttf -lSDL2_gfx -g
|
||||||
CXX=g++
|
CXX=g++
|
||||||
|
|
||||||
|
diff --git a/Map.cpp b/Map.cpp
|
||||||
|
index cd798ec..c5736bd 100644
|
||||||
|
--- a/Map.cpp
|
||||||
|
+++ b/Map.cpp
|
||||||
|
@@ -189,7 +189,7 @@ std::vector<Line*> Map::getLines(float screen_lat_min, float screen_lat_max, flo
|
||||||
|
Map::Map() {
|
||||||
|
FILE *fileptr;
|
||||||
|
|
||||||
|
- if((fileptr = fopen(\"mapdata.bin\", \"rb\"))) {
|
||||||
|
+ if((fileptr = fopen(\"${viz1090-mapdata}/mapdata.bin\", \"rb\"))) {
|
||||||
|
|
||||||
|
|
||||||
|
fseek(fileptr, 0, SEEK_END);
|
||||||
|
@@ -255,7 +255,7 @@ Map::Map() {
|
||||||
|
//
|
||||||
|
|
||||||
|
|
||||||
|
- if((fileptr = fopen(\"airportdata.bin\", \"rb\"))) {
|
||||||
|
+ if((fileptr = fopen(\"${viz1090-mapdata}/airportdata.bin\", \"rb\"))) {
|
||||||
|
fseek(fileptr, 0, SEEK_END);
|
||||||
|
airportPoints_count = ftell(fileptr) / sizeof(float);
|
||||||
|
rewind(fileptr);
|
||||||
|
@@ -350,7 +350,7 @@ Map::Map() {
|
||||||
|
|
||||||
|
infile.close();
|
||||||
|
|
||||||
|
- infile.open(\"airportnames\");
|
||||||
|
+ infile.open(\"${viz1090-mapdata}/airportnames\");
|
||||||
|
|
||||||
|
|
||||||
|
while (std::getline(infile, line))
|
||||||
|
|
||||||
" | git apply -
|
" | git apply -
|
||||||
|
|
||||||
make
|
cat Map.cpp | grep mapdata
|
||||||
|
|
||||||
|
make -j $NIX_BUILD_CORES
|
||||||
'';
|
'';
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
# runHook preInstall
|
|
||||||
|
|
||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
cp -v viz1090 $out/bin
|
cp -v viz1090 $out/bin
|
||||||
|
|
||||||
# runHook postInstall
|
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue