public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14068 from zimbatm/xdg-utils-1.1.1

Browse Source 
Xdg utils 1.1.1
This commit is contained in:
zimbatm 2016-03-22 23:34:04 +00:00
commit a37f634866
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/tools/X11/xdg-utils/default.nix
View File

@ -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 , w3m, which, gnugrep, gnused, coreutils
, mimiSupport ? false, gawk ? null }: , mimiSupport ? false, gawk ? null }:
@ -15,12 +16,12 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "xdg-utils-1.1.0-rc3p46"; name = "xdg-utils-${version}";
version = "1.1.1";
src = fetchzip { src = fetchurl {
name = "${name}.tar.gz"; url = "https://portland.freedesktop.org/download/${name}.tar.gz";
url = "http://cgit.freedesktop.org/xdg/xdg-utils/snapshot/03577f987730.tar.gz"; sha256 = "09a1pk3ifsndc5qz2kcd1557i137gpgnv3d739pv22vfayi67pdh";
sha256 = "1fs0kxalmpqv6x0rv4xg65w8r26sk464xisrbwp4p6a033y5x34l";
}; };
# just needed when built from git # just needed when built from git
@ -38,6 +39,12 @@ stdenv.mkDerivation rec {
sed "s# $(basename "$tool") # $tool #g" -i "$out"/bin/* sed "s# $(basename "$tool") # $tool #g" -i "$out"/bin/*
done 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/* sed 's# which # type -P #g' -i "$out"/bin/*
''; '';