diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-12-14 13:37:17 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-12-14 13:37:17 +0000 |
| commit | adcb6d6a134c8adfcc3d6e0cd772a281355e903a (patch) | |
| tree | f3a69ed62164fa924d06ae3300e8beeb5e34534a /pkgs/development/libraries/gettext | |
| parent | bad4ed8717a2ae8c0ab8a91ef9d4cd584be520ed (diff) | |
| download | nixpkgs-adcb6d6a134c8adfcc3d6e0cd772a281355e903a.tar nixpkgs-adcb6d6a134c8adfcc3d6e0cd772a281355e903a.tar.gz nixpkgs-adcb6d6a134c8adfcc3d6e0cd772a281355e903a.tar.bz2 nixpkgs-adcb6d6a134c8adfcc3d6e0cd772a281355e903a.tar.lz nixpkgs-adcb6d6a134c8adfcc3d6e0cd772a281355e903a.tar.xz nixpkgs-adcb6d6a134c8adfcc3d6e0cd772a281355e903a.tar.zst nixpkgs-adcb6d6a134c8adfcc3d6e0cd772a281355e903a.zip | |
* Cleanup.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30887
Diffstat (limited to 'pkgs/development/libraries/gettext')
| -rw-r--r-- | pkgs/development/libraries/gettext/0.17.nix | 14 | ||||
| -rw-r--r-- | pkgs/development/libraries/gettext/default.nix | 16 |
2 files changed, 9 insertions, 21 deletions
diff --git a/pkgs/development/libraries/gettext/0.17.nix b/pkgs/development/libraries/gettext/0.17.nix index 6b094fdc839..bee2042f116 100644 --- a/pkgs/development/libraries/gettext/0.17.nix +++ b/pkgs/development/libraries/gettext/0.17.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, libiconv }: -stdenv.mkDerivation (rec { +stdenv.mkDerivation rec { name = "gettext-0.17"; src = fetchurl { @@ -21,6 +21,8 @@ stdenv.mkDerivation (rec { fi ''; + buildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv; + meta = { description = "GNU gettext, a well integrated set of translation tools and documentation"; @@ -47,12 +49,4 @@ stdenv.mkDerivation (rec { maintainers = [ stdenv.lib.maintainers.ludo ]; }; -} - -// - -(if (!stdenv.isLinux) # any non-GNU system - then { - buildInputs = [ libiconv ]; - } - else {})) +} \ No newline at end of file diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index ddcfc327a9e..f7b31139b56 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -1,8 +1,6 @@ -# XXX: Remove me when `stdenv-updates' is merged. - { stdenv, fetchurl, libiconv }: -stdenv.mkDerivation (rec { +stdenv.mkDerivation rec { name = "gettext-0.18.1.1"; src = fetchurl { @@ -23,6 +21,10 @@ stdenv.mkDerivation (rec { fi ''; + buildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv; + + enableParallelBuilding = true; + crossAttrs = { buildInputs = stdenv.lib.optional (stdenv.gccCross.libc ? libiconv) stdenv.gccCross.libc.libiconv.hostDrv; @@ -58,11 +60,3 @@ stdenv.mkDerivation (rec { platforms = stdenv.lib.platforms.all; }; } - -// - -(if (!stdenv.isLinux) # any non-GNU system - then { - buildInputs = [ libiconv ]; - } - else {})) |