diff options
| author | Robin Gloster <mail@glob.in> | 2016-03-28 15:16:29 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-03-28 15:16:29 +0000 |
| commit | f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3 (patch) | |
| tree | 0f17999d3a5444f16f09e0c1d7f3075e0224e731 /pkgs/tools/X11 | |
| parent | 3f45f0948d6fe158bed063adb66850ded0ba4861 (diff) | |
| parent | c61445357e2a92470bee43a71a10baef1a3196e4 (diff) | |
| download | nixlib-f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3.tar nixlib-f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3.tar.gz nixlib-f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3.tar.bz2 nixlib-f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3.tar.lz nixlib-f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3.tar.xz nixlib-f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3.tar.zst nixlib-f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/tools/X11')
| -rw-r--r-- | pkgs/tools/X11/xdg-utils/default.nix | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index 6f1335593621..e7233d0f7145 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchzip, fetchFromGitHub, file, libxslt, docbook_xml_dtd_412, docbook_xsl, xmlto +{ stdenv, fetchurl, fetchFromGitHub +, file, libxslt, docbook_xml_dtd_412, docbook_xsl, xmlto , w3m, which, gnugrep, gnused, coreutils , mimiSupport ? false, gawk ? null }: @@ -15,12 +16,12 @@ let in stdenv.mkDerivation rec { - name = "xdg-utils-1.1.0-rc3p46"; + name = "xdg-utils-${version}"; + version = "1.1.1"; - src = fetchzip { - name = "${name}.tar.gz"; - url = "http://cgit.freedesktop.org/xdg/xdg-utils/snapshot/03577f987730.tar.gz"; - sha256 = "1fs0kxalmpqv6x0rv4xg65w8r26sk464xisrbwp4p6a033y5x34l"; + src = fetchurl { + url = "https://portland.freedesktop.org/download/${name}.tar.gz"; + sha256 = "09a1pk3ifsndc5qz2kcd1557i137gpgnv3d739pv22vfayi67pdh"; }; # just needed when built from git @@ -38,6 +39,12 @@ stdenv.mkDerivation rec { sed "s# $(basename "$tool") # $tool #g" -i "$out"/bin/* done + substituteInPlace $out/bin/xdg-open \ + --replace "/usr/bin/printf" "${coreutils}/bin/printf" + + substituteInPlace $out/bin/xdg-mime \ + --replace "/usr/bin/file" "${file}/bin/file" + sed 's# which # type -P #g' -i "$out"/bin/* ''; |