alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Revert "gdk_pixbuf: 2.36.7 → 2.36.11"

Browse source 
This reverts commit 3abd1ec53d because the change
breaks many packages, like Emacs, pavucontrol, xmobar, etc. Further details can
be found at https://github.com/NixOS/nixpkgs/issues/37696.
This commit is contained in:
Peter Simons 2018-03-23 14:02:06 +01:00
parent faa31ee3ae
commit cb6f88ce5e
1 changed files with 15 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
pkgs/development/libraries/gdk-pixbuf/default.nix
View file

@ -1,46 +1,40 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl { stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, gnome3
, docbook_xml_dtd_43, gtk-doc, glib, libtiff, libjpeg, libpng, libX11, gnome3 , jasper, libintlOrEmpty, gobjectIntrospection, doCheck ? false }:
, jasper, shared-mime-info, libintlOrEmpty, gobjectIntrospection, doCheck ? false, makeWrapper }:
let let
pname = "gdk-pixbuf"; pname = "gdk-pixbuf";
version = "2.36.11"; version = "2.36.7";
# TODO: since 2.36.8 gdk-pixbuf gets configured to use mime-type sniffing,
# which apparently requires access to shared-mime-info files during runtime.
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "1wz2vpciwdpdv612s8kbww08q80hgcs5dxrfsxp1a4q44n3snqmf"; sha256 = "1b6e5eef09d98f05f383014ecd3503e25dfb03d7e5b5f5904e5a65b049a6a4d8";
}; };
outputs = [ "out" "dev" "man" "devdoc" ]; outputs = [ "out" "dev" "devdoc" ];
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
enableParallelBuilding = true; enableParallelBuilding = true;
# !!! We might want to factor out the gdk-pixbuf-xlib subpackage. # !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
buildInputs = [ libX11 ] ++ stdenv.lib.optional (!stdenv.isDarwin) shared-mime-info ++ libintlOrEmpty; buildInputs = [ libX11 gobjectIntrospection ] ++ libintlOrEmpty;
nativeBuildInputs = [ nativeBuildInputs = [ pkgconfig ];
meson ninja pkgconfig gettext python3 libxml2 libxslt docbook_xsl docbook_xml_dtd_43
gtk-doc gobjectIntrospection makeWrapper
];
propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ]; propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ];
mesonFlags = [ configureFlags = "--with-libjasper --with-x11"
# with_ & enable_will be removed in the future + stdenv.lib.optionalString (gobjectIntrospection != null) " --enable-introspection=yes"
"-Dwith_docs=true" ;
"-Denable_jasper=true"
"-Dx11=true" # will be added in the future (default atm)
"-Dwith_gir=${if gobjectIntrospection != null then "true" else "false"}"
];
postPatch = '' # on darwin, tests don't link
chmod +x build-aux/* # patchShebangs only applies to executables preBuild = stdenv.lib.optionalString (stdenv.isDarwin && !doCheck) ''
patchShebangs build-aux substituteInPlace Makefile --replace "docs tests" "docs"
''; '';
postInstall = postInstall =
@ -48,17 +42,6 @@ stdenv.mkDerivation rec {
'' ''
moveToOutput "bin" "$dev" moveToOutput "bin" "$dev"
moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out" moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out"
# We require runtime access to shared-mime-info
${stdenv.lib.optionalString (!stdenv.isDarwin) ''
for f in $dev/bin/*; do
wrapProgram $f --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
done
wrapProgram $out/bin/gdk-pixbuf-thumbnailer --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
''}
# We need to install 'loaders.cache' in lib/gdk-pixbuf-2.0/2.10.0/
$dev/bin/gdk-pixbuf-query-loaders --update-cache
''; '';
# The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB). # The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB).