nur-packages

commit 57dd5db21ff72fbed4f9a36fb80e3e803d9834a9
parent 5a0b55ce79133658806be909ab4d30f9f55847f1
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date:   Sun, 28 Jan 2024 17:48:06 +0400

Up

Diffstat:
M
pkgs/data/maps/usa-osm-topo-routable/default.nix
 | 
32
++++++--------------------------
M
pkgs/misc/pvs-studio/how-to-use-pvs-studio-free.nix
 | 
9
++++++---

2 files changed, 12 insertions(+), 29 deletions(-)
diff --git a/pkgs/data/maps/usa-osm-topo-routable/default.nix b/pkgs/data/maps/usa-osm-topo-routable/default.nix
@@ -2,36 +2,16 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "usa-osm-topo-routable";
-  version = "33";
+  version = "39";
 
-  srcs = [
-    (fetchurl {
-      url = "http://gmaptool.eu/sites/default/files/download/USA_OSM_Topo_v${version}.7z.001";
-      sha256 = "0603ja9j0m7yi88ykq60ix4savqr74nc4dhrjfhjidxm0zrdc48k";
-    })
-    (fetchurl {
-      url = "http://gmaptool.eu/sites/default/files/download/USA_OSM_Topo_v${version}.7z.002";
-      sha256 = "1q9l03fqnxd6rm6w77sjb1wd9cqc62ilraplrz2a0fsnf2n4wx5n";
-    })
-    (fetchurl {
-      url = "http://gmaptool.eu/sites/default/files/download/USA_OSM_Topo_v${version}.7z.003";
-      sha256 = "1kk82qp6xmsjh2s9jfjmvpa5ckiqhkl5a3hazamdaxk30zg3d0h5";
-    })
-    (fetchurl {
-      url = "http://gmaptool.eu/sites/default/files/download/USA_OSM_Topo_v${version}.7z.004";
-      sha256 = "1bp73mnd6bcwj9clps6knvrmpsykx9akqv31jai7kg2x500zq79m";
-    })
-    (fetchurl {
-      url = "http://gmaptool.eu/sites/default/files/download/USA_OSM_Topo_v${version}.7z.005";
-      sha256 = "1wz1kxinh6fh092zm6wzknkp46xdbnmdnd9mbclx1a2q6fid74x2";
-    })
-  ];
-
-  unpackPhase = lib.concatMapStringsSep "\n" (src: "ln -s ${src} ${src.name}") srcs;
+  src = fetchurl {
+    url = "https://gmaptool.eu/sites/default/files/download/USA_OSM_Topo_Base_v${version}.7z";
+    hash = "sha256-MeXzOWmVRX11NFcFCNRdCn7k4i+ckqmJ4jNl9jVaqqk=";
+  };
 
   nativeBuildInputs = [ p7zip ];
 
-  installPhase = "7z x USA_OSM_Topo_v${version}.7z.001 -o$out";
+  installPhase = "7z x USA_OSM_Topo_v${version}.7z -o$out";
 
   meta = with lib; {
     description = "USA OSM Topo Routable";
diff --git a/pkgs/misc/pvs-studio/how-to-use-pvs-studio-free.nix b/pkgs/misc/pvs-studio/how-to-use-pvs-studio-free.nix
@@ -18,13 +18,16 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
-  nativeBuildInputs = [ cmake ];
-
-  postPatch = lib.optionalString (!stdenv.isDarwin) ''
+  postPatch = ''
+    sed -i '10i #include <cstdint>' comments.h
     substituteInPlace CMakeLists.txt \
       --replace "set(CMAKE_INSTALL_PREFIX \"/usr\")" ""
   '';
 
+  nativeBuildInputs = [ cmake ];
+
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=unqualified-std-cast-call";
+
   meta = with lib; {
     description = "How to use PVS-Studio for Free?";
     homepage = "https://pvs-studio.com/en/blog/posts/0457/";