X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=blobdiff_plain;f=shell.nix;h=f9d896259e7b7edee0424f0a3a917aaf54234bee;hp=3ca255579c024c45a1ebbf1765690d1df94ac781;hb=1bf4194271bc619cbeaeda2f60bf11081a95282f;hpb=1928e6094ea644b24e511e5c21036729b017f98d diff --git a/shell.nix b/shell.nix index 3ca255579c..f9d896259e 100644 --- a/shell.nix +++ b/shell.nix @@ -31,6 +31,11 @@ in makeWrapper ]; shellHook = '' + # Set Gdk pixbuf loaders file to the one from the build dependencies here + unset GDK_PIXBUF_MODULE_FILE + # Defined in gdk-pixbuf setup hook + findGdkPixbufLoaders "${pkgs.librsvg}" + wrapFactor () { [ -n "$1" ] || { printf "Usage: wrapFactor " ; return; } local root="$(realpath $1)" @@ -41,6 +46,7 @@ in # Restore the factor binary if it was already wrapped [ -e "$wrapped" ] && { mv "$wrapped" "$binary" ; } wrapProgram "$binary" --prefix LD_LIBRARY_PATH : ${runtimeLibPath} \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --argv0 factor ln -sf "''${root}/factor.image" "''${root}/.factor-wrapped.image" }