diff --git a/pkgs/applications/gpxlab/default.nix b/pkgs/applications/gpxlab/default.nix

index 54e0c725176945ee6662e7d9586898896519b442..c730e2ce34f940604908315130cfe74d3c74ac0c 100644

--- a/pkgs/applications/gpxlab/default.nix

+++ b/pkgs/applications/gpxlab/default.nix

@@ -1,5 +1,13 @@

-{ stdenv, mkDerivation, lib, qmake, qtbase, qttools, qttranslations, sources

-, withI18n ? false }:

+{ stdenv

+, mkDerivation

+, lib

+, qmake

+, qtbase

+, qttools

+, qttranslations

+, sources

+, withI18n ? true

+}:

mkDerivation rec {

pname = "gpxlab";

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

index 5cdfe2e926ba2d693e4b278f4749f4cb8c349c4e..44583b33b45463c933358c772ce77439f08695f1 100644

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

+++ b/pkgs/applications/gpxsee/default.nix

@@ -1,5 +1,13 @@

-{ stdenv, mkDerivation, lib, qmake, qtbase, qttools, qttranslations, sources

-, withI18n ? true }:

+{ stdenv

+, mkDerivation

+, lib

+, qmake

+, qtbase

+, qttools

+, qttranslations

+, sources

+, withI18n ? true

+}:

mkDerivation rec {

pname = "gpxsee";

diff --git a/pkgs/applications/openorienteering-mapper/default.nix b/pkgs/applications/openorienteering-mapper/default.nix

index ce76c46e870f3b114645abe8fe5511c5326d285d..043fb48ddd10691b02824fb8aac3aa99908f49f6 100644

--- a/pkgs/applications/openorienteering-mapper/default.nix

+++ b/pkgs/applications/openorienteering-mapper/default.nix

@@ -1,4 +1,5 @@

{ stdenv

+, lib

, gdal

, cmake

, ninja

@@ -18,7 +19,7 @@ }:

stdenv.mkDerivation rec {

pname = "OpenOrienteering-Mapper";

• version = stdenv.lib.substring 0 7 src.rev;

• version = lib.substring 0 7 src.rev;

src = sources.mapper;

buildInputs = [

@@ -42,7 +43,7 @@ # Building the manual and bundling licenses fails

 "-DLICENSING_PROVIDER:BOOL=OFF"

 "-DMapper_MANUAL_QTHELP:BOOL=OFF"

] ++ (

• stdenv.lib.optionals stdenv.isDarwin [

• lib.optionals stdenv.isDarwin [

   # Usually enabled on Darwin

   "-DCMAKE_FIND_FRAMEWORK=never"

   # FindGDAL is broken and always finds /Library/Framework unless this is

@@ -58,15 +59,15 @@ "-DMapper_PACKAGE_GDAL=0"

 ]

);

• postInstall = stdenv.lib.optionalString stdenv.isDarwin ''

• postInstall = lib.optionalString stdenv.isDarwin ''

• mkdir -p $out/Applications

• mv $out/Mapper.app $out/Applications

 # Fixes "This application failed to start because it could not find or load the Qt

 # platform plugin "cocoa"."

• wrapQtApp $out/Mapper.app/Contents/MacOS/Mapper

• mkdir -p $out/bin

• ln -s $out/Mapper.app/Contents/MacOS/Mapper $out/bin/mapper

• wrapQtApp $out/Applications/Mapper.app/Contents/MacOS/Mapper

'';

• meta = with stdenv.lib; {

• meta = with lib; {

 inherit (src) description homepage;

 license = licenses.gpl3;

 maintainers = with maintainers; [ sikmir ];

diff --git a/pkgs/applications/redict/default.nix b/pkgs/applications/redict/default.nix

index 8d4841846b6201e425291f915f2de78c43d56d10..df8ae6550fee6222ff76004a321904ddba766aa8 100644

--- a/pkgs/applications/redict/default.nix

+++ b/pkgs/applications/redict/default.nix

@@ -1,4 +1,5 @@

{ mkDerivation

+, stdenv

, lib

, pkgconfig

, qmake

@@ -21,7 +22,12 @@ src = sources.redict;

nativeBuildInputs = [ qmake pkgconfig ] ++ (lib.optional withI18n qttools);

buildInputs =

• [ qtbase qtmultimedia qtsvg qtx11extras libX11 libXext libXtst ];

• [ qtbase qtmultimedia qtsvg ] ++ (lib.optionals stdenv.isLinux [ qtx11extras libX11 libXext libXtst ]);

• postPatch = ''

• substituteInPlace redict.pro \

•  --replace "unix " "unix:!mac "
  

• '';

preConfigure = lib.optionalString withI18n ''

 lupdate redict.pro

@@ -40,6 +46,6 @@ meta = with lib; {

 inherit (src) description homepage;

 license = licenses.gpl3;

 maintainers = with maintainers; [ sikmir ];

• platforms = platforms.linux;

• platforms = with platforms; linux ++ darwin;

};

}

diff --git a/pkgs/build-support/fetchgdrive/default.nix b/pkgs/build-support/fetchgdrive/default.nix

index d2776c2bf7595db5dbf4b35225efea37950c7709..eba46d5632876fc0ae30a067a38d98e5b666de07 100644

--- a/pkgs/build-support/fetchgdrive/default.nix

+++ b/pkgs/build-support/fetchgdrive/default.nix

@@ -2,6 +2,10 @@ { fetchurl }:

{ id, ... } @ args:

-(fetchurl ({

• url = "https://drive.google.com/uc?export=download&id=${id}";

-} // removeAttrs args [ "id" ]))

+(

• fetchurl (

• {

•  url = "https://drive.google.com/uc?export=download&id=${id}";
  

• } // removeAttrs args [ "id" ]

• )

+)

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

index 3a313588656f7818c91637c68c9efcc3bb42077e..46b707364f7007046b7bcb9f2af4e6b004637456 100644

--- a/pkgs/default.nix

+++ b/pkgs/default.nix

@@ -25,7 +25,7 @@ };

 ### BUILD SUPPORT

• fetchgdrive = callPackage ./build-support/fetchgdrive { };

• fetchgdrive = callPackage ./build-support/fetchgdrive {};

 ### DATA

diff --git a/pkgs/tools/cfiles/default.nix b/pkgs/tools/cfiles/default.nix

index a085743b740227b3cd7dda0278001ca3832a1fa3..7780eca138580490eb9fcde9b5c5f1d616ecf7a7 100644

--- a/pkgs/tools/cfiles/default.nix

+++ b/pkgs/tools/cfiles/default.nix

@@ -10,6 +10,7 @@ buildInputs = [ ncurses w3m ueberzug ];

prePatch = ''

 substituteInPlace Makefile \

•  --replace "CC = gcc" "" \
  

   --replace "prefix = usr" "prefix=$out"

 substituteInPlace scripts/clearimg \

   --replace "/usr/lib/w3m/w3mimgdisplay" "${w3m}/bin/w3mimgdisplay"

@@ -23,6 +24,6 @@ meta = with stdenv.lib; {

 inherit (src) description homepage;

 license = licenses.mit;

 maintainers = with maintainers; [ sikmir ];

• platforms = platforms.unix;

• platforms = with platforms; linux ++ darwin;

};

}

diff --git a/pkgs/tools/dict/stardict-tools/default.nix b/pkgs/tools/dict/stardict-tools/default.nix

index af475b361d27241d49370e44186153c486ae3e61..47146b396c64f7a219c23ad9f7d0a3357fc7cb46 100644

--- a/pkgs/tools/dict/stardict-tools/default.nix

+++ b/pkgs/tools/dict/stardict-tools/default.nix

@@ -28,7 +28,10 @@ libxml2

 pcre

];

• NIX_CFLAGS_COMPILE = [ "-Wno-error=format-security" ];

• NIX_CFLAGS_COMPILE = [

• "-std=c++03"

• "-Wno-error=format-security"

• ];

postPatch = ''

 substituteInPlace tools/src/wikipediaImage.cpp \

@@ -37,7 +40,7 @@ substituteInPlace tools/src/Makefile.am \

   --replace "noinst_PROGRAMS =" "bin_PROGRAMS ="

'';

• preConfigure = ''./autogen.sh'';

• preConfigure = "./autogen.sh";

configureFlags = [ "--disable-dict" ];

postInstall = ''

@@ -52,6 +55,6 @@ meta = with stdenv.lib; {

 inherit (src) description homepage;

 license = licenses.gpl3;

 maintainers = with maintainers; [ sikmir ];

• platforms = platforms.linux;

• platforms = with platforms; linux ++ darwin;

};

}

diff --git a/pkgs/tools/geo/gimgtools/default.nix b/pkgs/tools/geo/gimgtools/default.nix

index 85082c3143721a7bea763d0b4a50867e426f8367..0936aceb3af1558dc7aa329601e1491c7f5226eb 100644

--- a/pkgs/tools/geo/gimgtools/default.nix

+++ b/pkgs/tools/geo/gimgtools/default.nix

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

-{ stdenv, sources }:

+{ stdenv, sources, libiconv }:

stdenv.mkDerivation rec {

pname = "gimgtools";

version = stdenv.lib.substring 0 7 src.rev;

src = sources.gimgtools;

• buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv;

• postPatch = stdenv.lib.optionalString stdenv.isDarwin ''

• substituteInPlace Makefile \

•  --replace "CC = gcc" ""
  

• '';

installPhase = ''

 for tool in gimginfo gimgfixcmd gimgxor gimgunlock gimgch gimgextract cmdc; do

diff --git a/pkgs/tools/geo/ocad2img/default.nix b/pkgs/tools/geo/ocad2img/default.nix

index e120bc600a03e1ff33c8eb36ce264be7d80df45a..e7c52c91d387af3175a330c369a7874f47aa0bb7 100644

--- a/pkgs/tools/geo/ocad2img/default.nix

+++ b/pkgs/tools/geo/ocad2img/default.nix

@@ -43,6 +43,6 @@ description = "Converter from OCAD map format to Garmin format";

 homepage = "http://news.worldofo.com/2009/10/11/howto-convert-any-orienteering-map-to-a-garmin-map/";

 license = licenses.gpl3;

 maintainers = with maintainers; [ sikmir ];

• platforms = platforms.unix;

• platforms = platforms.linux;

};

}

diff --git a/pkgs/tools/geo/ocad2mp/default.nix b/pkgs/tools/geo/ocad2mp/default.nix

index c4e1ab2423a8f883a0b7684538450e136077ed9f..f02a7901a1626084f45395eff32df380ca00460c 100644

--- a/pkgs/tools/geo/ocad2mp/default.nix

+++ b/pkgs/tools/geo/ocad2mp/default.nix

@@ -10,9 +10,24 @@ rev = "269";

 sha256 = "1700apfsjd27q9jsvvr94mk7rd0x24ib3bkn4y8hak0zvknib563";

};

• NIX_CFLAGS_COMPILE = "-std=c++03 -include stddef.h -Wno-error=format-security";

• postPatch = stdenv.lib.optionalString stdenv.isDarwin ''

• substituteInPlace Makefile.gcc \

•  --replace "CXX=g++" "" \
  

•  --replace "LINK=g++" "LINK=$CXX" \
  

•  --replace "-lgcc" ""
  

• '';

• NIX_CFLAGS_COMPILE = [

• "-std=c++03"

• "-include stddef.h"

• "-Wno-error=format-security"

• ];

• makeFlags = [ "-f" "Makefile.gcc" "CFG=Release" "TARGET_ARCH_BITS=64" ];

• makeFlags = [

• "-f Makefile.gcc"

• "CFG=Release"

• "TARGET_ARCH_BITS=64"

• ];

installPhase = ''

 install -Dm755 Release/ocad2mp -t "$out/bin"

@@ -24,6 +39,6 @@ description = "Converter from OCAD map format to Polish format";

 homepage = "https://sourceforge.net/projects/ocad2mp/";

 license = licenses.gpl2;

 maintainers = with maintainers; [ sikmir ];

• platforms = platforms.linux;

• platforms = with platforms; linux ++ darwin;

};

}