diff --git a/default.nix b/default.nix

index d69b8f5eebeeb1c6682a0196c4587dbce2d21398..3eba3fa4695f3c60e6bfe2f39bcec80664e84711 100644

--- a/default.nix

+++ b/default.nix

@@ -1,18 +1,34 @@

-{ pkgs ? import {} }:

+{ pkgs ? import { } }:

with pkgs;

-let

• sources = import ./nix/sources.nix;

-in

-{

• datamaps = callPackage ./pkgs/datamaps { inherit (sources) datamaps; };

• gpx-layer = perlPackages.callPackage ./pkgs/gpx-layer { inherit (sources) gpx-layer; };

• gpxlab = libsForQt5.callPackage ./pkgs/gpxlab { inherit (sources) GPXLab; };

• gpxpy = python3Packages.callPackage ./pkgs/gpxpy { inherit (sources) gpxpy; };

• gpxsee-maps = callPackage ./pkgs/gpxsee-maps { inherit (sources) GPXSee-maps; };

• gpxtools = callPackage ./pkgs/gpxtools { inherit (sources) gpxtools; };

• gt4gd = python3Packages.callPackage ./pkgs/gt4gd { inherit (sources) google-translate-for-goldendict; };

• mbutil = python3Packages.callPackage ./pkgs/mbutil { inherit (sources) mbutil; };

• redict = libsForQt5.callPackage ./pkgs/redict { inherit (sources) redict; };

+let sources = import ./nix/sources.nix;

+in {

• datamaps = callPackage ./pkgs/datamaps {

• inherit (sources) datamaps;

• };

• gpx-layer = perlPackages.callPackage ./pkgs/gpx-layer {

• inherit (sources) gpx-layer;

• };

• gpxlab = libsForQt5.callPackage ./pkgs/gpxlab {

• inherit (sources) GPXLab;

• };

• gpxpy = python3Packages.callPackage ./pkgs/gpxpy {

• inherit (sources) gpxpy;

• };

• gpxsee-maps = callPackage ./pkgs/gpxsee-maps {

• inherit (sources) GPXSee-maps;

• };

• gpxtools = callPackage ./pkgs/gpxtools {

• inherit (sources) gpxtools;

• };

• gt4gd = python3Packages.callPackage ./pkgs/gt4gd {

• inherit (sources) google-translate-for-goldendict;

• };

• mbutil = python3Packages.callPackage ./pkgs/mbutil {

• inherit (sources) mbutil;

• };

• redict = libsForQt5.callPackage ./pkgs/redict {

• inherit (sources) redict;

• };

}

diff --git a/pkgs/datamaps/default.nix b/pkgs/datamaps/default.nix

index 983bff6bc95e3e0b516c342f35ea6a0f573a639d..c9ff19388b801341a98668648c51a2e08dd205a0 100644

--- a/pkgs/datamaps/default.nix

+++ b/pkgs/datamaps/default.nix

@@ -12,15 +12,14 @@ makeFlags = [ "PREFIX=$(out)" ];

enableParallelBuilding = true;

installPhase = ''

• install -Dm755 encode $out/bin/datamaps-encode

• install -Dm755 enumerate $out/bin/datamaps-enumerate

• install -Dm755 merge $out/bin/datamaps-merge

• install -Dm755 render $out/bin/datamaps-render

• for tool in encode enumerate merge render; do

•  install -Dm755 $tool $out/bin/$pname-$tool
  

• done

'';

meta = with stdenv.lib; {

 description = datamaps.description;

• homepage = https://github.com/ericfischer/datamaps;

• homepage = "https://github.com/ericfischer/datamaps";

 license = licenses.bsd2;

 maintainers = with maintainers; [ sikmir ];

 platforms = platforms.linux ++ platforms.darwin;

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

index 9d9dc5d242602da0677d733f16fde326ab3e6c64..3c5ee84726afeed530f5d4e7fc137893e7881ef9 100644

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

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

@@ -12,7 +12,7 @@ '';

meta = with stdenv.lib; {

 description = GPXSee-maps.description;

• homepage = https://github.com/tumic0/GPXSee-maps;

• homepage = "https://github.com/tumic0/GPXSee-maps";

 license = licenses.unlicense;

 maintainers = with maintainers; [ sikmir ];

 platforms = platforms.unix;