From 9affe6ca47746385cd106a551e3516665663bdfe Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sun, 7 Oct 2018 17:36:36 +0200 Subject: [PATCH] libclxclient: 3.9.0 -> 3.9.2 --- .../libraries/libclxclient/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libclxclient/default.nix b/pkgs/development/libraries/libclxclient/default.nix index ce67a8efa80e..6e6ca647fc0f 100644 --- a/pkgs/development/libraries/libclxclient/default.nix +++ b/pkgs/development/libraries/libclxclient/default.nix @@ -1,20 +1,28 @@ -{ stdenv, fetchurl, libclthreads, libX11, libXft, xorg }: +{ stdenv, fetchurl, libclthreads, libX11, libXft, xorg, pkgconfig }: stdenv.mkDerivation rec { name = "libclxclient-${version}"; - version = "3.9.0"; + version = "3.9.2"; src = fetchurl { url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/clxclient-${version}.tar.bz2"; - sha256 = "14l7xrh964gllymraq4n5pgax94p5jsfjslqi5c6637zc4lmgnl0"; + sha256 = "10bq6fy8d3pr1x2x3xx9qhf2hdxrwdgvg843a2y6lx70y1jfj0c5"; }; buildInputs = [ libclthreads libX11 libXft xorg.xproto ]; + nativeBuildInputs = [ pkgconfig ]; + NIX_CFLAGS_COMPILE = "-I${xorg.xproto}/include -I${libXft.dev}/include"; patchPhase = '' - sed -e "s@ldconfig@@" -i Makefile + cd source + # use pkg-config instead of pkgcon: + sed -e 's/pkgconf/pkg-config/g' -i ./Makefile + # don't run ldconfig: + sed -e "/ldconfig/d" -i ./Makefile + # make sure it can find clxclient.h: + sed -e 's//"clxclient.h"/' -i ./enumip.cc ''; makeFlags = [