diff options
| author | Luca Bruno <luca.bruno@immobiliare.it> | 2014-02-18 13:22:02 +0100 |
|---|---|---|
| committer | Luca Bruno <luca.bruno@immobiliare.it> | 2014-02-18 13:23:32 +0100 |
| commit | 5181cbd7c6b9449b78ef859d473a13b7a7101971 (patch) | |
| tree | 64987936c5a885d031d38d9c8f9e241dca652df2 /pkgs/desktops | |
| parent | 4b201b27bfb34d9494a517e34e1e81bf7b17b6db (diff) | |
| download | nixlib-5181cbd7c6b9449b78ef859d473a13b7a7101971.tar nixlib-5181cbd7c6b9449b78ef859d473a13b7a7101971.tar.gz nixlib-5181cbd7c6b9449b78ef859d473a13b7a7101971.tar.bz2 nixlib-5181cbd7c6b9449b78ef859d473a13b7a7101971.tar.lz nixlib-5181cbd7c6b9449b78ef859d473a13b7a7101971.tar.xz nixlib-5181cbd7c6b9449b78ef859d473a13b7a7101971.tar.zst nixlib-5181cbd7c6b9449b78ef859d473a13b7a7101971.zip | |
libgit2-glib: Fix build after gnome3.gnome_common changes
Diffstat (limited to 'pkgs/desktops')
| -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 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; |