From 12b5c971bf07367e2ee51924619cd7511b4f92d4 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 11 Jan 2022 00:11:23 -0300 Subject: [PATCH 1/2] jam: refactor --- pkgs/development/tools/build-managers/jam/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/jam/default.nix b/pkgs/development/tools/build-managers/jam/default.nix index 8db882711fc2..c4d73785db49 100644 --- a/pkgs/development/tools/build-managers/jam/default.nix +++ b/pkgs/development/tools/build-managers/jam/default.nix @@ -16,13 +16,21 @@ stdenv.mkDerivation rec { ''; buildPhase = '' + runHook preBuild + make jam0 - ./jam0 -j$NIX_BUILD_CORES -sBINDIR=$out/bin install + + runHook postBuild ''; installPhase = '' + runHook preInstall + + ./jam0 -j$NIX_BUILD_CORES -sBINDIR=$out/bin install mkdir -p $out/doc/jam cp *.html $out/doc/jam + + runHook postInstall ''; enableParallelBuilding = true; From 2ebe9dede8c4da6dd61dc7c7b5500888923f2380 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 11 Jan 2022 00:10:47 -0300 Subject: [PATCH 2/2] ftjam: init at 2.5.2 --- .../tools/build-managers/jam/ftjam.nix | 52 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/tools/build-managers/jam/ftjam.nix diff --git a/pkgs/development/tools/build-managers/jam/ftjam.nix b/pkgs/development/tools/build-managers/jam/ftjam.nix new file mode 100644 index 000000000000..6007b67f148b --- /dev/null +++ b/pkgs/development/tools/build-managers/jam/ftjam.nix @@ -0,0 +1,52 @@ +{ lib +, stdenv +, fetchurl +, bison +}: + +stdenv.mkDerivation rec { + pname = "ftjam"; + version = "2.5.2"; + + src = fetchurl { + url = "https://downloads.sourceforge.net/project/freetype/${pname}/${version}/${pname}-${version}.tar.bz2"; + hash = "sha256-6JdzUAqSkS3pGOn+v/q+S2vOedaa8ZRDX04DK4ptZqM="; + }; + + nativeBuildInputs = [ + bison + ]; + + preConfigure = '' + unset AR + ''; + + buildPhase = '' + runHook preBuild + + make jam0 + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + ./jam0 -j$NIX_BUILD_CORES -sBINDIR=$out/bin install + mkdir -p $out/doc/jam + cp *.html $out/doc/jam + + runHook postInstall + ''; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://freetype.org/jam/"; + description = "Freetype's enhanced, backwards-compatible Jam clone"; + license = licenses.free; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + }; +} +# TODO: setup hook for Jam diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2189ee4ac55b..ec4ba647bc50 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14879,6 +14879,8 @@ with pkgs; jam = callPackage ../development/tools/build-managers/jam { }; + ftjam = callPackage ../development/tools/build-managers/jam/ftjam.nix { }; + javacc = callPackage ../development/tools/parsing/javacc { jdk = jdk8; };