Skip to content

Commit e36ab94

Browse files
regripper: fix perl libs not in path; 0-unstable-2024-11-02 -> 0-unstable-2024-12-12 (#366270)
2 parents 2cf40b4 + 5613d83 commit e36ab94

File tree

1 file changed

+17
-14
lines changed

1 file changed

+17
-14
lines changed

pkgs/by-name/re/regripper/package.nix

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,42 +2,45 @@
22
lib,
33
stdenv,
44
fetchFromGitHub,
5+
makeWrapper,
56
perl,
67
perlPackages,
7-
runtimeShell,
88
}:
99

10-
stdenv.mkDerivation rec {
10+
let
11+
perlDeps = [
12+
perlPackages.ParseWin32Registry
13+
];
14+
in
15+
stdenv.mkDerivation {
1116
pname = "regripper";
12-
version = "0-unstable-2024-11-02";
17+
version = "0-unstable-2024-12-12";
1318

1419
src = fetchFromGitHub {
1520
owner = "keydet89";
1621
repo = "RegRipper3.0";
17-
rev = "89f3cac57e10bce1a79627e6038353e8e8a0c378";
18-
hash = "sha256-dW3Gr4HQH484i47Bg+CEnBYoGQQRMBJr88+YeuU+iV4=";
22+
rev = "bdf7ac2500a41319479846fe07202b7e8a61ca1f";
23+
hash = "sha256-JEBwTpDck0w85l0q5WjF1d20NyU+GJ89yAzbkUVOsu0=";
1924
};
2025

26+
nativeBuildInputs = [ makeWrapper ];
27+
2128
propagatedBuildInputs = [
2229
perl
23-
perlPackages.ParseWin32Registry
24-
];
30+
] ++ perlDeps;
2531

2632
installPhase = ''
2733
runHook preInstall
2834
2935
mkdir -p $out/{bin,share}
3036
31-
rm -r *.md *.exe *.bat *.dll
37+
rm -r *.md *.exe *.bat *.dll *.zip
3238
3339
cp -aR . "$out/share/regripper/"
3440
35-
cat > "$out/bin/regripper" << EOF
36-
#!${runtimeShell}
37-
exec ${perl}/bin/perl $out/share/regripper/rip.pl "\$@"
38-
EOF
39-
40-
chmod u+x "$out/bin/regripper"
41+
makeWrapper ${perl}/bin/perl $out/bin/regripper \
42+
--add-flags "$out/share/regripper/rip.pl" \
43+
--set PERL5LIB ${perlPackages.makeFullPerlPath perlDeps}
4144
4245
runHook postInstall
4346
'';

0 commit comments

Comments
 (0)