From 1919bb504360272242a6856b995df8d291adcecc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 20 Aug 2017 10:52:30 +0200 Subject: [PATCH] gnome3.caribou: fixup build after automake update #28232 /cc gnome update #28053. --- pkgs/desktops/gnome-3/3.22/core/caribou/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.22/core/caribou/default.nix b/pkgs/desktops/gnome-3/3.22/core/caribou/default.nix index d63b6e86af3..2d71f1da592 100644 --- a/pkgs/desktops/gnome-3/3.22/core/caribou/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/caribou/default.nix @@ -1,5 +1,5 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, pythonPackages, libxml2, autoconf -, libxklavier, libXtst, gtk2, intltool, libxslt, at_spi2_core, automake }: +{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, pythonPackages, libxml2 +, libxklavier, libXtst, gtk2, intltool, libxslt, at_spi2_core, autoreconfHook }: let majorVersion = "0.4"; @@ -12,13 +12,14 @@ stdenv.mkDerivation rec { sha256 = "0mfychh1q3dx0b96pjz9a9y112bm9yqyim40yykzxx1hppsdjhww"; }; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = with gnome3; - [ glib pkgconfig gtk clutter at_spi2_core dbus pythonPackages.python automake - pythonPackages.pygobject3 libxml2 libXtst gtk2 intltool libxslt autoconf ]; + [ glib gtk clutter at_spi2_core dbus pythonPackages.python + pythonPackages.pygobject3 libxml2 libXtst gtk2 intltool libxslt ]; propagatedBuildInputs = [ gnome3.libgee libxklavier ]; - preBuild = '' + postPatch = '' patchShebangs . substituteInPlace libcaribou/Makefile.am --replace "--shared-library=libcaribou.so.0" "--shared-library=$out/lib/libcaribou.so.0" '';