diff options
| author | Shea Levy <shea@shealevy.com> | 2014-10-22 19:19:57 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2014-10-22 19:19:57 -0400 |
| commit | 8d67b707c7ce7bb2a3720e8ff9d46a8e3b601c6f (patch) | |
| tree | a88ba6d2a2c8307a1fff94e4d3560fa8c267196a /pkgs/desktops | |
| parent | efea92de19b21e62fd6e416ebcade0ec088941ce (diff) | |
| download | nixlib-8d67b707c7ce7bb2a3720e8ff9d46a8e3b601c6f.tar nixlib-8d67b707c7ce7bb2a3720e8ff9d46a8e3b601c6f.tar.gz nixlib-8d67b707c7ce7bb2a3720e8ff9d46a8e3b601c6f.tar.bz2 nixlib-8d67b707c7ce7bb2a3720e8ff9d46a8e3b601c6f.tar.lz nixlib-8d67b707c7ce7bb2a3720e8ff9d46a8e3b601c6f.tar.xz nixlib-8d67b707c7ce7bb2a3720e8ff9d46a8e3b601c6f.tar.zst nixlib-8d67b707c7ce7bb2a3720e8ff9d46a8e3b601c6f.zip | |
libgit2-glib: Buidl broke with libgit2 + libssh2
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome-3/3.10/default.nix | 4 | ||||
| -rw-r--r-- | 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 e1783be3b7fb..ad23f7a759f1 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 a46f49cbb5a3..f223c8c0a96d 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 { }; |