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

index 41087bf04b1cec0d14f41f5cfe2bf8ad822b58bc..1f5b4a449798539ffec3a0869a56ef1667d63e7d 100644

--- a/pkgs/garmin/garminimg/default.nix

+++ b/pkgs/garmin/garminimg/default.nix

@@ -1,6 +1,6 @@

-{ lib, mkDerivation, fetchFromGitHub, cmake, gdal, proj }:

+{ lib, stdenv, fetchFromGitHub, cmake, gdal, proj, wrapQtAppsHook }:

-mkDerivation (finalAttrs: {

+stdenv.mkDerivation rec {

pname = "garminimg";

version = "2021-01-07";

@@ -20,19 +20,21 @@ substituteInPlace srcDecodeImg/CMakeLists.txt \

   --replace "PROJ4_" "PROJ_"

'';

• nativeBuildInputs = [ cmake ];

• nativeBuildInputs = [ cmake wrapQtAppsHook ];

buildInputs = [ gdal proj ];

hardeningDisable = [ "format" ];

• installPhase = "install -Dm755 bin/* -t $out/bin";

• installPhase = ''

• install -Dm755 bin/* -t $out/bin

• '';

meta = with lib; {

 description = "Encode/decode a Garmin IMG file";

• inherit (finalAttrs.src.meta) homepage;

• inherit (src.meta) homepage;

 license = licenses.gpl3Plus;

 maintainers = [ maintainers.sikmir ];

 platforms = platforms.unix;

};

-})

+}

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

index b60ee35d0b8161be6139cd4bedb12db5bfd80f0a..a7b2af876bddb4c2473b1250749817cc0ade4d80 100644

--- a/pkgs/geospatial/polyvectorization/default.nix

+++ b/pkgs/geospatial/polyvectorization/default.nix

@@ -1,6 +1,6 @@

{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, boost165, eigen, opencv2 }:

-mkDerivation (finalAttrs: {

+stdenv.mkDerivation rec {

pname = "polyvectorization";

version = "2019-08-23";

@@ -24,15 +24,17 @@ buildInputs = [ boost165 eigen opencv2 ];

NIX_CFLAGS_COMPILE = "-fpermissive";

• installPhase = "install -Dm755 polyvector_thing -t $out/bin";

• installPhase = ''

• install -Dm755 polyvector_thing -t $out/bin

• '';

meta = with lib; {

 description = "Reference implementation of Vectorization of Line Drawings via PolyVector Fields";

• inherit (finalAttrs.src.meta) homepage;

• inherit (src.meta) homepage;

 license = licenses.mit;

 maintainers = [ maintainers.sikmir ];

 platforms = platforms.linux;

 mainProgram = "polyvector_thing";

 skip.ci = stdenv.isDarwin;

};

-})

+}

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

index c4b793fb42f559bda429f58cda0a3135e7c7dcf2..5df7cad26e36e39bf925a73c56b7904a63af875c 100644

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

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

@@ -15,7 +15,7 @@ , libXtst

, withI18n ? true

}:

-stdenv.mkDerivation (finalAttrs: {

+stdenv.mkDerivation rec {

pname = "redict";

version = "2019-06-21";

@@ -50,10 +50,10 @@ ];

meta = with lib; {

 description = "A dictionary for Linux, based on C++/Qt development";

• inherit (finalAttrs.src.meta) homepage;

• inherit (src.meta) homepage;

 license = licenses.gpl3;

 maintainers = [ maintainers.sikmir ];

 platforms = platforms.unix;

 broken = stdenv.isDarwin;

};

-})

+}

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

index a4a6bdda96a9b36851571b4923987f1f9d3e7203..07c4052c4603a7648a280efc76e3a4017acdb5c8 100644

--- a/pkgs/misc/capture2text/default.nix

+++ b/pkgs/misc/capture2text/default.nix

@@ -1,11 +1,11 @@

{ lib, stdenv, fetchurl, qmake, unzip, leptonica, tesseract4, wrapQtAppsHook }:

-stdenv.mkDerivation (finalAttrs: {

+stdenv.mkDerivation rec {

pname = "capture2text";

version = "4.6.2";

src = fetchurl {

• url = "mirror://sourceforge/capture2text/SourceCode/Capture2Text_v${finalAttrs.version}/Capture2Text_v${finalAttrs.version}_Source_Code.zip";

• url = "mirror://sourceforge/capture2text/SourceCode/Capture2Text_v${version}/Capture2Text_v${version}_Source_Code.zip";

 hash = "sha256-FeQ5E2lW+QOcg6Qi1I75W4BkQmfDiZtJ7+U2K08Ji2U=";

};

@@ -59,4 +59,4 @@ license = licenses.gpl3Plus;

 maintainers = [ maintainers.sikmir ];

 platforms = platforms.unix;

};

-})

+}

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

index 52d9bc15ca721726a6abc1cc9ae570e9dd689081..ad920f272444a5622f419f4ae3a5cf3bdeec88f1 100644

--- a/pkgs/radio/fmreceiver/default.nix

+++ b/pkgs/radio/fmreceiver/default.nix

@@ -2,14 +2,14 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, fftwFloat, libsamplerate, libsndfile, libusb1

, portaudio, rtl-sdr, qmake, qwt, wrapQtAppsHook

}:

-stdenv.mkDerivation (finalAttrs: {

+stdenv.mkDerivation rec {

pname = "fmreceiver";

version = "2.1";

src = fetchFromGitHub {

 owner = "JvanKatwijk";

 repo = "sdr-j-fm";

• rev = finalAttrs.version;

• rev = version;

 hash = "sha256-U0m9PIB+X+TBoz5FfXMvR/tZjkNIy7B613I7eLT5UIs=";

};

@@ -51,9 +51,9 @@ '';

meta = with lib; {

 description = "A simple FM receiver";

• inherit (finalAttrs.src.meta) homepage;

• inherit (src.meta) homepage;

 license = licenses.gpl2Plus;

 maintainers = [ maintainers.sikmir ];

 platforms = platforms.unix;

};

-})

+}

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

index 022cf463ff1157f58b89682e819a8ccdda2de54d..5172ed3377673396f3e45ca8c02f42a9bfb9807c 100644

--- a/pkgs/radio/sigdigger/default.nix

+++ b/pkgs/radio/sigdigger/default.nix

@@ -3,14 +3,14 @@ , curl, fftw, fftwFloat, libsndfile, portaudio

, sigutils, soapysdr, suscan, suwidgets, volk

}:

-stdenv.mkDerivation (finalAttrs: {

+stdenv.mkDerivation rec {

pname = "sigdigger";

version = "0.3.0";

src = fetchFromGitHub {

 owner = "BatchDrake";

 repo = "SigDigger";

• rev = "v${finalAttrs.version}";

• rev = "v${version}";

 hash = "sha256-dS+Fc0iQz7GIlGaR556Ur/EQh3Uzhqm9uBW42IuEqoE=";

};

@@ -38,9 +38,9 @@ '';

meta = with lib; {

 description = "Qt-based digital signal analyzer, using Suscan core and Sigutils DSP library";

• inherit (finalAttrs.src.meta) homepage;

• inherit (src.meta) homepage;

 license = licenses.gpl3Plus;

 maintainers = [ maintainers.sikmir ];

 platforms = platforms.unix;

};

-})

+}

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

index 974009c2aa395501bc9b8b6fd0cfe8604f460f52..9d30aa56f8674ebeb6de8ed2bb9b7c5260066b49 100644

--- a/pkgs/radio/suwidgets/default.nix

+++ b/pkgs/radio/suwidgets/default.nix

@@ -2,7 +2,7 @@ { lib, stdenv, fetchFromGitHub, qmake, pkg-config

, fftw, sigutils

}:

-stdenv.mkDerivation (finalAttrs: {

+stdenv.mkDerivation rec {

pname = "suwidgets";

version = "2022-04-03";

@@ -25,9 +25,9 @@ dontWrapQtApps = true;

meta = with lib; {

 description = "Sigutils-related widgets";

• inherit (finalAttrs.src.meta) homepage;

• inherit (src.meta) homepage;

 license = licenses.gpl3Plus;

 maintainers = [ maintainers.sikmir ];

 platforms = platforms.unix;

};

-})

+}