From d6dd3b8bd1eaeeb21dfdb5051cd4732c748ce5d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 5 May 2015 11:41:37 +0200 Subject: [PATCH] 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. --- pkgs/applications/video/vlc/default.nix | 2 ++ pkgs/development/libraries/libgcrypt/1.6.nix | 3 ++- pkgs/tools/filesystems/xfsprogs/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index e25f833eabc..5de5843230a 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -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 diff --git a/pkgs/development/libraries/libgcrypt/1.6.nix b/pkgs/development/libraries/libgcrypt/1.6.nix index 39160675a2a..82bed6eba4d 100644 --- a/pkgs/development/libraries/libgcrypt/1.6.nix +++ b/pkgs/development/libraries/libgcrypt/1.6.nix @@ -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 ]; diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix index 7b38e74d04b..52e1ed7c28f 100644 --- a/pkgs/tools/filesystems/xfsprogs/default.nix +++ b/pkgs/tools/filesystems/xfsprogs/default.nix @@ -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")" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34794049d7d..ce29f446a9e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 {