From 8d67b707c7ce7bb2a3720e8ff9d46a8e3b601c6f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 22 Oct 2014 19:19:57 -0400 Subject: [PATCH] libgit2-glib: Buidl broke with libgit2 + libssh2 --- pkgs/desktops/gnome-3/3.10/default.nix | 4 +++- pkgs/desktops/gnome-3/3.12/default.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.10/default.nix b/pkgs/desktops/gnome-3/3.10/default.nix index e1783be3b7f..ad23f7a759f 100644 --- a/pkgs/desktops/gnome-3/3.10/default.nix +++ b/pkgs/desktops/gnome-3/3.10/default.nix @@ -183,7 +183,9 @@ rec { gitg = callPackage ./misc/gitg { }; - libgit2-glib = callPackage ./misc/libgit2-glib { }; + libgit2-glib = callPackage ./misc/libgit2-glib { + libgit2 = pkgs.libgit2.override { libssh2 = null; }; + }; libmediaart = callPackage ./misc/libmediaart { }; diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix index a46f49cbb5a..f223c8c0a96 100644 --- a/pkgs/desktops/gnome-3/3.12/default.nix +++ b/pkgs/desktops/gnome-3/3.12/default.nix @@ -233,7 +233,9 @@ rec { libgda = callPackage ./misc/libgda { }; - libgit2-glib = callPackage ./misc/libgit2-glib { }; + libgit2-glib = callPackage ./misc/libgit2-glib { + libgit2 = pkgs.libgit2.override { libssh2 = null; }; + }; libmediaart = callPackage ./misc/libmediaart { };