Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d50813aa0ba0
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 76c2fb25083f
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Apr 17, 2019

  1. hivex: add perl to wrapper and libiconv dependency 

    (cherry picked from commit 3dbeaad)
    @Amar1729 @LnL7
    Amar1729 authored and LnL7 committed Apr 17, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    LnL7 Daiderd Jordan
    GPG key ID: D02435D05B810C96
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    76c2fb2 View commit details
Showing with 11 additions and 6 deletions.
  1. +11 −6 pkgs/development/libraries/hivex/default.nix
17 changes: 11 additions & 6 deletions pkgs/development/libraries/hivex/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper
, perlPackages, libxml2 }:
, perlPackages, libxml2, libiconv }:

stdenv.mkDerivation rec {
name = "hivex-${version}";
@@ -15,19 +15,24 @@ 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; {
description = "Windows registry hive extraction library";
license = licenses.lgpl2;
homepage = https://github.com/libguestfs/hivex;
maintainers = with maintainers; [offline];
platforms = platforms.linux;
platforms = platforms.linux ++ platforms.darwin;
};
}