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

a few packages: work-arounds with split outputs 

There's something wrong with imake-based packages,
but I couldn't find out what, so disabling transfig in libgcrypt for now.
This commit is contained in:
Vladimír Čunát 2015-05-05 11:41:37 +02:00
parent d449020d87
commit d6dd3b8bd1
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/video/vlc/default.nix
View File

@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
sha256 = "05smn9hqdp7iscc1dj4cxp1mrlad7b50lhlnlqisfzf493i2f2jy";
};
# outputs TODO: some modules are "corrupt", even without splitting vlc
buildInputs =
[ xz bzip2 perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread
libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt

3
pkgs/development/libraries/libgcrypt/1.6.nix
View File

@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "0pq2nwfqgggrsh8rk84659d80vfnlkbphwqjwahccd5fjdxr3d21";
};
nativeBuildInputs = [ transfig ghostscript texinfo ];
# transfig broke with multiple outputs, and it doesn't seem important here
nativeBuildInputs = [ /*transfig*/ ghostscript texinfo ];
propagatedBuildInputs = [ libgpgerror ];

2
pkgs/tools/filesystems/xfsprogs/default.nix
View File

@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
buildInputs = [ gettext libuuid readline ];
outputs = [ "dev" "out" "bin" ];
outputs = [ "dev" "out" "bin" ]; # TODO: review xfs
preConfigure = ''
NIX_LDFLAGS="$(echo $NIX_LDFLAGS | sed "s,$out,$lib,g")"

4
pkgs/top-level/all-packages.nix
View File

@ -3252,7 +3252,7 @@ let
xflux = callPackage ../tools/misc/xflux { };
xfsprogs = callPackage ../tools/filesystems/xfsprogs { };
libxfs = xfsprogs.lib;
libxfs = xfsprogs.dev; # outputs TODO
xml2 = callPackage ../tools/text/xml/xml2 { };
@ -7136,7 +7136,7 @@ let
);
mesa = mesaDarwinOr (buildEnv {
name = "mesa-${mesa_noglu.version}";
paths = [ mesa_noglu mesa_glu ];
paths = [ mesa_noglu.dev mesa_noglu.out mesa_glu ];
});
metaEnvironment = recurseIntoAttrs (let callPackage = newScope pkgs.metaEnvironment; in rec {