From 4fe328c6cac90d0e8500a1f489db8a1728af32e5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 1 Aug 2017 15:24:57 +0200 Subject: [PATCH] haskell-hindent: fix location of the "site-lisp" symlink --- pkgs/development/haskell-modules/configuration-common.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index bacaa581a68..9f24d348064 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -618,14 +618,14 @@ self: super: { haskell-src-exts = self.haskell-src-exts_1_19_1; }; - # # Make elisp files available at a location where people expect it. + # Make elisp files available at a location where people expect it. hindent = (overrideCabal super.hindent (drv: { # We cannot easily byte-compile these files, unfortunately, because they # depend on a new version of haskell-mode that we don't have yet. postInstall = '' - local lispdir=( "$out/share/"*"-${self.ghc.name}/${drv.pname}-${drv.version}/elisp" ) - mkdir -p $out/share/emacs - ln -s $lispdir $out/share/emacs/site-lisp + local lispdir=( "$data/share/${self.ghc.name}/"*"/${drv.pname}-"*"/elisp" ) + mkdir -p $data/share/emacs + ln -s $lispdir $data/share/emacs/site-lisp ''; doCheck = false; # https://github.com/chrisdone/hindent/issues/299 })).override {