git.iko.soy/typeable/nixpkgs
on master help sign in
treewide: replace uses of ghc.name to find packages' datadir
commit6016ed50768d2ccc5417382970bb16948bc76c95 authorsternenseemann <sternenseemann@systemli.org> dateThu 31 Mar 2022, 12:53 (5 years ago) parent456faf7
2 files changed+4−4
compare with master
unifiedsplit
nixos/modules/services/misc/gitit.nix+1−1 pkgs/development/haskell-modules/configuration-common.nix+3−3
nixos/modules/services/misc/gitit.nix+1−1
@@ -10,7 +10,7 @@ let
1010
1111 toYesNo = b: if b then "yes" else "no";
1212
13− gititShared = with cfg.haskellPackages; gitit + "/share/" + pkgs.stdenv.hostPlatform.system + "-" + ghc.name + "/" + gitit.pname + "-" + gitit.version;
13+ gititShared = with cfg.haskellPackages; gitit + "/share/" + ghc.targetPrefix + ghc.haskellCompilerName + "/" + gitit.pname + "-" + gitit.version;
1414
1515 gititWithPkgs = hsPkgs: extras: hsPkgs.ghcWithPackages (self: with self; [ gitit ] ++ (extras self));
1616
pkgs/development/haskell-modules/configuration-common.nix+3−3
@@ -613,7 +613,7 @@ self: super: {
613613 doCheck = false; # https://github.com/kazu-yamamoto/ghc-mod/issues/335
614614 executableToolDepends = drv.executableToolDepends or [] ++ [pkgs.buildPackages.emacs];
615615 postInstall = ''
616− local lispdir=( "$data/share/${self.ghc.name}/*/${drv.pname}-${drv.version}/elisp" )
616+ local lispdir=( "$data/share/${self.ghc.targetPrefix}${self.ghc.haskellCompilerName}/*/${drv.pname}-${drv.version}/elisp" )
617617 make -C $lispdir
618618 mkdir -p $data/share/emacs/site-lisp
619619 ln -s "$lispdir/"*.el{,c} $data/share/emacs/site-lisp/
@@ -648,7 +648,7 @@ self: super: {
648648 # cannot easily byte-compile these files, unfortunately, because they
649649 # depend on a new version of haskell-mode that we don't have yet.
650650 postInstall = ''
651− local lispdir=( "$data/share/${self.ghc.name}/"*"/${drv.pname}-"*"/elisp" )
651+ local lispdir=( "$data/share/${self.ghc.targetPrefix}${self.ghc.haskellCompilerName}/"*"/${drv.pname}-"*"/elisp" )
652652 mkdir -p $data/share/emacs
653653 ln -s $lispdir $data/share/emacs/site-lisp
654654 '';
@@ -659,7 +659,7 @@ self: super: {
659659 # We cannot easily byte-compile these files, unfortunately, because they
660660 # depend on a new version of haskell-mode that we don't have yet.
661661 postInstall = ''
662− local lispdir=( "$data/share/${self.ghc.name}/"*"/${drv.pname}-"*"/elisp" )
662+ local lispdir=( "$data/share/${self.ghc.targetPrefix}${self.ghc.haskellCompilerName}/"*"/${drv.pname}-"*"/elisp" )
663663 mkdir -p $data/share/emacs
664664 ln -s $lispdir $data/share/emacs/site-lisp
665665 '';