From 3931b0b6cf495b723ef0c86a0553bb6e88cb6bf9 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 14 Nov 2022 12:45:27 -0300 Subject: [PATCH] asl: 142-bld211 -> 142-bld232 --- pkgs/development/compilers/asl/default.nix | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/asl/default.nix b/pkgs/development/compilers/asl/default.nix index cfc44c717e08..b8c900a20b3c 100644 --- a/pkgs/development/compilers/asl/default.nix +++ b/pkgs/development/compilers/asl/default.nix @@ -1,19 +1,22 @@ { lib , stdenv , fetchzip -, buildDocs ? false, tex +, tex +, buildDocs ? false }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "asl"; - version = "142-bld211"; + version = "142-bld232"; - src = fetchzip { + src = let inherit (finalAttrs) pname version; in fetchzip { name = "${pname}-${version}"; url = "http://john.ccac.rwth-aachen.de:8000/ftp/as/source/c_version/asl-current-${version}.tar.bz2"; - hash = "sha256-Sbm16JX7kC/7Ws7YgNBUXNqOCl6u+RXgfNjTODhCzSM="; + hash = "sha256-Q50GzXBxFMhbt5s9OgHPNH4bdqz2hhEmTnMmKowVn2E="; }; + outputs = [ "out" "doc" "man" ]; + nativeBuildInputs = lib.optionals buildDocs [ tex ]; postPatch = lib.optionalString (!buildDocs) '' @@ -26,10 +29,10 @@ stdenv.mkDerivation rec { preBuild = '' bindir="${placeholder "out"}/bin" \ - docdir="${placeholder "out"}/doc/asl" \ + docdir="${placeholder "doc"}/share/doc/asl" \ incdir="${placeholder "out"}/include/asl" \ libdir="${placeholder "out"}/lib/asl" \ - mandir="${placeholder "out"}/share/man" \ + mandir="${placeholder "man"}/share/man" \ substituteAll ${./Makefile-nixos.def} Makefile.def mkdir -p .objdir ''; @@ -47,8 +50,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; }; -} -# TODO: multiple outputs +}) # TODO: cross-compilation support # TODO: customize TeX input # TODO: report upstream about `mkdir -p .objdir/`