public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1777 from lethalman/gitglib

Browse Source 
libgit2-glib: Fix build after gnome3.gnome_common changes
This commit is contained in:
Domen Kožar 2014-02-18 14:36:30 +01:00
commit e2bc091213
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/desktops/gnome-3/default.nix
View File

@ -119,6 +119,6 @@ rec {
gitg = callPackage ./misc/gitg { }; gitg = callPackage ./misc/gitg { };
libgit2-glib = callPackage ./misc/libgit2-glib { automake = pkgs.automake111x; }; libgit2-glib = callPackage ./misc/libgit2-glib { };
} }

6
pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, which, gnome3, autoconf, automake, libtool, pkgconfig { stdenv, fetchurl, gnome3, libtool, pkgconfig
, gtk_doc, gobjectIntrospection, libgit2, glib }: , gtk_doc, gobjectIntrospection, libgit2, glib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
configureScript = "sh ./autogen.sh"; configureScript = "sh ./autogen.sh";
buildInputs = [ which gnome3.gnome_common autoconf automake libtool buildInputs = [ gnome3.gnome_common libtool pkgconfig
pkgconfig gtk_doc gobjectIntrospection libgit2 glib ]; gtk_doc gobjectIntrospection libgit2 glib ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
platforms = platforms.linux; platforms = platforms.linux;