commit 357de18d2aa7b64e4d5bb60610c12cf54314a115
parent 8789c2e63df55f86464aa07e85d4ae39df4cd8bd
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date: Mon, 28 Nov 2022 21:44:01 +0300
Up
Diffstat:
7 files changed, 31 insertions(+), 27 deletions(-)
diff --git 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 @@ mkDerivation (finalAttrs: {
--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
@@ -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 @@ mkDerivation (finalAttrs: {
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
@@ -15,7 +15,7 @@
, withI18n ? true
}:
-stdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation rec {
pname = "redict";
version = "2019-06-21";
@@ -50,10 +50,10 @@ stdenv.mkDerivation (finalAttrs: {
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
@@ -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 @@ stdenv.mkDerivation (finalAttrs: {
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
};
-})
+}
diff --git a/pkgs/radio/fmreceiver/default.nix b/pkgs/radio/fmreceiver/default.nix
@@ -2,14 +2,14 @@
, 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 @@ stdenv.mkDerivation (finalAttrs: {
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
@@ -3,14 +3,14 @@
, 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 @@ stdenv.mkDerivation (finalAttrs: {
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
@@ -2,7 +2,7 @@
, fftw, sigutils
}:
-stdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation rec {
pname = "suwidgets";
version = "2022-04-03";
@@ -25,9 +25,9 @@ stdenv.mkDerivation (finalAttrs: {
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;
};
-})
+}
