public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hledger*: build correctly on darwin 

- mkdir -p $out/share/info rather than assuming $out/share is there
 - find .info and .man* files correctly on darwin -- don't try to
   match the specific system name, there is nothing to gain from that

nix calls darwin darwin, but ghc calls it osx in its directory names.

closes #34644
This commit is contained in:
Claes Wallin (韋嘉誠) 2018-02-06 09:07:39 +08:00
parent d80057f245
commit cc2c594a9b
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -965,37 +965,37 @@ self: super: {
hledger = overrideCabal super.hledger (drv: { hledger = overrideCabal super.hledger (drv: {
postInstall = '' postInstall = ''
for i in $(seq 1 9); do for i in $(seq 1 9); do
for j in $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/*.$i $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/.otherdocs/*.$i; do for j in $data/share/${self.ghc.name}/*-${self.ghc.name}/*/*.$i $data/share/${self.ghc.name}/*-${self.ghc.name}/*/.otherdocs/*.$i; do
mkdir -p $out/share/man/man$i mkdir -p $out/share/man/man$i
cp $j $out/share/man/man$i/ cp $j $out/share/man/man$i/
done done
done done
mkdir $out/share/info mkdir -p $out/share/info
cp $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/*.info $out/share/info/ cp $data/share/${self.ghc.name}/*-${self.ghc.name}/*/*.info $out/share/info/
''; '';
}); });
hledger-ui = overrideCabal super.hledger-ui (drv: { hledger-ui = overrideCabal super.hledger-ui (drv: {
postInstall = '' postInstall = ''
for i in $(seq 1 9); do for i in $(seq 1 9); do
for j in $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/*.$i $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/.otherdocs/*.$i; do for j in $data/share/${self.ghc.name}/*-${self.ghc.name}/*/*.$i $data/share/${self.ghc.name}/*-${self.ghc.name}/*/.otherdocs/*.$i; do
mkdir -p $out/share/man/man$i mkdir -p $out/share/man/man$i
cp $j $out/share/man/man$i/ cp $j $out/share/man/man$i/
done done
done done
mkdir $out/share/info mkdir -p $out/share/info
cp $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/*.info $out/share/info/ cp $data/share/${self.ghc.name}/*-${self.ghc.name}/*/*.info $out/share/info/
''; '';
}); });
hledger-web = overrideCabal super.hledger-web (drv: { hledger-web = overrideCabal super.hledger-web (drv: {
postInstall = '' postInstall = ''
for i in $(seq 1 9); do for i in $(seq 1 9); do
for j in $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/*.$i $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/.otherdocs/*.$i; do for j in $data/share/${self.ghc.name}/*-${self.ghc.name}/*/*.$i $data/share/${self.ghc.name}/*-${self.ghc.name}/*/.otherdocs/*.$i; do
mkdir -p $out/share/man/man$i mkdir -p $out/share/man/man$i
cp $j $out/share/man/man$i/ cp $j $out/share/man/man$i/
done done
done done
mkdir $out/share/info mkdir -p $out/share/info
cp $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/*.info $out/share/info/ cp $data/share/${self.ghc.name}/*-${self.ghc.name}/*/*.info $out/share/info/
''; '';
}); });