Merge remote-tracking branch 'upstream/staging' into master
This commit is contained in:
commit
2b0eace6cf
@ -16,9 +16,7 @@ stdenv.mkDerivation rec {
|
||||
./rtcwake-search-PATH-for-shutdown.patch
|
||||
];
|
||||
|
||||
outputs = [ "bin" "out" "man" ]; # TODO: $bin is kept the first for now
|
||||
# due to lots of ${utillinux}/bin occurences and headers being rather small
|
||||
outputDev = "bin";
|
||||
outputs = [ "bin" "dev" "out" "man" ];
|
||||
|
||||
#FIXME: make it also work on non-nixos?
|
||||
postPatch = ''
|
||||
|
@ -8,8 +8,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1m72lk90b5i3h9qnmss6aygrzyn8x2avy3hyaq2fb0jglkrkz6ar";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "out" "man" ];
|
||||
outputDev = "bin"; # just for *.pc
|
||||
outputs = [ "bin" "dev" "out" "man" ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ libuuid ];
|
||||
|
@ -107,7 +107,28 @@ core = stdenv.mkDerivation rec {
|
||||
mv ./texmf.cnf "$out/share/texmf-dist/web2c/"
|
||||
cp ../texk/tests/TeXLive/*.pm "$out/share/texmf-dist/scripts/texlive/TeXLive/"
|
||||
cp ../texk/texlive/linked_scripts/scripts.lst "$out/share/texmf-dist/scripts/texlive/"
|
||||
'' + /* doc location identical with individual TeX pkgs */ ''
|
||||
'' +
|
||||
(let extraScripts =
|
||||
''
|
||||
tex4ht/ht.sh
|
||||
tex4ht/htcontext.sh
|
||||
tex4ht/htcopy.pl
|
||||
tex4ht/htlatex.sh
|
||||
tex4ht/htmex.sh
|
||||
tex4ht/htmove.pl
|
||||
tex4ht/httex.sh
|
||||
tex4ht/httexi.sh
|
||||
tex4ht/htxelatex.sh
|
||||
tex4ht/htxetex.sh
|
||||
tex4ht/mk4ht.pl
|
||||
tex4ht/xhlatex.sh
|
||||
'';
|
||||
in
|
||||
''
|
||||
echo -e 'texmf_scripts="$texmf_scripts\n${extraScripts}"' \
|
||||
>> "$out/share/texmf-dist/scripts/texlive/scripts.lst"
|
||||
'')
|
||||
+ /* doc location identical with individual TeX pkgs */ ''
|
||||
mkdir -p "$doc/doc"
|
||||
mv "$doc"/share/{man,info} "$doc"/doc
|
||||
rmdir "$doc"/share
|
||||
|
Loading…
x
Reference in New Issue
Block a user