nur-packages

commit 22b30ab235ecaaa1532072ba44c49dd7cbc7da99
parent 35f7474e1e1a65ad8581023fdaf37dbcfe9c4c1a
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date:   Tue,  3 Mar 2020 12:44:07 +0300

Cleanup

Diffstat:
M
pkgs/applications/mapsoft/2.nix
 | 
14
++++++++------
M
pkgs/data/maps/hiblovgpsmap/default.nix
 | 
6
+++---
M
pkgs/default.nix
 | 
1
-

3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/pkgs/applications/mapsoft/2.nix b/pkgs/applications/mapsoft/2.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, db, giflib, gsettings-desktop-schemas
+{ stdenv, fetchFromGitHub, substituteAll, db, giflib, gsettings-desktop-schemas
 , gtkmm3, jansson, libjpeg, libpng, libtiff, libxml2, libzip
 , perlPackages, pkgconfig, proj, shapelib, unzip }:
 
@@ -14,15 +14,17 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
-  patches = [ ./0002-fix-build.patch ];
+  patches = [
+    (substituteAll {
+      src = ./0002-fix-build.patch;
+      db = db.dev;
+      giflib = giflib;
+    })
+  ];
 
   postPatch = ''
     substituteInPlace modules/get_deps \
       --replace "/usr/bin/perl" "${perlPackages.perl}/bin/perl"
-    substituteInPlace modules/pc/libgif.pc \
-      --replace "@giflib@" "${giflib}"
-    substituteInPlace modules/pc/libdb.pc \
-      --replace "@db@" "${db.dev}"
     substituteInPlace modules/mapview/mapview.cpp \
       --replace "/usr/share" "${placeholder "out"}/share"
     patchShebangs .
diff --git a/pkgs/data/maps/hiblovgpsmap/default.nix b/pkgs/data/maps/hiblovgpsmap/default.nix
@@ -7,20 +7,20 @@ stdenv.mkDerivation rec {
   src = fetchurl {
     url = "https://drive.google.com/uc?export=download&id=10aAOKY8U7TQvFvuWBkwTei9iP3-cUvoE";
     sha256 = "1079bn8rkdfsbqivxkm3zi327k2i4k5p20rr2jw7gacfsvdk4954";
-    name = "OV-Hib-Lov-20191028-1.02.zip";
+    name = "OV-Hib-Lov-${stdenv.lib.replaceStrings ["-"] [""] version}-1.02.zip";
   };
 
   nativeBuildInputs = [ unzip ];
 
   unpackPhase = "unzip $src";
 
+  dontConfigure = true;
   dontBuild = true;
 
   preferLocalBuild = true;
 
   installPhase = ''
-    install -dm755 "$out/share/gpxsee/maps"
-    cp *.img "$out/share/gpxsee/maps"
+    install -Dm644 *.img -t "$out/share/gpxsee/maps"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -100,5 +100,4 @@ lib.makeScope newScope (self: with self; {
   }) // pkgs.perlPackages // {
     recurseForDerivations = false;
   };
-  inherit (perlPackages) MatchSimple SubInfix MathPolygon MathPolygonTree MathGeometryPlanarGPCPolygonXS TreeR GeoOpenstreetmapParser;
 })