diff --git a/flake.lock b/flake.lock

index ec05d05d13c15c87dd3ddc4f5e688393d15778f5..79b637f7ba9b1d3426e8f2e1e24e576b50c85970 100644

--- a/flake.lock

+++ b/flake.lock

@@ -20,11 +20,11 @@ }

 },

 "nixpkgs": {

   "locked": {

•    "lastModified": 1696757521,
  

•    "narHash": "sha256-cfgtLNCBLFx2qOzRLI6DHfqTdfWI+UbvsKYa3b3fvaA=",
  

•    "lastModified": 1697009197,
  

•    "narHash": "sha256-viVRhBTFT8fPJTb1N3brQIpFZnttmwo3JVKNuWRVc3s=",
  

     "owner": "nixos",

     "repo": "nixpkgs",

•    "rev": "2646b294a146df2781b1ca49092450e8a32814e1",
  

•    "rev": "01441e14af5e29c9d27ace398e6dd0b293e25a54",
  

     "type": "github"

   },

   "original": {

diff --git a/pkgs/applications/synwrite/bin.nix b/pkgs/applications/synwrite/bin.nix

index 54d2a0fc75d401cde4419a04548d8cbebb90d24f..1e47172478e43cb0a6c3b901fa80973e9546535a 100644

--- a/pkgs/applications/synwrite/bin.nix

+++ b/pkgs/applications/synwrite/bin.nix

@@ -39,7 +39,7 @@ description = "Advanced text editor for programmers and Notepad replacement";

 homepage = "http://uvviewsoft.com/synwrite/";

 license = licenses.mpl11;

 maintainers = [ maintainers.sikmir ];

• platforms = wine.meta.platforms;

• platforms = platforms.all;

 skip.ci = true;

};

}

diff --git a/pkgs/darwin/cudatext/bin.nix b/pkgs/darwin/cudatext/bin.nix

index f810eede2e9fb0475b04f9d12a79c94b85c1c010..0c6772c11a011c1843858ac5be4b6d9a62383e90 100644

--- a/pkgs/darwin/cudatext/bin.nix

+++ b/pkgs/darwin/cudatext/bin.nix

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

-{ lib, stdenv, fetchurl, undmg, cudatext }:

+{ lib, stdenv, fetchurl, undmg, makeWrapper, cudatext }:

stdenv.mkDerivation (finalAttrs: {

pname = "cudatext-bin";

@@ -15,7 +15,7 @@ hash = "sha256-pNwpTACaK/tpA2bcZa0QyAndbT/r2aLomfynNibJcH4=";

 };

}.${stdenv.hostPlatform.system};

• nativeBuildInputs = [ undmg ];

• nativeBuildInputs = [ undmg makeWrapper ];

sourceRoot = ".";

@@ -23,7 +23,8 @@ installPhase = ''

 runHook preInstall

 mkdir -p $out/Applications

• cp -R *.app $out/Applications

• mv *.app $out/Applications

• makeWrapper $out/{Applications/CudaText.app/Contents/MacOS,bin}/cudatext

 runHook postInstall

'';

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

index 72dcfbb3eec2849bdfec479e1b5a00fcbea89db8..798e292938c15e573b2948fcf648c81a79e4b3b3 100644

--- a/pkgs/darwin/macsvg/default.nix

+++ b/pkgs/darwin/macsvg/default.nix

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

-{ lib, stdenv, fetchfromgh, unzip }:

+{ lib, stdenv, fetchfromgh, unzip, makeWrapper }:

stdenv.mkDerivation (finalAttrs: {

pname = "macsvg-bin";

@@ -14,11 +14,14 @@ };

sourceRoot = ".";

• nativeBuildInputs = [ unzip ];

• nativeBuildInputs = [ unzip makeWrapper ];

installPhase = ''

• runHook preInstall

 mkdir -p $out/Applications

• cp -r macSVG_v${lib.replaceStrings [ "." ] [ "_" ] (lib.versions.majorMinor finalAttrs.version)}/*.app $out/Applications

• mv macSVG_v${lib.replaceStrings [ "." ] [ "_" ] (lib.versions.majorMinor finalAttrs.version)}/*.app $out/Applications

• makeWrapper $out/{Applications/macSVG.app/Contents/MacOS/macSVG,bin/macsvg}

• runHook postInstall

'';

meta = with lib; {

@@ -27,6 +30,7 @@ homepage = "https://macsvg.org/";

 license = licenses.mit;

 maintainers = [ maintainers.sikmir ];

 platforms = [ "aarch64-darwin" "x86_64-darwin" ];

• mainProgram = "macsvg";

 skip.ci = true;

};

})

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

index e4f5470223170407ce3271427d9b910122833391..685c532c79dde407c3a20b2bb46eadb79902342d 100644

--- a/pkgs/darwin/marta/default.nix

+++ b/pkgs/darwin/marta/default.nix

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

-{ lib, stdenvNoCC, fetchurl, undmg }:

+{ lib, stdenvNoCC, fetchurl, undmg, makeWrapper }:

stdenvNoCC.mkDerivation (finalAttrs: {

pname = "marta-bin";

@@ -9,13 +9,16 @@ url = "https://updates.marta.sh/release/Marta-${finalAttrs.version}.dmg";

 hash = "sha256-DbNkvLCy6q0CN8b4+8oheM4EaaLAQvH3O5zWVYxEyh8=";

};

• nativeBuildInputs = [ undmg ];

• nativeBuildInputs = [ undmg makeWrapper ];

sourceRoot = ".";

installPhase = ''

• runHook preInstall

 mkdir -p $out/Applications

• cp -r *.app $out/Applications

• mv *.app $out/Applications

• makeWrapper $out/{Applications/Marta.app/Contents/MacOS/Marta,bin/marta}

• runHook postInstall

'';

meta = with lib; {

@@ -24,6 +27,7 @@ homepage = "https://marta.sh/";

 license = licenses.free;

 maintainers = [ maintainers.sikmir ];

 platforms = [ "x86_64-darwin" ];

• mainProgram = "marta";

 skip.ci = true;

};

})

diff --git a/pkgs/darwin/qtcreator/bin.nix b/pkgs/darwin/qtcreator/bin.nix

index 3dc815dd1563dd6e86b8c15c3d68a03e10d9436a..657ead6c8e1b861e5e98e7dd6a4a8d1a3472ea56 100644

--- a/pkgs/darwin/qtcreator/bin.nix

+++ b/pkgs/darwin/qtcreator/bin.nix

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

-{ lib, stdenv, fetchfromgh, p7zip, qtcreator }:

+{ lib, stdenv, fetchfromgh, p7zip, makeWrapper, qtcreator }:

stdenv.mkDerivation (finalAttrs: {

pname = "qtcreator-bin";

@@ -14,14 +14,13 @@ };

sourceRoot = ".";

• nativeBuildInputs = [ p7zip ];

• nativeBuildInputs = [ p7zip makeWrapper ];

installPhase = ''

 runHook preInstall

 mkdir -p $out/Applications

• cp -r *.app $out/Applications

• mv *.app $out/Applications

• makeWrapper $out/{Applications/Qt\ Creator.app/Contents/MacOS/Qt\ Creator,bin/qtcreator}

 runHook postInstall

'';

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

index dd97987323e53a2a81c4d5d35ae9780f4f5e8060..e217cfe0e5daa2bb88d765f0e94c08ac0a5343b9 100644

--- a/pkgs/darwin/sloth/default.nix

+++ b/pkgs/darwin/sloth/default.nix

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

-{ lib, stdenvNoCC, fetchfromgh, unzip }:

+{ lib, stdenvNoCC, fetchfromgh, unzip, makeWrapper }:

stdenvNoCC.mkDerivation (finalAttrs: {

pname = "sloth-bin";

@@ -14,11 +14,14 @@ };

sourceRoot = ".";

• nativeBuildInputs = [ unzip ];

• nativeBuildInputs = [ unzip makeWrapper ];

installPhase = ''

• runHook preInstall

 mkdir -p $out/Applications

• cp -r *.app $out/Applications

• mv *.app $out/Applications

• makeWrapper $out/{Applications/Sloth.app/Contents/MacOS/Sloth,bin/sloth}

• runHook postInstall

'';

meta = with lib; {

@@ -27,6 +30,7 @@ homepage = "https://sveinbjorn.org/sloth";

 license = licenses.bsd3;

 maintainers = [ maintainers.sikmir ];

 platforms = [ "x86_64-darwin" ];

• mainProgram = "sloth";

 skip.ci = true;

};

})

diff --git a/pkgs/geospatial/sasplanet/bin.nix b/pkgs/geospatial/sasplanet/bin.nix

index cd50507b03678d6fddeec500a0b0043be7bcfdfa..fb01dbe86dbf8c5a44c0bee41ac3a828edc4d7ef 100644

--- a/pkgs/geospatial/sasplanet/bin.nix

+++ b/pkgs/geospatial/sasplanet/bin.nix

@@ -56,7 +56,7 @@ homepage = "http://www.sasgis.org/sasplaneta/";

 changelog = "http://www.sasgis.org/mantis/changelog_page.php";

 license = licenses.gpl3Plus;

 maintainers = [ maintainers.sikmir ];

• platforms = wine.meta.platforms;

• platforms = platforms.all;

 skip.ci = true;

};

})

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

index 1e1cd70e8cd6641344d11bed6e78c197282ef2e8..58c0b870bd7a62ec9015389d030e62e9bad6eeb8 100644

--- a/pkgs/gpx/gpxeditor/default.nix

+++ b/pkgs/gpx/gpxeditor/default.nix

@@ -31,7 +31,7 @@ description = "Load, modify and save your GPX files";

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

 license = licenses.gpl2;

 maintainers = [ maintainers.sikmir ];

• platforms = wine.meta.platforms;

• platforms = platforms.all;

 skip.ci = true;

};

})

diff --git a/pkgs/misc/serial-studio/bin.nix b/pkgs/misc/serial-studio/bin.nix

index a30d1feb9671001b87f88dacbd81f3fc77d7fdbb..671ce48c813a259e41d7e60c44086f8a63499af4 100644

--- a/pkgs/misc/serial-studio/bin.nix

+++ b/pkgs/misc/serial-studio/bin.nix

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

-{ lib, stdenv, fetchfromgh, unzip }:

+{ lib, stdenv, fetchfromgh, unzip, makeWrapper }:

stdenv.mkDerivation (finalAttrs: {

pname = "serial-studio-bin";

@@ -14,11 +14,14 @@ };

sourceRoot = ".";

• nativeBuildInputs = [ unzip ];

• nativeBuildInputs = [ unzip makeWrapper ];

installPhase = ''

• runHook preInstall

 mkdir -p $out/Applications

• cp -r *.app $out/Applications

• mv *.app $out/Applications

• makeWrapper $out/{Applications/Serial\ Studio.app/Contents/MacOS/SerialStudio,bin/serial-studio}

• runHook postInstall

'';

meta = with lib; {

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

index 4af9bff9ea663d4e43a68d288aa95645954a0409..a542822186d112ff0b63f0ebfcefdee1a2958551 100644

--- a/pkgs/mqtt/mqtt-explorer/default.nix

+++ b/pkgs/mqtt/mqtt-explorer/default.nix

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

-{ lib, stdenv, appimageTools, fetchurl, undmg }:

+{ lib, stdenv, appimageTools, fetchurl, undmg, makeWrapper }:

let

pname = "mqtt-explorer";

@@ -35,13 +35,16 @@

darwin = stdenv.mkDerivation {

 inherit pname version src meta;

• nativeBuildInputs = [ undmg ];

• nativeBuildInputs = [ undmg makeWrapper ];

 sourceRoot = ".";

 installPhase = ''

•  runHook preInstall
  

   mkdir -p $out/Applications

•  cp -r *.app $out/Applications
  

•  mv *.app $out/Applications
  

•  makeWrapper $out/{Applications/MQTT\ Explorer.app/Contents/MacOS/MQTT\ Explorer,bin/mqtt-explorer}
  

•  runHook postInstall
  

 '';

};

@@ -52,6 +55,7 @@ sourceProvenance = with sourceTypes; [ binaryNativeCode ];

 license = licenses.cc-by-40;

 maintainers = with maintainers; [ sikmir ];

 platforms = builtins.attrNames srcs;

• mainProgram = "mqtt-explorer";

};

in

if stdenv.isDarwin