diff options
Diffstat (limited to 'pkgs/development/libraries/xft')
-rw-r--r--[-rwxr-xr-x] | pkgs/development/libraries/xft/builder.sh | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/xft/default.nix | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/pkgs/development/libraries/xft/builder.sh b/pkgs/development/libraries/xft/builder.sh index 085974877deb3..4ed7d6e918a58 100755..100644 --- a/pkgs/development/libraries/xft/builder.sh +++ b/pkgs/development/libraries/xft/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh -e - set -x buildinputs="$pkgconfig $fontconfig $x11" diff --git a/pkgs/development/libraries/xft/default.nix b/pkgs/development/libraries/xft/default.nix index ea1cef2cfe6d6..69aef8a76059d 100644 --- a/pkgs/development/libraries/xft/default.nix +++ b/pkgs/development/libraries/xft/default.nix @@ -3,15 +3,13 @@ assert pkgconfig != null && x11 != null && fontconfig != null; assert fontconfig.x11 == x11; -derivation { +stdenv.mkDerivation { name = "xft-2.1.2"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = http://pdx.freedesktop.org/software/fontconfig/releases/xft-2.1.2.tar.gz; md5 = "defb7e801d4938b8b15a426ae57e2f3f"; }; - stdenv = stdenv; pkgconfig = pkgconfig; x11 = x11; fontconfig = fontconfig; |