diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2019-04-17 23:03:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-17 23:03:09 +0200 |
| commit | 698af96454d997e7fcdbb3ecceeb96521ebe1bb6 (patch) | |
| tree | 806fb8b7d5877e808a02b7876ab8ea9a65bc95bf /pkgs | |
| parent | dd9192c55cf6034e77b6dc87d47edf1f63e52b21 (diff) | |
| parent | 3dbeaad7e41b647f649a82873e15785c6a757c0d (diff) | |
| download | nixpkgs-698af96454d997e7fcdbb3ecceeb96521ebe1bb6.tar nixpkgs-698af96454d997e7fcdbb3ecceeb96521ebe1bb6.tar.gz nixpkgs-698af96454d997e7fcdbb3ecceeb96521ebe1bb6.tar.bz2 nixpkgs-698af96454d997e7fcdbb3ecceeb96521ebe1bb6.tar.lz nixpkgs-698af96454d997e7fcdbb3ecceeb96521ebe1bb6.tar.xz nixpkgs-698af96454d997e7fcdbb3ecceeb96521ebe1bb6.tar.zst nixpkgs-698af96454d997e7fcdbb3ecceeb96521ebe1bb6.zip | |
Merge pull request #58638 from Amar1729/darwin-fix/hivex
Fix hivex for darwin
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/hivex/default.nix | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix index 7a42ff94fc0..37f01372005 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; }; } |