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

Merge branch 'master.upstream' into staging.upstream

Browse Source
This commit is contained in:
William A. Kennington III
2015-09-23 14:44:21 -07:00
parent 3c8b92f4b3 5cfe893cc4
commit d3f4ba9d6f
351 changed files with 12549 additions and 1699 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/at-spi2-atk/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, python, pkgconfig, popt, atk, libX11, libICE, xlibs, libXi
{ stdenv, fetchurl, python, pkgconfig, popt, atk, libX11, libICE, xorg, libXi
, intltool, dbus_glib, at_spi2_core, libSM }:
stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "0xgkrnx04vaklbkzc7bzym9s0qhj8aiz4knqlxgx3vxnacsb6vaa";
};
buildInputs = [ python pkgconfig popt atk libX11 libICE xlibs.libXtst libXi
buildInputs = [ python pkgconfig popt atk libX11 libICE xorg.libXtst libXi
intltool dbus_glib at_spi2_core libSM ];
meta = with stdenv.lib; {