mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 13:10:33 +00:00
Code Issues Wiki Activity

non-linux attempts to fix: libbonobo and libjpeg

Browse source
This commit is contained in:
Vladimír Čunát 2013-04-14 14:06:10 +02:00
parent f4f8857284
commit 6bd036d5f9
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/desktops/gnome-2/platform/libbonobo/default.nix
View file

@ -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 ];

2
pkgs/top-level/all-packages.nix
View file

@ -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;