commit bf9a400e4e148136e9f158731b5a47c73ce0c05e
parent 6e5fdc597497c909fdf00e4352639b3ed97fe790
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date: Fri, 13 Oct 2023 15:00:50 +0400
Up
Diffstat:
11 files changed, 48 insertions(+), 29 deletions(-)
diff --git 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
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
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
@@ -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 @@ stdenv.mkDerivation (finalAttrs: {
};
}.${stdenv.hostPlatform.system};
- nativeBuildInputs = [ undmg ];
+ nativeBuildInputs = [ undmg makeWrapper ];
sourceRoot = ".";
@@ -23,7 +23,8 @@ stdenv.mkDerivation (finalAttrs: {
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
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchfromgh, unzip }:
+{ lib, stdenv, fetchfromgh, unzip, makeWrapper }:
stdenv.mkDerivation (finalAttrs: {
pname = "macsvg-bin";
@@ -14,11 +14,14 @@ stdenv.mkDerivation (finalAttrs: {
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 @@ stdenv.mkDerivation (finalAttrs: {
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
@@ -1,4 +1,4 @@
-{ lib, stdenvNoCC, fetchurl, undmg }:
+{ lib, stdenvNoCC, fetchurl, undmg, makeWrapper }:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "marta-bin";
@@ -9,13 +9,16 @@ stdenvNoCC.mkDerivation (finalAttrs: {
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 @@ stdenvNoCC.mkDerivation (finalAttrs: {
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
@@ -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 @@ stdenv.mkDerivation (finalAttrs: {
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
@@ -1,4 +1,4 @@
-{ lib, stdenvNoCC, fetchfromgh, unzip }:
+{ lib, stdenvNoCC, fetchfromgh, unzip, makeWrapper }:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "sloth-bin";
@@ -14,11 +14,14 @@ stdenvNoCC.mkDerivation (finalAttrs: {
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 @@ stdenvNoCC.mkDerivation (finalAttrs: {
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
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
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
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
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
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchfromgh, unzip }:
+{ lib, stdenv, fetchfromgh, unzip, makeWrapper }:
stdenv.mkDerivation (finalAttrs: {
pname = "serial-studio-bin";
@@ -14,11 +14,14 @@ stdenv.mkDerivation (finalAttrs: {
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
@@ -1,4 +1,4 @@
-{ lib, stdenv, appimageTools, fetchurl, undmg }:
+{ lib, stdenv, appimageTools, fetchurl, undmg, makeWrapper }:
let
pname = "mqtt-explorer";
@@ -35,13 +35,16 @@ let
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 @@ let
license = licenses.cc-by-40;
maintainers = with maintainers; [ sikmir ];
platforms = builtins.attrNames srcs;
+ mainProgram = "mqtt-explorer";
};
in
if stdenv.isDarwin
