-
-
Notifications
You must be signed in to change notification settings - Fork 15.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
gdk_pixbuf: 2.36.7 → 2.36.11 #36312
gdk_pixbuf: 2.36.7 → 2.36.11 #36312
Conversation
Nitpick: the gtk3 update is in 01bf838 also (staging). |
Regarding the |
Rebasing onto master as it will be merged with GNOME 3.28. |
EDIT: Accidentally wrote my message into wrong thread. Sorry. |
This update causes reproducible (and fairly frequent) crashes on my system: #37696. |
At a glance, I do not see any particularly suspicious changes https://git.gnome.org/browse/gdk-pixbuf/log/?h=2.36.11 but we can probably safely revert this until it is investigated. |
I narrowed it down to 2.36.8, will need to do more detailed bisection later. |
I created the following testcase: with import <nixpkgs> { };
with pkgs;
let
testSrc = writeText "test.c" ''
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <glib.h>
int main(int argc, char const *argv[]) {
GError* err = NULL;
if (gdk_pixbuf_new_from_file("${nixos-artwork.wallpapers.gnome-dark}/share/artwork/gnome/Gnome_Dark.png", &err) == NULL) {
g_error("%s", err->message);
return 1;
}
return 0;
}
'';
in runCommand "gdk-pixbuf-loading-test" {
buildInputs = [ gdk_pixbuf pkgconfig gcc ];
} ''
cc \
$(pkg-config --cflags gdk-pixbuf-2.0) \
$(pkg-config --libs gdk-pixbuf-2.0) \
${testSrc} -o test
mkdir -p $out
mv test $out/test
$out/test
'' It works with 2.36.7 from the nixpkgs but when I add --- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, gnome3
-, jasper, gobjectIntrospection, doCheck ? false }:
+, jasper, gobjectIntrospection, shared-mime-info, doCheck ? false }:
let
pname = "gdk-pixbuf";
@@ -22,7 +22,7 @@
enableParallelBuilding = true;
# !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
- buildInputs = [ libX11 gobjectIntrospection ];
+ buildInputs = [ libX11 gobjectIntrospection shared-mime-info ];
nativeBuildInputs = [ pkgconfig ];
it fails. It seems that the addition of |
Motivation for this change
Depends on meson prefix patch (#36326)
Things done
build-use-sandbox
innix.conf
on non-NixOS)nix-shell -p nox --run "nox-review wip"
./result/bin/
)