diff --git a/pkgs/development/libraries/fontconfig-ultimate/confd.nix b/pkgs/development/libraries/fontconfig-ultimate/confd.nix index e522cead822..160fef5f07e 100644 --- a/pkgs/development/libraries/fontconfig-ultimate/confd.nix +++ b/pkgs/development/libraries/fontconfig-ultimate/confd.nix @@ -1,13 +1,18 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub }: +let version = "2015-12-06"; in stdenv.mkDerivation { - name = "fontconfig-ultimate-20141123"; - src = fetchurl { - url = "https://github.com/bohoomil/fontconfig-ultimate/archive/2014-11-23.tar.gz"; - sha256 = "0czfm3hxc41x5mscwrba7p1vhm2w62j1qg7z8kfdrf21z8fvgznw"; + name = "fontconfig-ultimate-${version}"; + + src = fetchFromGitHub { + sha256 = "02a811szxkq4q088nxfpdzp6rv0brvgkdhwigk09qffygxd776g6"; + rev = version; + repo = "fontconfig-ultimate"; + owner = "bohoomil"; }; phases = "$prePhases unpackPhase installPhase $postPhases"; + installPhase = '' mkdir -p $out/etc/fonts/conf.d cp conf.d.infinality/*.conf $out/etc/fonts/conf.d @@ -22,8 +27,8 @@ stdenv.mkDerivation { rm $out/etc/fonts/conf.d/83-*.conf # Inclusion of local and user configs handled by global configuration - rm $out/etc/fonts/conf.d/97-local.conf - rm $out/etc/fonts/conf.d/98-user.conf + rm $out/etc/fonts/conf.d/29-local.conf + rm $out/etc/fonts/conf.d/28-user.conf cp fontconfig_patches/fonts-settings/*.conf $out/etc/fonts/conf.d