b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

unify intltool

Browse source 
IMHO:
	- It's no longer GNOME package.
	- It seems best for everyone to use the newest version.
This commit is contained in:
Vladimír Čunát 2013-01-31 16:43:52 +01:00
parent 539d9bc1af
commit 38ee738b8a
4 changed files with 2 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/desktops/gnome-2/default.nix
View file

@ -29,8 +29,6 @@
libgtkhtml = callPackage ./platform/libgtkhtml { };
intltool = callPackage ./platform/intltool { };
GConf = callPackage ./platform/GConf { };
gconfmm = callPackage ./platform/gconfmm { };

13
pkgs/desktops/gnome-2/platform/intltool/default.nix
View file

@ -1,13 +0,0 @@
{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, gettext}:
stdenv.mkDerivation rec {
name = "intltool-0.40.6";
src = fetchurl {
url = mirror://gnome/sources/intltool/0.40/intltool-0.40.6.tar.bz2;
sha256 = "0r1vkvy5xzqk01yl6a0xlrry39bra24alkrx6279b77hc62my7jd";
};
buildInputs = [ pkgconfig ];
propagatedBuildInputs = [ perl perlXMLParser gettext ];
}

2
pkgs/development/tools/misc/intltool/default.upstream
View file

@ -1,2 +1,2 @@
attribute_name intltool_standalone
attribute_name intltool
url https://launchpad.net/intltool/+download

4
pkgs/top-level/all-packages.nix
View file

@ -4043,8 +4043,7 @@ let
inteltbb = callPackage ../development/libraries/intel-tbb { };
intltool = gnome.intltool;
intltool_standalone = callPackage ../development/tools/misc/intltool {};
intltool = callPackage ../development/tools/misc/intltool { };
irrlicht3843 = callPackage ../development/libraries/irrlicht { };
@ -6772,7 +6771,6 @@ let
compiz = callPackage ../applications/window-managers/compiz {
inherit (gnome) GConf ORBit2;
intltool = intltool_standalone;
};
coriander = callPackage ../applications/video/coriander {