diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index db165c62806e..6814348c1d24 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "gettext"; - version = "0.26"; + version = "1.0"; src = fetchurl { url = "mirror://gnu/gettext/${pname}-${version}.tar.gz"; - hash = "sha256-Oaz0sDcemxELYABVYqrOWzYx/tmxu57Mz8f1bli7HX8="; + hash = "sha256-hdmbecmBpASHTALgNCF2z3XHaY4rUf5BAxz2Um2XTxo="; }; patches = [ ./absolute-paths.diff @@ -53,13 +53,13 @@ stdenv.mkDerivation rec { # Fixing this requires replacing all the older copies of the problematic file with a new one. # # This is ugly, but it avoids requiring workarounds in every package using gettext and autoreconfPhase. - declare -a oldFiles=($(tar tf gettext-tools/misc/archive.dir.tar | grep '^gettext-0\.[19].*/extern-inline.m4')) + declare -a oldFiles=($(tar tf gettext-tools/autotools/archive.dir.tar | grep '^gettext-0\.[19].*/extern-inline.m4')) oldFilesDir=$(mktemp -d) for oldFile in "''${oldFiles[@]}"; do mkdir -p "$oldFilesDir/$(dirname "$oldFile")" cp -a gettext-tools/gnulib-m4/extern-inline.m4 "$oldFilesDir/$oldFile" done - tar uf gettext-tools/misc/archive.dir.tar --owner=0 --group=0 --numeric-owner -C "$oldFilesDir" "''${oldFiles[@]}" + tar uf gettext-tools/autotools/archive.dir.tar --owner=0 --group=0 --numeric-owner -C "$oldFilesDir" "''${oldFiles[@]}" substituteAllInPlace gettext-runtime/src/gettext.sh.in substituteInPlace gettext-tools/projects/KDE/trigger --replace "/bin/pwd" pwd