summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorBart Brouns <bart@magnetophon.nl>2018-10-07 17:36:36 +0200
committerBart Brouns <bart@magnetophon.nl>2018-10-07 17:41:58 +0200
commit9affe6ca47746385cd106a551e3516665663bdfe (patch)
tree0b37c3ebd0a5901bdd2e887671428642b6d89649 /pkgs
parentc1949a3449740e1ca72d0080714d2f28d7b83cf0 (diff)
downloadnixlib-9affe6ca47746385cd106a551e3516665663bdfe.tar
nixlib-9affe6ca47746385cd106a551e3516665663bdfe.tar.gz
nixlib-9affe6ca47746385cd106a551e3516665663bdfe.tar.bz2
nixlib-9affe6ca47746385cd106a551e3516665663bdfe.tar.lz
nixlib-9affe6ca47746385cd106a551e3516665663bdfe.tar.xz
nixlib-9affe6ca47746385cd106a551e3516665663bdfe.tar.zst
nixlib-9affe6ca47746385cd106a551e3516665663bdfe.zip
libclxclient: 3.9.0 -> 3.9.2
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/libclxclient/default.nix16
1 files 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>/"clxclient.h"/' -i ./enumip.cc
   '';
 
   makeFlags = [