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

Merge pull request #293 from vcunat/vlada/intltool

Browse source 
unify intltool
This commit is contained in:
Vladimír Čunát 2013-02-14 12:29:29 -08:00
parent 364a853c99 efd432e862
commit f536aa7e7a
5 changed files with 8 additions and 22 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 ];
}

9
pkgs/development/tools/misc/intltool/default.nix
View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, perl, perlXMLParser}:
{ stdenv, fetchurl, perl, perlXMLParser, gettext }:
let
s = # Generated upstream information
rec {
@ -12,12 +12,15 @@ let
propagatedBuildInputs = [perl perlXMLParser];
buildInputs = [];
in
stdenv.mkDerivation rec {
stdenv.mkDerivation {
inherit (s) name version;
src = fetchurl {
inherit (s) url sha256;
};
inherit propagatedBuildInputs buildInputs;
inherit buildInputs;
# not needed by intltool itself but (probably) needed for its usage
propagatedBuildInputs = propagatedBuildInputs ++ [ gettext ];
meta = {
description = "Translation helper tool";

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

@ -4049,8 +4049,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 { };
@ -6766,7 +6765,6 @@ let
compiz = callPackage ../applications/window-managers/compiz {
inherit (gnome) GConf ORBit2;
intltool = intltool_standalone;
};
coriander = callPackage ../applications/video/coriander {