From 073b30563d42d767bc3403e02413305c26b1a49c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 11 Jul 2017 14:44:41 +0200 Subject: [PATCH] ghc-mod: fix build to cope with new split-output work --- pkgs/development/haskell-modules/configuration-common.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 85a2d0f665e4..9026e3aa3a69 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -594,10 +594,10 @@ self: super: { doCheck = false; # https://github.com/kazu-yamamoto/ghc-mod/issues/335 executableToolDepends = drv.executableToolDepends or [] ++ [pkgs.emacs]; postInstall = '' - local lispdir=( "$out/share/"*"-${self.ghc.name}/${drv.pname}-${drv.version}/elisp" ) + local lispdir=( "$data/share/${self.ghc.name}/*/${drv.pname}-${drv.version}/elisp" ) make -C $lispdir - mkdir -p $out/share/emacs/site-lisp - ln -s "$lispdir/"*.el{,c} $out/share/emacs/site-lisp/ + mkdir -p $data/share/emacs/site-lisp + ln -s "$lispdir/"*.el{,c} $data/share/emacs/site-lisp/ ''; });