diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-04-14 14:06:10 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-04-14 14:06:10 +0200 |
| commit | 6bd036d5f9e4f1c5caa305c98c379f986d3bc402 (patch) | |
| tree | 1da024175e408b9e319d827b0d0c971eeb6fb5a9 /pkgs | |
| parent | f4f8857284b4fbdb3cb31a2614e78567636b295c (diff) | |
| download | nixlib-6bd036d5f9e4f1c5caa305c98c379f986d3bc402.tar nixlib-6bd036d5f9e4f1c5caa305c98c379f986d3bc402.tar.gz nixlib-6bd036d5f9e4f1c5caa305c98c379f986d3bc402.tar.bz2 nixlib-6bd036d5f9e4f1c5caa305c98c379f986d3bc402.tar.lz nixlib-6bd036d5f9e4f1c5caa305c98c379f986d3bc402.tar.xz nixlib-6bd036d5f9e4f1c5caa305c98c379f986d3bc402.tar.zst nixlib-6bd036d5f9e4f1c5caa305c98c379f986d3bc402.zip | |
non-linux attempts to fix: libbonobo and libjpeg
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/desktops/gnome-2/platform/libbonobo/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix index 79c41f924d3f..2303fb15a6f1 100644 --- a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix +++ b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix @@ -10,7 +10,9 @@ stdenv.mkDerivation rec { sha256 = "0swp4kk6x7hy1rvd1f9jba31lvfc6qvafkvbpg9h0r34fzrd8q4i"; }; - preConfigure = "export USER=`whoami`"; + preConfigure = # still using stuff deprecated in new glib versions + "sed 's/-DG_DISABLE_DEPRECATED//g' -i configure activation-server/Makefile.in"; + nativeBuildInputs = [ flex bison pkgconfig intltool procps ]; buildInputs = [ libxml2 ]; propagatedBuildInputs = [ popt glib ORBit2 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2bd7c525be5..dd442a646061 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4337,7 +4337,7 @@ let libjpeg_original = callPackage ../development/libraries/libjpeg { }; libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { }; - libjpeg = libjpeg_turbo; + libjpeg = if stdenv.isDarwin then libjpeg_original else libjpeg_turbo; libjpeg62 = callPackage ../development/libraries/libjpeg/62.nix { libtool = libtool_1_5; |