From 3e51cd164d21da438c782eaf0c3cd41c5a3898df Mon Sep 17 00:00:00 2001 From: luc65r Date: Mon, 26 Oct 2020 22:38:28 +0100 Subject: [PATCH] libticonv: init at 1.1.5 --- .../libraries/libticonv/default.nix | 38 +++++++++++++++++++ pkgs/misc/emulators/tilem/default.nix | 15 ++------ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 43 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/libraries/libticonv/default.nix diff --git a/pkgs/development/libraries/libticonv/default.nix b/pkgs/development/libraries/libticonv/default.nix new file mode 100644 index 000000000000..0c075406dee2 --- /dev/null +++ b/pkgs/development/libraries/libticonv/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, lib +, fetchurl +, pkg-config +, autoreconfHook +, glib +}: + +stdenv.mkDerivation rec { + pname = "libticonv"; + version = "1.1.5"; + src = fetchurl { + url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; + sha256 = "0y080v12bm81wgjm6fnw7q0yg7scphm8hhrls9njcszj7fkscv9i"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + glib + ]; + + configureFlags = [ + "--enable-iconv" + ]; + + 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 2e96dc03d144..4948944191b2 100644 --- a/pkgs/misc/emulators/tilem/default.nix +++ b/pkgs/misc/emulators/tilem/default.nix @@ -11,19 +11,9 @@ , lzma , bzip2 , gnome2 +, libticonv }: let - libticonv = stdenv.mkDerivation rec { - pname = "libticonv"; - version = "1.1.5"; - src = fetchurl { - url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; - sha256 = "0y080v12bm81wgjm6fnw7q0yg7scphm8hhrls9njcszj7fkscv9i"; - }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ glib ]; - configureFlags = [ "--enable-iconv" ]; - }; libticables2 = stdenv.mkDerivation rec { pname = "libticables2"; version = "1.3.5"; @@ -58,6 +48,7 @@ let buildInputs = [ glib libticonv libarchive lzma bzip2 ]; }; in + stdenv.mkDerivation rec { pname = "tilem"; version = "2.0"; @@ -72,7 +63,7 @@ stdenv.mkDerivation rec { homepage = "http://lpg.ticalc.org/prj_tilem/"; description = "Emulator and debugger for Texas Instruments Z80-based graphing calculators"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ siraben ]; + maintainers = with maintainers; [ siraben luc65r ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c012242c38a..a0619bef6df8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15270,6 +15270,8 @@ in libthreadar = callPackage ../development/libraries/libthreadar { }; + libticonv = callPackage ../development/libraries/libticonv { }; + libtiff = callPackage ../development/libraries/libtiff { }; libtiger = callPackage ../development/libraries/libtiger { };