From b683a15d17cdcabf54b911ad2f60670fda7ca37c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 4 Jul 2017 15:21:55 +0200 Subject: [PATCH] haskell-tinc: don't hard-code the version of GHC used by this tool 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. --- pkgs/development/tools/haskell/tinc/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/tinc/default.nix b/pkgs/development/tools/haskell/tinc/default.nix index 28712a57ae1..5d5db88a216 100644 --- a/pkgs/development/tools/haskell/tinc/default.nix +++ b/pkgs/development/tools/haskell/tinc/default.nix @@ -3,7 +3,7 @@ , hpack, hspec, HUnit, language-dot, mockery, parsec, process , QuickCheck, safe, stdenv, temporary, time, transformers, unix , unix-compat, with-location, yaml, fetchFromGitHub -, ghc, cabal2nix, cabal-install, makeWrapper +, cabal2nix, cabal-install, makeWrapper }: mkDerivation { pname = "tinc"; @@ -30,7 +30,6 @@ mkDerivation { postInstall = '' source ${makeWrapper}/nix-support/setup-hook wrapProgram $out/bin/tinc \ - --prefix PATH : '${ghc}/bin' \ --prefix PATH : '${cabal2nix}/bin' \ --prefix PATH : '${cabal-install}/bin' '';