From 2bffcc4f2843c297febed82384d5c7bc616d53da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Madrid-Menc=C3=ADa?= Date: Tue, 17 Oct 2023 13:01:54 +0200 Subject: [PATCH] coursier: Fix LD path for libz.so.1 --- pkgs/development/tools/coursier/default.nix | 22 +++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix index f768064fbe87..61aec684a1ec 100644 --- a/pkgs/development/tools/coursier/default.nix +++ b/pkgs/development/tools/coursier/default.nix @@ -1,21 +1,34 @@ { lib, stdenv, fetchurl, makeWrapper, jre, writeScript, common-updater-scripts -, coreutils, git, gnused, nix, nixfmt }: +, coreutils, git, gnused, nix, zlib }: +let + libPath = lib.makeLibraryPath [ + zlib # libz.so.1 + ]; +in stdenv.mkDerivation rec { pname = "coursier"; version = "2.1.7"; src = fetchurl { url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - sha256 = "aih4gkfSFTyZtw61NfB2JcNjfmxYWi1kWNGooI+110E="; + hash = "sha256-aih4gkfSFTyZtw61NfB2JcNjfmxYWi1kWNGooI+110E="; }; + dontUnpack = true; + nativeBuildInputs = [ makeWrapper ]; - buildCommand = '' + installPhase = '' + runHook preInstall + install -Dm555 $src $out/bin/cs patchShebangs $out/bin/cs - wrapProgram $out/bin/cs --prefix PATH ":" ${jre}/bin + wrapProgram $out/bin/cs \ + --prefix PATH ":" ${lib.makeBinPath [ jre ]} \ + --prefix LD_LIBRARY_PATH ":" ${libPath} + + runHook postInstall ''; passthru.updateScript = writeScript "update.sh" '' @@ -38,5 +51,6 @@ stdenv.mkDerivation rec { description = "Scala library to fetch dependencies from Maven / Ivy repositories"; license = licenses.asl20; maintainers = with maintainers; [ adelbertc nequissimus ]; + platforms = platforms.all; }; }