diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-01-31 16:43:52 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-01-31 16:43:52 +0100 |
| commit | 38ee738b8a39950bc4b2429daee0deb93134a0be (patch) | |
| tree | e9397a14cd2b35c71e3b3cdbc2084f43d3a6d7ae | |
| parent | 539d9bc1aff34dcaa74eb52034c9420bf866fcc6 (diff) | |
| download | nixpkgs-38ee738b8a39950bc4b2429daee0deb93134a0be.tar nixpkgs-38ee738b8a39950bc4b2429daee0deb93134a0be.tar.gz nixpkgs-38ee738b8a39950bc4b2429daee0deb93134a0be.tar.bz2 nixpkgs-38ee738b8a39950bc4b2429daee0deb93134a0be.tar.lz nixpkgs-38ee738b8a39950bc4b2429daee0deb93134a0be.tar.xz nixpkgs-38ee738b8a39950bc4b2429daee0deb93134a0be.tar.zst nixpkgs-38ee738b8a39950bc4b2429daee0deb93134a0be.zip | |
unify intltool
IMHO: - It's no longer GNOME package. - It seems best for everyone to use the newest version.
| -rw-r--r-- | pkgs/desktops/gnome-2/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-2/platform/intltool/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/intltool/default.upstream | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
4 files changed, 2 insertions, 19 deletions
diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 38ae4c01534..3d76ba72dae 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -29,8 +29,6 @@ libgtkhtml = callPackage ./platform/libgtkhtml { }; - intltool = callPackage ./platform/intltool { }; - GConf = callPackage ./platform/GConf { }; gconfmm = callPackage ./platform/gconfmm { }; diff --git a/pkgs/desktops/gnome-2/platform/intltool/default.nix b/pkgs/desktops/gnome-2/platform/intltool/default.nix deleted file mode 100644 index 51eaa4a2cf4..00000000000 --- a/pkgs/desktops/gnome-2/platform/intltool/default.nix +++ /dev/null @@ -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 ]; -} diff --git a/pkgs/development/tools/misc/intltool/default.upstream b/pkgs/development/tools/misc/intltool/default.upstream index 4a2965b036a..323bf21f45a 100644 --- a/pkgs/development/tools/misc/intltool/default.upstream +++ b/pkgs/development/tools/misc/intltool/default.upstream @@ -1,2 +1,2 @@ -attribute_name intltool_standalone +attribute_name intltool url https://launchpad.net/intltool/+download diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eec9d9e1789..499a8bf5c0b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { |