diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-09-11 11:41:18 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-09-11 11:41:18 +0300 |
| commit | 2b0eace6cf021eed7123fb828483a00c95796829 (patch) | |
| tree | dcc5c40823ad9d7804bfec4145e3e9fa26db0400 /pkgs | |
| parent | a49cb9dcbee0fe82a5e04ff4d90c376761fd9f18 (diff) | |
| parent | c922c20cff06aeb92136efb4d14d5a4bbbcc3a45 (diff) | |
| download | nixlib-2b0eace6cf021eed7123fb828483a00c95796829.tar nixlib-2b0eace6cf021eed7123fb828483a00c95796829.tar.gz nixlib-2b0eace6cf021eed7123fb828483a00c95796829.tar.bz2 nixlib-2b0eace6cf021eed7123fb828483a00c95796829.tar.lz nixlib-2b0eace6cf021eed7123fb828483a00c95796829.tar.xz nixlib-2b0eace6cf021eed7123fb828483a00c95796829.tar.zst nixlib-2b0eace6cf021eed7123fb828483a00c95796829.zip | |
Merge remote-tracking branch 'upstream/staging' into master
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/util-linux/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/e2fsprogs/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/tools/typesetting/tex/texlive/bin.nix | 23 |
3 files changed, 24 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 0cc7a8a45483..b777042d6011 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -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 = '' diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index c091158bff63..f00a80603f97 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -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 ]; diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 8d410a6bdb2d..fe3c0b71b9bd 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -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 |