From e9d9355154cb3693541265b5757f5844c3fd43bb Mon Sep 17 00:00:00 2001 From: chillcicada <2210227279@qq.com> Date: Fri, 12 Dec 2025 08:34:12 +0800 Subject: [PATCH] marvin: add dependencies --- pkgs/by-name/ma/marvin/package.nix | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ma/marvin/package.nix b/pkgs/by-name/ma/marvin/package.nix index bc456549e0a4..dced5f900a67 100644 --- a/pkgs/by-name/ma/marvin/package.nix +++ b/pkgs/by-name/ma/marvin/package.nix @@ -9,15 +9,22 @@ gnugrep, gnused, openjdk17, + freetype, + fontconfig, + libXi, + libX11, + libXext, + libXtst, + libXrender, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "marvin"; version = "25.3.5"; src = fetchurl { - name = "marvin-${version}.deb"; - url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${version}.deb"; + name = "marvin-${finalAttrs.version}.deb"; + url = "http://dl.chemaxon.com/marvin/${finalAttrs.version}/marvin_linux_${finalAttrs.version}.deb"; hash = "sha256-OiTHMGKAuHadoKQMTTPRcYl/zKL+bc0ts/UNsJlHn0Q="; }; @@ -26,6 +33,16 @@ stdenv.mkDerivation rec { makeWrapper ]; + buildInputs = [ + freetype + fontconfig + libXi + libX11 + libXext + libXtst + libXrender + ]; + unpackPhase = '' dpkg-deb -x $src opt ''; @@ -34,6 +51,7 @@ stdenv.mkDerivation rec { wrapBin() { makeWrapper $1 $out/bin/$(basename $1) \ --set INSTALL4J_JAVA_HOME "${openjdk17}" \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath finalAttrs.buildInputs} \ --prefix PATH : ${ lib.makeBinPath [ coreutils @@ -72,4 +90,4 @@ stdenv.mkDerivation rec { license = lib.licenses.unfree; platforms = lib.platforms.linux; }; -} +})