cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

haskellPackages.nvfetcher: move overrideCabal to configuration-nix.nix

Browse source
This commit is contained in:
Potato Hatsue 2021-06-09 21:15:39 +08:00 committed by sterni
parent 8ba5828c24
commit 233087eb79
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/development/haskell-modules/configuration-nix.nix
View file

@ -833,4 +833,16 @@ self: super: builtins.intersectAttrs super {
sed -i 's|"tophat"|"./dist/build/tophat/tophat"|' app-test-bin/*.hs
'' + (drv.postPatch or "");
});
# Runtime dependencies and CLI completion
nvfetcher = generateOptparseApplicativeCompletion "nvfetcher" (overrideCabal
super.nvfetcher (drv: {
buildTools = drv.buildTools or [ ] ++ [ pkgs.makeWrapper ];
postInstall = drv.postInstall or "" + ''
wrapProgram "$out/bin/nvfetcher" --prefix 'PATH' ':' "${
pkgs.lib.makeBinPath [ pkgs.nvchecker pkgs.nix-prefetch-git ]
}"
'';
}));
}

8
pkgs/top-level/all-packages.nix
View file

@ -7202,13 +7202,7 @@ in
nvchecker = with python3Packages; toPythonApplication nvchecker;
nvfetcher = with haskell.lib; overrideCabal (justStaticExecutables haskellPackages.nvfetcher) (drv: {
executableToolDepends = [ makeWrapper ];
postInstall = ''
wrapProgram $out/bin/nvfetcher \
--prefix PATH ":" "${nvchecker}/bin:${nix-prefetch-git}/bin"
'';
});
nvfetcher = haskell.lib.justStaticExecutables haskellPackages.nvfetcher;
miller = callPackage ../tools/text/miller { };