From 05ce344fe1e6de2f8accc431f4ad0ef9b1a2c7db Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 17 Feb 2021 21:32:36 +0700 Subject: [PATCH] zasm: 4.2.6 -> 4.4.7, fix darwin build and cross-compilation --- pkgs/development/compilers/zasm/default.nix | 37 ++++++++++++--------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/pkgs/development/compilers/zasm/default.nix b/pkgs/development/compilers/zasm/default.nix index 97c7aa3c2ac..88d77653f92 100644 --- a/pkgs/development/compilers/zasm/default.nix +++ b/pkgs/development/compilers/zasm/default.nix @@ -1,20 +1,26 @@ -{ fetchFromGitHub, zlib, lib, stdenv }: +{ lib, stdenv, fetchFromGitHub, zlib }: let libs-src = fetchFromGitHub { owner = "megatokio"; repo = "Libraries"; - rev = "97ea480051b106e83a086dd42583dfd3e9d458a1"; - sha256 = "1kqmjb9660mnb0r18s1grrrisx6b73ijsinlyr97vz6992jd5dzh"; + # 2021-02-02 + rev = "c5cb3ed512c677db6f33e2d3539dfbb6e547030b"; + sha256 = "sha256-GiplhZf640uScVdKL6E/fegOgtC9SE1xgBqcX86XADk="; }; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "zasm"; - version = "4.2.6"; + version = "4.4.7"; + src = fetchFromGitHub { owner = "megatokio"; repo = "zasm"; - rev = "f1424add17a5514895a598d6b5e3982579961519"; - sha256 = "1kqnqdqp2bfsazs6vfx2aiqanxxagn8plx8g6rc11vmr8yqnnpks"; + rev = version; + sha256 = "sha256-Zbno8kmzss1H2FjwzHB4U7UXxa6oDfsPV80MVVFfM68="; + extraPostFetch = '' + # remove folder containing files with weird names (causes the hash to turn out differently under macOS vs. Linux) + rm -rv $out/Test + ''; }; buildInputs = [ zlib ]; @@ -23,22 +29,23 @@ stdenv.mkDerivation { ln -sf ${libs-src} Libraries ''; - buildPhase = '' - cd Linux - make - ''; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "CXX=${stdenv.cc.targetPrefix}c++" + "LINK=${stdenv.cc.targetPrefix}c++" + "STRIP=${stdenv.cc.targetPrefix}strip" + ]; installPhase = '' - mkdir -p $out/bin - mv zasm $out/bin + install -Dm755 -t $out/bin zasm ''; meta = with lib; { - description = "Z80 / 8080 assembler (for unix-style OS)"; + description = "Z80 / 8080 / Z180 assembler (for unix-style OS)"; homepage = "https://k1.spdns.de/Develop/Projects/zasm/Distributions/"; license = licenses.bsd2; maintainers = [ maintainers.turbomack ]; - platforms = platforms.linux; + platforms = platforms.unix; badPlatforms = platforms.aarch64; }; }