diff --git a/pkgs/development/libraries/libticalcs2/default.nix b/pkgs/development/libraries/libticalcs2/default.nix new file mode 100644 index 00000000000..6eb013a7ffd --- /dev/null +++ b/pkgs/development/libraries/libticalcs2/default.nix @@ -0,0 +1,50 @@ +{ stdenv +, lib +, fetchurl +, pkg-config +, autoreconfHook +, glib +, libticonv +, libtifiles2 +, libticables2 +, lzma +, bzip2 +, acl +, libobjc +}: + +stdenv.mkDerivation rec { + pname = "libticalcs2"; + version = "1.1.9"; + src = fetchurl { + url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; + sha256 = "08c9wgrdnyqcs45mx1bjb8riqq81bzfkhgaijxzn96rhpj40fy3n"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + glib + libticonv + libtifiles2 + libticables2 + lzma + bzip2 + ] ++ lib.optionals stdenv.isLinux [ + acl + ] ++ lib.optionals stdenv.isDarwin [ + libobjc + ]; + + meta = with lib; { + changelog = "http://lpg.ticalc.org/prj_tilp/news.html"; + description = "This library is part of the TiLP framework"; + homepage = "http://lpg.ticalc.org/prj_tilp/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ siraben luc65r ]; + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/pkgs/misc/emulators/tilem/default.nix b/pkgs/misc/emulators/tilem/default.nix index fcd37ab24e3..d2252563d0a 100644 --- a/pkgs/misc/emulators/tilem/default.nix +++ b/pkgs/misc/emulators/tilem/default.nix @@ -1,30 +1,14 @@ { stdenv , fetchurl , lib -, autoreconfHook , pkg-config , glib -, darwin -, acl , gnome2 , libticonv , libtifiles2 , libticables2 +, libticalcs2 }: -let - libticalcs2 = stdenv.mkDerivation rec { - pname = "libticalcs2"; - version = "1.1.9"; - src = fetchurl { - url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; - sha256 = "08c9wgrdnyqcs45mx1bjb8riqq81bzfkhgaijxzn96rhpj40fy3n"; - }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ glib libticables2 libticonv libtifiles2 lzma bzip2 ] - ++ lib.optionals stdenv.isLinux [ acl ] - ++ lib.optionals stdenv.isDarwin [ darwin.libobjc ]; - }; -in stdenv.mkDerivation rec { pname = "tilem"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 259bfd33284..fa622e4f7cd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15272,6 +15272,10 @@ in libticables2 = callPackage ../development/libraries/libticables2 { }; + libticalcs2 = callPackage ../development/libraries/libticalcs2 { + inherit (darwin) libobjc; + }; + libticonv = callPackage ../development/libraries/libticonv { }; libtifiles2 = callPackage ../development/libraries/libtifiles2 { };