From 5181cbd7c6b9449b78ef859d473a13b7a7101971 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Tue, 18 Feb 2014 13:22:02 +0100 Subject: libgit2-glib: Fix build after gnome3.gnome_common changes --- pkgs/desktops/gnome-3/default.nix | 2 +- pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/desktops') diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index b0c0f6c7f785..1cb990b726bc 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -113,6 +113,6 @@ rec { gitg = callPackage ./misc/gitg { }; - libgit2-glib = callPackage ./misc/libgit2-glib { automake = pkgs.automake111x; }; + libgit2-glib = callPackage ./misc/libgit2-glib { }; } diff --git a/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix index 12d37ab5db50..17c3b4fa0a8c 100644 --- a/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix +++ b/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, which, gnome3, autoconf, automake, libtool, pkgconfig +{ stdenv, fetchurl, gnome3, libtool, pkgconfig , gtk_doc, gobjectIntrospection, libgit2, glib }: stdenv.mkDerivation rec { @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { configureScript = "sh ./autogen.sh"; - buildInputs = [ which gnome3.gnome_common autoconf automake libtool - pkgconfig gtk_doc gobjectIntrospection libgit2 glib ]; + buildInputs = [ gnome3.gnome_common libtool pkgconfig + gtk_doc gobjectIntrospection libgit2 glib ]; meta = with stdenv.lib; { platforms = platforms.linux; -- cgit 1.4.1