diff --git a/pkgs/data/maps/gpxsee-poi/default.nix b/pkgs/data/maps/gpxsee-poi/default.nix

index e937c862e095d66d170778bdeceb9f2b2b3dcdb9..91020a47b47d2e9fd18ed9904bc3cd2d8cfc2389 100644

--- a/pkgs/data/maps/gpxsee-poi/default.nix

+++ b/pkgs/data/maps/gpxsee-poi/default.nix

@@ -2,16 +2,16 @@ { lib, fetchurl, gzip, jq }:

{

geocachingSu = fetchurl {

• name = "geocaching_su-2020-08-03";

• name = "geocaching_su-2020-08-04";

 url = "https://nakarte.me/geocachingSu/geocaching_su2.json";

• sha256 = "0wz0gacwdr2vdf22r448hy3w44wff5dhpjsyldvqgpx5kikf5aap";

• sha256 = "0gagig56p24hkcwdns31zq2xj9n9xfs9b4j83vpyq8qgzv6dyhxy";

 downloadToTemp = true;

 recursiveHash = true;

 postFetch = ''

•  install -dm755 $out/share/gpxsee/POI
  

•  install -dm755 $out
  

   cat $downloadedFile | \

     ${gzip}/bin/gzip -d | \

•    ${jq}/bin/jq -r '.[]|[.[3],.[2],.[0]]|@csv' > $out/share/gpxsee/POI/geocaching.su.csv
  

•    ${jq}/bin/jq -r '.[]|[.[3],.[2],.[0]]|@csv' > $out/geocaching.su.csv
  

 '';

 meta = with lib; {

@@ -25,14 +25,12 @@ };

};

laavut = fetchurl {

• name = "laavut-2020-07-19";

• name = "laavut-2020-07-29";

 url = "http://www.laavu.org/lataa.php?paikkakunta=kaikki";

• sha256 = "15870d4kngk6plkyyk0mhjqck17n3ypbyh2l5szmjpg7s5kidfx1";

• sha256 = "06kc7dilyg4s9vlas56nhrldn556miw25qllkhpjg4xm4imqm15v";

 downloadToTemp = true;

 recursiveHash = true;

• postFetch = ''

•  install -Dm644 $downloadedFile $out/share/gpxsee/POI/Laavut-kodat.gpx
  

• '';

• postFetch = "install -Dm644 $downloadedFile $out/Laavut-kodat.gpx";

 meta = with lib; {

   homepage = "http://www.laavu.org/";

@@ -47,12 +45,10 @@

autiotuvat = fetchurl {

 name = "autiotuvat-2020-01-13";

 url = "http://www.laavu.org/autiotuvat/lataa.php?paikkakunta=kaikki";

• sha256 = "02v4m5xpsnlmmsl549b9a2c7hidcfgi10g3mdb5bvi1jcf4xj50z";

• sha256 = "13dpdqp3vs33q05w9ii1ygd5ijs1bmqghzzylabkykc247x3n1bv";

 downloadToTemp = true;

 recursiveHash = true;

• postFetch = ''

•  install -Dm644 $downloadedFile $out/share/gpxsee/POI/Autiotuvat.gpx
  

• '';

• postFetch = "install -Dm644 $downloadedFile $out/Autiotuvat.gpx";

 meta = with lib; {

   homepage = "http://www.laavu.org/autiotuvat/";

@@ -67,14 +63,14 @@

westra = fetchurl {

 name = "westra-2020-07-16";

 url = "https://nakarte.me/westraPasses/westra_passes.json";

• sha256 = "1pav6ndyf0i19frp51m4qiyjhizhq8qi7syavvslnyjralcvllng";

• sha256 = "0ma276h6axiv58qk6il6daj3lc9v3lbx72450ba5dfv3kz822hcl";

 downloadToTemp = true;

 recursiveHash = true;

 postFetch = ''

•  install -dm755 $out/share/gpxsee/POI
  

•  install -dm755 $out
  

   cat $downloadedFile | \

     ${gzip}/bin/gzip -d | \

•    ${jq}/bin/jq -r '.[]|[.latlon[1],.latlon[0],.name]|@csv' > $out/share/gpxsee/POI/westra_passes.csv
  

•    ${jq}/bin/jq -r '.[]|[.latlon[1],.latlon[0],.name]|@csv' > $out/westra_passes.csv
  

 '';

 meta = with lib; {

@@ -90,16 +86,16 @@

strelki = fetchurl {

 name = "strelki-2020-07-10";

 url = "https://strelki.extremum.org/s/p/47p";

• sha256 = "0xbl7n4zhj9nbfv30vqypyvrnqqfq5ffx56n8lmgffwbbzxphhy4";

• sha256 = "1px8q8ka5vavalz8kbai8n274469prwif00ymfqf7415g8mhwi24";

 downloadToTemp = true;

 recursiveHash = true;

 postFetch = ''

•  install -dm755 $out/share/gpxsee/POI
  

•  install -dm755 $out
  

   cat $downloadedFile | \

     grep "L.marker" | tr ';' '\n' | sed '/^$/d' | \

     sed 's/.*\[\(.*\), \(.*\)\].*bindTooltip(\(.*\), {.*bindPopup(\(.*\)).addTo.*/\2,\1,\3,\4/' | \

     sed 's#href=#href=https://strelki.extremum.org#' | \

•    tr \' \" > $out/share/gpxsee/POI/strelki.csv
  

•    tr \' \" > $out/strelki.csv
  

 '';

 meta = with lib; {

@@ -115,13 +111,10 @@

nashipohody = fetchurl {

 name = "nashipohody-2020-07-23";

 url = "http://nashipohody.ru/wp-content/plugins/leaflet-maps-marker-pro/leaflet-kml.php?layer=1&name=show";

• sha256 = "0i7i4wh9sxykgp88zj3nbns6iy17psqsyaqd77ryx7q78qvwzm36";

• sha256 = "1bp0f125yz91x7pridzs4ggvvny98790lb1ddrnwzbwjn1v756c4";

 downloadToTemp = true;

 recursiveHash = true;

• postFetch = ''

•  install -dm755 $out/share/gpxsee/POI
  

•  cat $downloadedFile > $out/share/gpxsee/POI/nashipohody.kml
  

• '';

• postFetch = "install -Dm644 $downloadedFile $out/nashipohody.kml";

 meta = with lib; {

   homepage = "http://nashipohody.ru";

diff --git a/pkgs/data/maps/hiblovgpsmap/default.nix b/pkgs/data/maps/hiblovgpsmap/default.nix

index c4bb36372d7dbd9839af0ed2faada4f5bbc90219..eb332f85fc2b8e7b82dfbadcdebe78a88bdb762b 100644

--- a/pkgs/data/maps/hiblovgpsmap/default.nix

+++ b/pkgs/data/maps/hiblovgpsmap/default.nix

@@ -1,9 +1,9 @@

-{ stdenv, fetchgdrive, unzip }:

+{ stdenvNoCC, lib, fetchgdrive, unzip }:

let

version = "2019-10-28";

• filename = "OV-Hib-Lov-${stdenv.lib.replaceStrings [ "-" ] [ "" ] version}-1.02.zip";

• filename = "OV-Hib-Lov-${lib.replaceStrings [ "-" ] [ "" ] version}-1.02.zip";

in

-stdenv.mkDerivation {

+stdenvNoCC.mkDerivation {

pname = "hiblovgpsmap";

inherit version;

@@ -15,16 +15,11 @@ };

unpackPhase = "${unzip}/bin/unzip $src";

• dontConfigure = true;

• dontBuild = true;

• installPhase = "install -Dm644 *.img -t $out";

preferLocalBuild = true;

• installPhase = ''

• install -Dm644 *.img -t $out/share/gpxsee/maps

• '';

• meta = with stdenv.lib; {

• meta = with lib; {

 description = "Detailed map of Khibins and Lovozero for GPS";

 homepage = "https://vk.com/hiblovgpsmap";

 license = licenses.free;

diff --git a/pkgs/data/maps/maptourist/default.nix b/pkgs/data/maps/maptourist/default.nix

index 04b76d87fc5d65ce21bfb02bf118d0d8ed29ed80..68858617950da751897b17d86a8f319254066570 100644

--- a/pkgs/data/maps/maptourist/default.nix

+++ b/pkgs/data/maps/maptourist/default.nix

@@ -1,20 +1,17 @@

-{ stdenv, sources, unzip }:

+{ stdenvNoCC, lib, sources, unzip }:

-stdenv.mkDerivation {

+stdenvNoCC.mkDerivation {

pname = "maptourist";

version = sources.maptourist.version;

src = sources.maptourist;

• preferLocalBuild = true;

dontUnpack = true;

• installPhase = ''

• install -dm755 $out/share/gpxsee/maps

• ${unzip}/bin/unzip -j $src -d $out/share/gpxsee/maps

• '';

• installPhase = "${unzip}/bin/unzip $src -d $out";

• preferLocalBuild = true;

• meta = with stdenv.lib; {

• meta = with lib; {

 inherit (sources.maptourist) description homepage;

 license = licenses.free;

 maintainers = [ maintainers.sikmir ];

diff --git a/pkgs/data/maps/qmapshack-onlinemaps/default.nix b/pkgs/data/maps/qmapshack-onlinemaps/default.nix

index 810aa7ec3e21ea9177187ec9c65ba27db7ddf227..1af62eb773b655d348260fd611ef0c095bf59971 100644

--- a/pkgs/data/maps/qmapshack-onlinemaps/default.nix

+++ b/pkgs/data/maps/qmapshack-onlinemaps/default.nix

@@ -1,21 +1,13 @@

-{ stdenv, fetchzip }:

-stdenv.mkDerivation {

• pname = "qmapshack-onlinemaps";

• version = "2020-07-25";

+{ lib, fetchzip }:

• src = fetchzip {

• url = "http://www.mtb-touring.net/wordpress/wp-content/uploads/Onlinemaps.zip";

• sha256 = "1khfmbrq85bb2gq2b0c22qsjqk3740x7lbsv2zwqnflfjckqlpgi";

• stripRoot = false;

• };

+fetchzip {

• name = "qmapshack-onlinemaps-2020-07-25";

• installPhase = ''

• install -dm755 $out/share/qmapshack/Maps

• cp -r $src/* $out/share/qmapshack/Maps

• '';

• url = "http://www.mtb-touring.net/wordpress/wp-content/uploads/Onlinemaps.zip";

• sha256 = "1khfmbrq85bb2gq2b0c22qsjqk3740x7lbsv2zwqnflfjckqlpgi";

• stripRoot = false;

• meta = with stdenv.lib; {

• meta = with lib; {

 description = "Onlinekarten einbinden";

 homepage = "http://www.mtb-touring.net/qms/onlinekarten-einbinden/";

 license = licenses.free;

diff --git a/pkgs/data/maps/slazav/hr.nix b/pkgs/data/maps/slazav/hr.nix

index 0ef5d95b04f374616f3ab88a84684b11f5435c33..f5add149e4245d70058b7bf497bd0bb68907b338 100644

--- a/pkgs/data/maps/slazav/hr.nix

+++ b/pkgs/data/maps/slazav/hr.nix

@@ -35,7 +35,7 @@

buildFlags = [ "out" "img" ];

installPhase = ''

• install -Dm644 hr.img -t $out/share/gpxsee/maps

• install -Dm644 hr.img -t $out

'';

meta = with stdenv.lib; {

diff --git a/pkgs/data/maps/slazav/podm.nix b/pkgs/data/maps/slazav/podm.nix

index f8777135f05d654b027650e155523d4eb06a8dea..55bc6943323af7419eb06227e21043041a8e80a5 100644

--- a/pkgs/data/maps/slazav/podm.nix

+++ b/pkgs/data/maps/slazav/podm.nix

@@ -33,7 +33,7 @@

buildFlags = [ "out" "img" ];

installPhase = ''

• install -Dm644 podm.img -t $out/share/gpxsee/maps

• install -Dm644 podm.img -t $out

'';

meta = with stdenv.lib; {

diff --git a/pkgs/data/themes/goldendict-themes/dark-theme.nix b/pkgs/data/themes/goldendict-themes/dark-theme.nix

index e892e83716248223e8164ed829d760986a1fe146..9eb5f6dbaa050abe3bf505a7afe2d8f26c478cf0 100644

--- a/pkgs/data/themes/goldendict-themes/dark-theme.nix

+++ b/pkgs/data/themes/goldendict-themes/dark-theme.nix

@@ -1,23 +1,12 @@

-{ stdenv, fetchgit }:

+{ lib, fetchgit }:

-stdenv.mkDerivation {

• pname = "goldendict-dark-theme";

• version = "2018-11-08";

• src = fetchgit {

• url = "https://gist.github.com/ilius/5a2f35c79775267fbdb249493c041453";

• rev = "5c616fa8120fbf8aee9bc2d33e70f54e0990e759";

• sha256 = "1rpkfcjp3dhdnrnf68id956hvm8bn655cp8v4if5s753vx5ni012";

• };

• dontBuild = true;

• installPhase = ''

• install -Dm644 article-style.css -t $out/share/goldendict/styles/dark-theme

• install -Dm644 qt-style.css -t $out/share/goldendict/styles/dark-theme

• '';

• meta = with stdenv.lib; {

+(fetchgit {

• name = "goldendict-dark-theme-2018-11-08";

• url = "https://gist.github.com/ilius/5a2f35c79775267fbdb249493c041453";

• rev = "5c616fa8120fbf8aee9bc2d33e70f54e0990e759";

• sha256 = "1rpkfcjp3dhdnrnf68id956hvm8bn655cp8v4if5s753vx5ni012";

+}) // {

• meta = with lib; {

 description = "GoldenDict Dark Theme";

 homepage = "https://gist.github.com/ilius/5a2f35c79775267fbdb249493c041453";

 license = licenses.free;