diff options
| author | sternenseemann <sternenseemann@systemli.org> | 2022-03-31 12:53:40 +0200 |
|---|---|---|
| committer | sternenseemann <sternenseemann@systemli.org> | 2022-03-31 12:53:40 +0200 |
| commit | 6016ed50768d2ccc5417382970bb16948bc76c95 (patch) | |
| tree | 26ed4289cb1809a3a4759d1c9b59b9852cf2d2b1 /pkgs/development/haskell-modules | |
| parent | 456faf71e5a842128589e0b44dea3d426fa87e40 (diff) | |
| download | nixpkgs-6016ed50768d2ccc5417382970bb16948bc76c95.tar nixpkgs-6016ed50768d2ccc5417382970bb16948bc76c95.tar.gz nixpkgs-6016ed50768d2ccc5417382970bb16948bc76c95.tar.bz2 nixpkgs-6016ed50768d2ccc5417382970bb16948bc76c95.tar.lz nixpkgs-6016ed50768d2ccc5417382970bb16948bc76c95.tar.xz nixpkgs-6016ed50768d2ccc5417382970bb16948bc76c95.tar.zst nixpkgs-6016ed50768d2ccc5417382970bb16948bc76c95.zip | |
treewide: replace uses of ghc.name to find packages' datadir
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index dfa47f2a82c..809259da3ee 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -613,7 +613,7 @@ self: super: { doCheck = false; # https://github.com/kazu-yamamoto/ghc-mod/issues/335 executableToolDepends = drv.executableToolDepends or [] ++ [pkgs.buildPackages.emacs]; postInstall = '' - local lispdir=( "$data/share/${self.ghc.name}/*/${drv.pname}-${drv.version}/elisp" ) + local lispdir=( "$data/share/${self.ghc.targetPrefix}${self.ghc.haskellCompilerName}/*/${drv.pname}-${drv.version}/elisp" ) make -C $lispdir mkdir -p $data/share/emacs/site-lisp ln -s "$lispdir/"*.el{,c} $data/share/emacs/site-lisp/ @@ -648,7 +648,7 @@ self: super: { # 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=( "$data/share/${self.ghc.name}/"*"/${drv.pname}-"*"/elisp" ) + local lispdir=( "$data/share/${self.ghc.targetPrefix}${self.ghc.haskellCompilerName}/"*"/${drv.pname}-"*"/elisp" ) mkdir -p $data/share/emacs ln -s $lispdir $data/share/emacs/site-lisp ''; @@ -659,7 +659,7 @@ self: super: { # 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=( "$data/share/${self.ghc.name}/"*"/${drv.pname}-"*"/elisp" ) + local lispdir=( "$data/share/${self.ghc.targetPrefix}${self.ghc.haskellCompilerName}/"*"/${drv.pname}-"*"/elisp" ) mkdir -p $data/share/emacs ln -s $lispdir $data/share/emacs/site-lisp ''; |