diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-25 01:18:25 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-25 01:18:25 +0000 |
commit | b10ed56b8e950d57b2f4d9c2a2f21b61416065a4 (patch) | |
tree | b1cb1628f51986e00a35e15f543aed944a541b52 /pkgs/misc/emulators | |
parent | cc8fd11ffb7fe5cd7f1cfa75ea987429f1b2e77d (diff) | |
parent | b8217bb14abbfa44d19afa1706f6e041114eccbc (diff) | |
download | nixlib-b10ed56b8e950d57b2f4d9c2a2f21b61416065a4.tar nixlib-b10ed56b8e950d57b2f4d9c2a2f21b61416065a4.tar.gz nixlib-b10ed56b8e950d57b2f4d9c2a2f21b61416065a4.tar.bz2 nixlib-b10ed56b8e950d57b2f4d9c2a2f21b61416065a4.tar.lz nixlib-b10ed56b8e950d57b2f4d9c2a2f21b61416065a4.tar.xz nixlib-b10ed56b8e950d57b2f4d9c2a2f21b61416065a4.tar.zst nixlib-b10ed56b8e950d57b2f4d9c2a2f21b61416065a4.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/misc/emulators')
-rw-r--r-- | pkgs/misc/emulators/tilem/default.nix | 60 |
1 files changed, 6 insertions, 54 deletions
diff --git a/pkgs/misc/emulators/tilem/default.nix b/pkgs/misc/emulators/tilem/default.nix index 2e96dc03d144..d2252563d0a5 100644 --- a/pkgs/misc/emulators/tilem/default.nix +++ b/pkgs/misc/emulators/tilem/default.nix @@ -1,63 +1,15 @@ { stdenv , fetchurl , lib -, libarchive -, autoreconfHook , pkg-config , glib -, libusb1 -, darwin -, acl -, lzma -, bzip2 , gnome2 +, libticonv +, libtifiles2 +, libticables2 +, libticalcs2 }: -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"; - src = fetchurl { - url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; - sha256 = "08j5di0cgix9vcpdv7b8xhxdjkk9zz7fqfnv3l4apk3jdr8vcvqc"; - }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ glib libusb1 ]; - configureFlags = [ "--enable-libusb10" ]; - }; - 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 ]; - }; - 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 { pname = "tilem"; version = "2.0"; @@ -72,7 +24,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; }; } |