diff --git a/configuration.nix b/configuration.nix index e03c8a2fb983ec5edf81108eb7e52f024f1009db..d0857a79de0e9f3219172ba46cc7e81ebe35d5a8 100644 --- a/configuration.nix +++ b/configuration.nix @@ -16,5 +16,7 @@ final: prev: { text-icu = prev.callPackage ./pkgs/text-icu.nix { icu-i18n = pkgs.icu; }; + X11-xft = addPkgconfigDepends prev.X11-xft [ pkgs.expat pkgs.xorg.libXau pkgs.xorg.libXdmcp ]; + zlib = prev.callPackage ./pkgs/zlib.nix { inherit (pkgs) zlib; }; } diff --git a/horizon.dhall b/horizon.dhall index 43c538fba399ccf08d7303693ee75cd4f4527ac3..4a723fd2d5b0ad4f2381f3d2d2cd95bdcb63554c 100644 --- a/horizon.dhall +++ b/horizon.dhall @@ -58,6 +58,7 @@ in H.HorizonExport.MakePackageSet , H.callHackage "QuickCheck" "2.14.2" , H.callHackage "SHA" "1.6.4.4" , H.callHackage "StateVar" "1.2.2" + , H.callHackage "X11-xft" "0.3.4" , H.callHackage "X11" "1.10.3" , H.callHackage "abstract-deque" "0.3" , H.callHackage "abstract-par" "0.3.3" diff --git a/initial-packages.nix b/initial-packages.nix index 1c71b24694bbbbff05ac3f1ca92234a06a521d4d..55ca7261ffa0e37b608b3d9a51e1b86fb0b339bf 100644 --- a/initial-packages.nix +++ b/initial-packages.nix @@ -51,6 +51,8 @@ self: with pkgs.haskell.lib; { X11 = self.callPackage (./pkgs/X11.nix) { }; + X11-xft = self.callPackage (./pkgs/X11-xft.nix) { }; + abstract-deque = self.callPackage (./pkgs/abstract-deque.nix) { }; abstract-par = self.callPackage (./pkgs/abstract-par.nix) { }; diff --git a/pkgs/X11-xft.nix b/pkgs/X11-xft.nix new file mode 100644 index 0000000000000000000000000000000000000000..584196b3314853f40526545485ab0da3bcdd7cde --- /dev/null +++ b/pkgs/X11-xft.nix @@ -0,0 +1,21 @@ +{ mkDerivation, X11, base, lib, libXft, utf8-string }: +mkDerivation { + pname = "X11-xft"; + version = "0.3.4"; + sha256 = "6200d2deabe9638bad4d1fed4399e3147254c2776a0fae71bf38ca423242a916"; + isLibrary = true; + isExecutable = false; + enableSeparateDataOutput = false; + libraryHaskellDepends = [ base utf8-string X11 ]; + libraryPkgconfigDepends = [ libXft ]; + enableLibraryProfiling = true; + enableExecutableProfiling = true; + doHaddock = false; + jailbreak = true; + doCheck = false; + doBenchmark = false; + hyperlinkSource = false; + description = "Bindings to the Xft and some Xrender parts"; + license = lib.licenses.bsd3; + broken = false; +}