diff options
Diffstat (limited to 'pkgs/desktops/gnome-2')
-rw-r--r-- | pkgs/desktops/gnome-2/platform/libgnome/default.nix | 6 | ||||
-rw-r--r-- | pkgs/desktops/gnome-2/platform/libgnomeui/default.nix | 10 |
2 files changed, 13 insertions, 3 deletions
diff --git a/pkgs/desktops/gnome-2/platform/libgnome/default.nix b/pkgs/desktops/gnome-2/platform/libgnome/default.nix index 1bffa6211dca..a9957c41ff5d 100644 --- a/pkgs/desktops/gnome-2/platform/libgnome/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnome/default.nix @@ -11,9 +11,11 @@ stdenv.mkDerivation rec { sha256 = "197pnq8y0knqjhm2fg4j6hbqqm3qfzfnd0irhwxpk1b4hqb3kimj"; }; - outputs = [ "out" "dev" ]; - patches = [ ./new-glib.patch ]; + /* There's a comment containing an invalid utf-8 sequence, breaking glib-mkenums. */ + postPatch = "sed '/returns the true filename/d' -i libgnome/gnome-config.h"; + + outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ popt zlib intltool GConf gnome_vfs libcanberra libtool ]; diff --git a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix index d30c38a2cfc4..24cd851eef6a 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, xorg, glib, pango +{ stdenv, fetchurl, fetchpatch, pkgconfig, libxml2, xorg, glib, pango , intltool, libgnome, libgnomecanvas, libbonoboui, GConf, libtool , gnome_vfs, libgnome_keyring, libglade }: @@ -13,6 +13,14 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + patches = [ + (fetchpatch { + name = "0001-gnome-scores.h-Convert-to-UTF-8.patch"; + url = https://github.com/GNOME/libgnomeui/commit/30334c28794ef85d8973f4ed0779b5ceed6594f2.diff; + sha256 = "1sn8j8dkam14wfkpw8nga3gk63wniff243mzv3jp0fvv52q8sqhk"; + }) + ]; + nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ xorg.xlibsWrapper libxml2 GConf pango glib libgnome_keyring libglade libtool ]; |