Unverified Commit 83ab9c4e authored by Robert Scott's avatar Robert Scott Committed by GitHub
Browse files

Merge pull request #298492 from risicle/ris-niv-wrap-binary-nix 

niv: wrap binary supplying runtime `nix` dependency in `PATH`
parents 568583f9 06c30f68

pkgs/development/haskell-modules/configuration-nix.nix

+7 −1
Original line number Diff line number Diff line
@@ -305,7 +305,13 @@ self: super: builtins.intersectAttrs super { 
  ghc-debug-brick  = enableSeparateBinOutput super.ghc-debug-brick;

  nixfmt  = enableSeparateBinOutput super.nixfmt;

  calligraphy = enableSeparateBinOutput super.calligraphy;

  niv = enableSeparateBinOutput (self.generateOptparseApplicativeCompletions [ "niv" ] super.niv);

  niv = overrideCabal (drv: {

      buildTools = (drv.buildTools or []) ++ [ pkgs.buildPackages.makeWrapper ];

      postInstall = ''

        wrapProgram ''${!outputBin}/bin/niv --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.nix ]}

      '';

    })

    (enableSeparateBinOutput (self.generateOptparseApplicativeCompletions [ "niv" ] super.niv));

  ghcid = enableSeparateBinOutput super.ghcid;

  ormolu = self.generateOptparseApplicativeCompletions [ "ormolu" ] (enableSeparateBinOutput super.ormolu);

  hnix = self.generateOptparseApplicativeCompletions [ "hnix" ] super.hnix;