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

vala, libusb1, deps of libjpeg: attempt to fix on non-Linux

Browse Source
This commit is contained in:
Vladimír Čunát 2013-06-18 15:35:26 +02:00
parent ab7d7333be
commit 3adf8e6429
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/compilers/vala/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchurl, yacc, flex, pkgconfig, glib, dbus, dbus_tools, libiconvOrEmpty }: { stdenv, fetchurl, yacc, flex, pkgconfig, glib, dbus, dbus_tools
, libiconvOrEmpty, libintlOrEmpty }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
p_name = "vala"; p_name = "vala";
@ -15,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ yacc flex pkgconfig ]; nativeBuildInputs = [ yacc flex pkgconfig ];
buildInputs = [ glib ] ++ libiconvOrEmpty buildInputs = [ glib ] ++ libiconvOrEmpty ++ libintlOrEmpty
++ stdenv.lib.optional doCheck [ dbus dbus_tools ]; ++ stdenv.lib.optional doCheck [ dbus dbus_tools ];
doCheck = false; # problems when launching dbus tests doCheck = false; # problems when launching dbus tests

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

@ -4537,7 +4537,7 @@ let
libjpeg_original = callPackage ../development/libraries/libjpeg { }; libjpeg_original = callPackage ../development/libraries/libjpeg { };
libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { }; libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { };
libjpeg = if stdenv.isDarwin then libjpeg_original else libjpeg_turbo; libjpeg = if (stdenv.isLinux) then libjpeg_turbo else libjpeg_original; # some problems, both on FreeBSD and Darwin
libjpeg62 = callPackage ../development/libraries/libjpeg/62.nix { libjpeg62 = callPackage ../development/libraries/libjpeg/62.nix {
libtool = libtool_1_5; libtool = libtool_1_5;
@ -4697,7 +4697,11 @@ let
else stdenv; else stdenv;
}; };
libusb1 = callPackage ../development/libraries/libusb1 { }; libusb1 = callPackage ../development/libraries/libusb1 {
stdenv = if stdenv.isDarwin # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50909
then overrideGCC stdenv gccApple
else stdenv;
};
libunwind = callPackage ../development/libraries/libunwind { }; libunwind = callPackage ../development/libraries/libunwind { };