diff --git a/pkgs/development/libraries/libtifiles2/default.nix b/pkgs/development/libraries/libtifiles2/default.nix new file mode 100644 index 000000000000..874cbc87c875 --- /dev/null +++ b/pkgs/development/libraries/libtifiles2/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, lib +, fetchurl +, pkg-config +, autoreconfHook +, glib +, libarchive +, libticonv +}: + +stdenv.mkDerivation rec { + pname = "libtifiles2"; + version = "1.1.7"; + src = fetchurl { + url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; + sha256 = "10n9mhlabmaw3ha5ckllxfy6fygs2pmlmj5v6w5v62bvx54kpils"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + glib + libarchive + libticonv + ]; + + 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 4948944191b2..678919a0867a 100644 --- a/pkgs/misc/emulators/tilem/default.nix +++ b/pkgs/misc/emulators/tilem/default.nix @@ -1,17 +1,15 @@ { stdenv , fetchurl , lib -, libarchive , autoreconfHook , pkg-config , glib , libusb1 , darwin , acl -, lzma -, bzip2 , gnome2 , libticonv +, libtifiles2 }: let libticables2 = stdenv.mkDerivation rec { @@ -37,16 +35,6 @@ let ++ lib.optionals stdenv.isLinux [ acl ] ++ lib.optionals stdenv.isDarwin [ darwin.libobjc ]; }; - libtifiles2 = stdenv.mkDerivation rec { - pname = "libtifiles2"; - version = "1.1.7"; - src = fetchurl { - url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; - sha256 = "10n9mhlabmaw3ha5ckllxfy6fygs2pmlmj5v6w5v62bvx54kpils"; - }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ glib libticonv libarchive lzma bzip2 ]; - }; in stdenv.mkDerivation rec { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a0619bef6df8..f21e7810eafb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15272,6 +15272,8 @@ in libticonv = callPackage ../development/libraries/libticonv { }; + libtifiles2 = callPackage ../development/libraries/libtifiles2 { }; + libtiff = callPackage ../development/libraries/libtiff { }; libtiger = callPackage ../development/libraries/libtiger { };