From 40bb3374e91cbdbace29594a0f620d4402bc703c Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Tue, 24 Apr 2018 23:12:40 +0200
Subject: [PATCH] source-and-tags: fix default.nix

Tested by observing that the following command produces a correctly
looking TAGS file:

$ nix-shell -E 'let pkgs = import ./. {}; in pkgs.myEnvFun {name = "myEnvFun-htags-test"; buildInputs = [(pkgs.sourceAndTags.sourceWithTagsDerivation (pkgs.sourceAndTags.addHasktagsTaggingInfo pkgs.haskellPackages.scientific).passthru.sourceWithTags)];}' --run 'cat $TAG_FILES'
---
 pkgs/misc/source-and-tags/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/source-and-tags/default.nix b/pkgs/misc/source-and-tags/default.nix
index 981c01e2b4a7..7c082cbbbb0f 100644
--- a/pkgs/misc/source-and-tags/default.nix
+++ b/pkgs/misc/source-and-tags/default.nix
@@ -1,4 +1,4 @@
-args: with args; {
+{ stdenv, lib, glibcLocales, unzip, hasktags, ctags } : {
   # optional srcDir
   annotatedWithSourceAndTagInfo = x : (x ? passthru && x.passthru ? sourceWithTags 
                                       || x ? meta && x.meta ? sourceWithTags );
@@ -59,8 +59,8 @@ args: with args; {
                     # without this creating tag files for lifted-base fails
                     export LC_ALL=en_US.UTF-8
                     export LANG=en_US.UTF-8
-                    ${if args.stdenv.isLinux then "export LOCALE_ARCHIVE=${args.pkgs.glibcLocales}/lib/locale/locale-archive;" else ""}
- 
+                    ${if stdenv.isLinux then "export LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive;" else ""}
+
                     ${toString hasktags}/bin/hasktags --ignore-close-implementation --ctags .
                     mv tags \$TAG_FILE
                    }";