nur-packages

commit 165a02d35bb2e18be29777ee11ba8d9c03dacf58
parent 8d91bc4254d96066ea0abeb446cc50dfda078ef1
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date:   Wed, 24 Nov 2021 21:37:59 +0300

Up

Diffstat:
M
pkgs/gemini/gmi2html/default.nix
 | 
11
+++++++----
M
pkgs/gemini/gurl/default.nix
 | 
11
+++++++----
M
pkgs/gnss/visualgps/default.nix
 | 
1
-
M
pkgs/osm/overpass-api/default.nix
 | 
18
++++++++----------

4 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/pkgs/gemini/gmi2html/default.nix b/pkgs/gemini/gmi2html/default.nix
@@ -11,19 +11,22 @@ stdenv.mkDerivation rec {
     hash = "sha256-AYA2PWhowoSascD+jnLyXpLvxwZDGJiC8CvnN2tr+Ec=";
   };
 
-  nativeBuildInputs = [ zig scdoc installShellFiles ];
+  postPatch = ''
+    substituteInPlace tests/test.sh \
+      --replace "zig-cache" "zig-out"
+  '';
 
-  preConfigure = "HOME=$TMP";
+  nativeBuildInputs = [ zig scdoc installShellFiles ];
 
   buildPhase = ''
-    zig build -Drelease-safe
+    export HOME=$TMPDIR
+    zig build -Drelease-safe=true
     scdoc < doc/gmi2html.scdoc > doc/gmi2html.1
   '';
 
   doCheck = true;
 
   checkPhase = ''
-    substituteInPlace tests/test.sh --replace "zig-cache" "zig-out"
     sh tests/test.sh
   '';
 
diff --git a/pkgs/gemini/gurl/default.nix b/pkgs/gemini/gurl/default.nix
@@ -14,11 +14,14 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ zig ];
 
-  preConfigure = "HOME=$TMP";
+  buildPhase = ''
+    export HOME=$TMPDIR
+    zig build -Drelease-safe=true
+  '';
 
-  buildPhase = "zig build";
-
-  installPhase = "install -Dm755 zig-out/bin/gurl -t $out/bin";
+  installPhase = ''
+    install -Dm755 zig-out/bin/gurl -t $out/bin
+  '';
 
   meta = with lib; {
     description = "A curl-like cli application to interact with Gemini sites";
diff --git a/pkgs/gnss/visualgps/default.nix b/pkgs/gnss/visualgps/default.nix
@@ -22,7 +22,6 @@ stdenv.mkDerivation rec {
     if stdenv.isDarwin then ''
       mkdir -p $out/Applications
       mv *.app $out/Applications
-      wrapQtApp $out/Applications/VisualGPSqt.app/Contents/MacOS/VisualGPSqt
     '' else ''
       install -Dm755 VisualGPSqt -t $out/bin
     '';
diff --git a/pkgs/osm/overpass-api/default.nix b/pkgs/osm/overpass-api/default.nix
@@ -1,21 +1,19 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, expat, zlib }:
+{ lib, stdenv, fetchurl, expat, lz4, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "overpass-api";
-  version = "0.7.55";
+  version = "0.7.57.1";
 
-  src = fetchFromGitHub {
-    owner = "drolbr";
-    repo = "Overpass-API";
-    rev = "osm3s-v${version}";
-    hash = "sha256-Hf2uLVeBo95bQKubX1CSJZIEYiL2CdwjtDwSr6yOjwU=";
+  src = fetchurl {
+    url = "http://dev.overpass-api.de/releases/osm-3s_v${version}.tar.gz";
+    hash = "sha256-M5W/cCnPr4Ct4KKo+xs+21zEy86x+iBs1LqiQ8JVRhA=";
   };
 
-  sourceRoot = "${src.name}/src";
+  buildInputs = [ expat lz4 zlib ];
 
-  nativeBuildInputs = [ autoreconfHook ];
+  configureFlags = [ "--enable-lz4" ];
 
-  buildInputs = [ expat zlib ];
+  enableParallelBuilding = true;
 
   meta = with lib; {
     description = "A database engine to query the OpenStreetMap data";