nur-packages

commit 51d82978ca15fc40bbab21d08e82c98a95062481
parent 20aae9133f40a8c6d25f2e4465348204d821bcfb
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date:   Sun,  6 Nov 2022 22:30:17 +0300

Up

Diffstat:
M
pkgs/applications/misc/klogg/bin.nix
 | 
16
++++++++--------
M
pkgs/data/osm/osm-extracts/default.nix
 | 
4
++--
M
pkgs/osm/osmium-surplus/default.nix
 | 
8
+++++++-

3 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/pkgs/applications/misc/klogg/bin.nix b/pkgs/applications/misc/klogg/bin.nix
@@ -4,21 +4,21 @@ let
   throwSystem = throw "Unsupported system: ${system}";
 
   pname = "klogg-bin";
-  version = "20.12";
+  version = "22.06";
 
   suffix = {
-    x86_64-linux = "x86_64.AppImage";
-    x86_64-darwin = "OSX.dmg";
+    x86_64-linux = "Linux-amd64.AppImage";
+    x86_64-darwin = "OSX-Qt5.dmg";
   }.${system} or throwSystem;
 
   src = fetchfromgh {
     owner = "variar";
     repo = "klogg";
     version = "v${version}";
-    name = "klogg-${version}.0.813-${suffix}";
-    sha256 = {
-      x86_64-linux = "1m0yl6bd6ahxqljqfjvd6p9nm4vyr4pyrr1qzm70nn2rn4vi4w83";
-      x86_64-darwin = "07iyg1i6n5ydg99q75wlbl1jh1n1cdjl3rbia2kx6y7dg80lx0d1";
+    name = "klogg-${version}.0.1289-${suffix}";
+    hash = {
+      x86_64-linux = "sha256-XawJ6VOF0XtMrl7iefm13quv83X171k9eKiXClrklZI=";
+      x86_64-darwin = "sha256-5d93ItDYUYUt2cw0Sd1C0f7z507dqMINwEs4y4UrD+w=";
     }.${system} or throwSystem;
   };
 
@@ -41,7 +41,7 @@ let
     extraInstallCommands = ''
       mv $out/bin/{${pname}-${version},klogg}
       install -Dm644 ${appimageContents}/klogg.desktop -t $out/share/applications
-      install -Dm644 ${appimageContents}/klogg.svg -t $out/share/icons/hicolor/scalable/apps
+      install -Dm644 ${appimageContents}/klogg.png -t $out/share/icons/hicolor/scalable/apps
     '';
   };
 
diff --git a/pkgs/data/osm/osm-extracts/default.nix b/pkgs/data/osm/osm-extracts/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "osm-extracts";
-  version = "221028";
+  version = "221105";
 
   src = fetchurl {
     url = "https://download.geofabrik.de/russia/northwestern-fed-district-${version}.osm.pbf";
-    hash = "sha256-3N8++FXVRHG3pryZcRa8B4Ey+blBFJ5f2IGqe+M/QZQ=";
+    hash = "sha256-nNDsViJqL5CWOaZdzb/3eLH69FqHmXMWMxvb/v+S9Gg=";
   };
 
   dontUnpack = true;
diff --git a/pkgs/osm/osmium-surplus/default.nix b/pkgs/osm/osmium-surplus/default.nix
@@ -24,6 +24,13 @@ stdenv.mkDerivation rec {
     hash = "sha256-Cl7Umi/hn+Kbd5YDV89EmpsL6vm+n5Snt3ceiH4clUY=";
   };
 
+  postPatch = lib.optionalString stdenv.isDarwin ''
+    # broken on darwin
+    substituteInPlace src/CMakeLists.txt \
+      --replace "exec(osp-find-multipolygon-problems" "#" \
+      --replace "exec(osp-find-relation-problems" "#"
+  '';
+
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [
@@ -44,6 +51,5 @@ stdenv.mkDerivation rec {
     license = with licenses; [ gpl3Plus boost ];
     maintainers = [ maintainers.sikmir ];
     platforms = platforms.unix;
-    broken = stdenv.isDarwin;
   };
 }