diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-11-27 13:09:19 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-11-27 13:09:19 +0100 |
| commit | f6fe84d15dfa4de487a75da06ec6d76df03b89be (patch) | |
| tree | ba44eee0c9fb7ba692c21d5ddc46a7c2da5db620 /pkgs/servers/x11 | |
| parent | 0ebb3e3926621377ebf83e2663024dc940ac6aac (diff) | |
| download | nixlib-f6fe84d15dfa4de487a75da06ec6d76df03b89be.tar nixlib-f6fe84d15dfa4de487a75da06ec6d76df03b89be.tar.gz nixlib-f6fe84d15dfa4de487a75da06ec6d76df03b89be.tar.bz2 nixlib-f6fe84d15dfa4de487a75da06ec6d76df03b89be.tar.lz nixlib-f6fe84d15dfa4de487a75da06ec6d76df03b89be.tar.xz nixlib-f6fe84d15dfa4de487a75da06ec6d76df03b89be.tar.zst nixlib-f6fe84d15dfa4de487a75da06ec6d76df03b89be.zip | |
xorg.bdftopcf: 1.0.5 -> 1.1
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/tarballs-7.7.list | 2 |
3 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 9b7817034496..92122734b9d0 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -44,16 +44,16 @@ let }) // {inherit libX11 xproto libXt ;}; bdftopcf = (mkDerivation "bdftopcf" { - name = "bdftopcf-1.0.5"; + name = "bdftopcf-1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/bdftopcf-1.0.5.tar.bz2; - sha256 = "09i03sk878cmx2i40lkpsysn7zqcvlczb30j7x3lryb11jz4gx1q"; + url = mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2; + sha256 = "18hiscgljrz10zjcws25bis32nyrg3hzgmiq6scrh7izqmgz0kab"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libXfont ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libXfont ;}; + }) // {inherit ;}; bigreqsproto = (mkDerivation "bigreqsproto" { name = "bigreqsproto-1.1.2"; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 87dfeb3cfa7f..9da824c8910b 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -24,6 +24,10 @@ let compose = f: g: x: f (g x); in { + bdftopcf = attrs: attrs // { + buildInputs = attrs.buildInputs ++ [ xorg.xproto xorg.fontsproto ]; + }; + encodings = attrs: attrs // { buildInputs = attrs.buildInputs ++ [ xorg.mkfontscale ]; }; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 55f954d914b2..166696ce5eb7 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -1,5 +1,5 @@ mirror://xorg/X11R7.7/src/everything/applewmproto-1.4.2.tar.bz2 -mirror://xorg/individual/app/bdftopcf-1.0.5.tar.bz2 +mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/bigreqsproto-1.1.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/compositeproto-0.4.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/damageproto-1.2.1.tar.bz2 |