dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

jameica: add darwin support (#44953)

Browse Source
This commit is contained in:
Florian Klink 2018-08-13 14:12:29 +02:00 committed by xeji
parent 9968d0f053
commit cf5826f1a3
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/office/jameica/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, ant, jdk, jre, xmlstarlet, gtk2, glib, xorg }: { stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, ant, jdk, jre, xmlstarlet, gtk2, glib, xorg, Cocoa }:
let let
_version = "2.8.1"; _version = "2.8.1";
@ -8,11 +8,12 @@ let
swtSystem = if stdenv.system == "i686-linux" then "linux" swtSystem = if stdenv.system == "i686-linux" then "linux"
else if stdenv.system == "x86_64-linux" then "linux64" else if stdenv.system == "x86_64-linux" then "linux64"
else if stdenv.system == "x86_64-darwin" then "macos64"
else throw "Unsupported system: ${stdenv.system}"; else throw "Unsupported system: ${stdenv.system}";
launcher = '' launcher = ''
#!${stdenv.shell} #!${stdenv.shell}
exec ${jre}/bin/java -Xmx512m de.willuhn.jameica.Main "$@" exec ${jre}/bin/java -Xmx512m ${ stdenv.lib.optionalString stdenv.isDarwin ''-Xdock:name="Jameica" -XstartOnFirstThread''} de.willuhn.jameica.Main "$@"
''; '';
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
@ -28,7 +29,8 @@ stdenv.mkDerivation rec {
inherit name version; inherit name version;
nativeBuildInputs = [ ant jdk makeWrapper xmlstarlet ]; nativeBuildInputs = [ ant jdk makeWrapper xmlstarlet ];
buildInputs = [ gtk2 glib xorg.libXtst ]; buildInputs = stdenv.lib.optionals stdenv.isLinux [ gtk2 glib xorg.libXtst ]
++ stdenv.lib.optional stdenv.isDarwin Cocoa;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "willuhn"; owner = "willuhn";
@ -82,7 +84,7 @@ stdenv.mkDerivation rec {
SynTAX (accounting) and JVerein (club management). SynTAX (accounting) and JVerein (club management).
''; '';
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
platforms = [ "x86_64-linux" "i686-linux" ]; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
maintainers = with maintainers; [ flokli ]; maintainers = with maintainers; [ flokli ];
}; };
} }

4
pkgs/top-level/all-packages.nix
View File

@ -16881,7 +16881,9 @@ with pkgs;
jalv = callPackage ../applications/audio/jalv { }; jalv = callPackage ../applications/audio/jalv { };
jameica = callPackage ../applications/office/jameica { }; jameica = callPackage ../applications/office/jameica {
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
jamin = callPackage ../applications/audio/jamin { }; jamin = callPackage ../applications/audio/jamin { };