diff options
| author | Domen Kožar <domen@dev.si> | 2014-02-18 14:36:30 +0100 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2014-02-18 14:36:30 +0100 |
| commit | e2bc0912137b6a1df991ec102cf2ce23e5405553 (patch) | |
| tree | c5ada264e6369ef45593b30415a0885a35659aa6 | |
| parent | f4641f0e4b31347e15c00584f43ffff8159d2e10 (diff) | |
| parent | 5181cbd7c6b9449b78ef859d473a13b7a7101971 (diff) | |
Merge pull request #1777 from lethalman/gitglib
libgit2-glib: Fix build after gnome3.gnome_common changes
| -rw-r--r-- | pkgs/desktops/gnome-3/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index b8832f6207a3..516b56e238e9 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -119,6 +119,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; |