JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

haskell-tinc: don't hard-code the version of GHC used by this tool

Browse Source 
We don't want to re-compile tinc just to change the GHC environment used for
building, i.e. when running inside of nix-shell. Instead, find "ghc" in $PATH.
This commit is contained in:
Peter Simons 2017-07-04 15:21:55 +02:00
parent cafed1a84c
commit b683a15d17
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/tools/haskell/tinc/default.nix
View File

@ -3,7 +3,7 @@
, hpack, hspec, HUnit, language-dot, mockery, parsec, process , hpack, hspec, HUnit, language-dot, mockery, parsec, process
, QuickCheck, safe, stdenv, temporary, time, transformers, unix , QuickCheck, safe, stdenv, temporary, time, transformers, unix
, unix-compat, with-location, yaml, fetchFromGitHub , unix-compat, with-location, yaml, fetchFromGitHub
, ghc, cabal2nix, cabal-install, makeWrapper , cabal2nix, cabal-install, makeWrapper
}: }:
mkDerivation { mkDerivation {
pname = "tinc"; pname = "tinc";
@ -30,7 +30,6 @@ mkDerivation {
postInstall = '' postInstall = ''
source ${makeWrapper}/nix-support/setup-hook source ${makeWrapper}/nix-support/setup-hook
wrapProgram $out/bin/tinc \ wrapProgram $out/bin/tinc \
--prefix PATH : '${ghc}/bin' \
--prefix PATH : '${cabal2nix}/bin' \ --prefix PATH : '${cabal2nix}/bin' \
--prefix PATH : '${cabal-install}/bin' --prefix PATH : '${cabal-install}/bin'
''; '';