From 3dbeaad7e41b647f649a82873e15785c6a757c0d Mon Sep 17 00:00:00 2001 From: Amar1729 Date: Sun, 31 Mar 2019 13:44:23 -0400 Subject: hivex: add perl to wrapper and libiconv dependency --- pkgs/development/libraries/hivex/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix index 7a42ff94fc0fc..37f01372005c0 100644 --- a/pkgs/development/libraries/hivex/default.nix +++ b/pkgs/development/libraries/hivex/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper -, perlPackages, libxml2 }: +, perlPackages, libxml2, libiconv }: stdenv.mkDerivation rec { name = "hivex-${version}"; @@ -15,12 +15,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ autoreconfHook makeWrapper libxml2 - ] ++ (with perlPackages; [ perl IOStringy ]); + ] + ++ (with perlPackages; [ perl IOStringy ]) + ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; postInstall = '' - for bin in $out/bin/*; do - wrapProgram "$bin" --prefix "PATH" : "$out/bin" - done + wrapProgram $out/bin/hivexregedit \ + --set PERL5LIB "$out/${perlPackages.perl.libPrefix}" \ + --prefix "PATH" : "$out/bin" + + wrapProgram $out/bin/hivexml \ + --prefix "PATH" : "$out/bin" ''; meta = with stdenv.lib; { @@ -28,6 +33,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl2; homepage = https://github.com/libguestfs/hivex; maintainers = with maintainers; [offline]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } -- cgit 1.4.1