treesheets: fix darwin build
This commit is contained in:
@@ -5,8 +5,7 @@
|
||||
, ninja
|
||||
, wrapGAppsHook3
|
||||
, makeWrapper
|
||||
, wxGTK
|
||||
, Cocoa
|
||||
, wxGTK32
|
||||
, unstableGitUpdater
|
||||
}:
|
||||
|
||||
@@ -29,19 +28,15 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
wxGTK
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
Cocoa
|
||||
wxGTK32
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-DPACKAGE_VERSION=\"${builtins.replaceStrings [ "unstable-" ] [ "" ] version}\"";
|
||||
|
||||
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
shopt -s extglob
|
||||
mkdir -p $out/{share/treesheets,bin}
|
||||
mv $out/!(share) $out/share/treesheets
|
||||
makeWrapper $out/{share/treesheets,bin}/treesheets \
|
||||
--chdir $out/share/treesheets
|
||||
mkdir -p $out/{Applications,bin}
|
||||
mv $out/TreeSheets.app $out/Applications
|
||||
makeWrapper $out/Applications/TreeSheets.app/Contents/MacOS/TreeSheets $out/bin/TreeSheets
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
@@ -52,7 +47,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Free Form Data Organizer";
|
||||
mainProgram = "treesheets";
|
||||
mainProgram = "TreeSheets";
|
||||
|
||||
longDescription = ''
|
||||
The ultimate replacement for spreadsheets, mind mappers, outliners,
|
||||
|
||||
@@ -15851,10 +15851,7 @@ with pkgs;
|
||||
wlroots = wlroots_0_18;
|
||||
};
|
||||
|
||||
treesheets = callPackage ../applications/office/treesheets {
|
||||
wxGTK = wxGTK32;
|
||||
inherit (darwin.apple_sdk.frameworks) Cocoa;
|
||||
};
|
||||
treesheets = callPackage ../applications/office/treesheets { };
|
||||
|
||||
trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { };
|
||||
|
||||
|
||||
Reference in New Issue
Block a user