From 2906376ddc99d9d36199a9eaf3ee6892fb83b154 Mon Sep 17 00:00:00 2001
From: codyopel <codyopel@gmail.com>
Date: Thu, 28 May 2015 00:26:17 -0400
Subject: libclxclient: reacfor & fix include directory

---
 .../development/libraries/libclxclient/default.nix | 41 ++++++++++++----------
 1 file changed, 22 insertions(+), 19 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/libclxclient/default.nix b/pkgs/development/libraries/libclxclient/default.nix
index 7d0e4596dd0..4dc103515ac 100644
--- a/pkgs/development/libraries/libclxclient/default.nix
+++ b/pkgs/development/libraries/libclxclient/default.nix
@@ -1,38 +1,41 @@
-{ stdenv, fetchurl, libclthreads, libXft, libX11, xlibs }:
+{ stdenv, fetchurl, libclthreads, libX11, libXft, xlibs }:
 
 stdenv.mkDerivation rec {
   name = "libclxclient-${version}";
   version = "3.9.0";
+
   src = fetchurl {
     url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/clxclient-${version}.tar.bz2";
     sha256 = "14l7xrh964gllymraq4n5pgax94p5jsfjslqi5c6637zc4lmgnl0";
   };
 
-  buildInputs = [
-    libclthreads libXft libX11 xlibs.xproto
-  ];
+  buildInputs = [ libclthreads libX11 libXft xlibs.xproto ];
 
-  configurePhase = ''
-    cpp -v
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${xlibs.xproto}/include"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libXft}/include"
-    echo $NIX_CFLAGS_COMPILE
-    sed -e "s@/usr/local@$out@" -i Makefile
-    sed -e "s@#include <clthreads.h>@#include <${libclthreads}/include>@" -i clxclient.h
+  NIX_CFLAGS_COMPILE = "-I${xlibs.xproto}/include -I${libXft}/include";
+
+  patchPhase = ''
     sed -e "s@ldconfig@@" -i Makefile
-    sed -e "s@SUFFIX :=.*@SUFFIX =@" -i Makefile
   '';
 
-  fixupPhase = ''
+  makeFlags = [
+    "PREFIX=$(out)"
+    "SUFFIX=''"
+  ];
+
+  preInstall = ''
+    # The Makefile does not create the include directory
+    mkdir -p $out/include
+  '';
+
+  postInstall = ''
     ln $out/lib/libclxclient.so $out/lib/libclxclient.so.3
   '';
 
-  meta = {
-    description = "zita X11 library";
-    version = "${version}";
+  meta = with stdenv.lib; {
+    description = "Zita X11 library";
     homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html";
-    license = stdenv.lib.licenses.lgpl21;
-    maintainers = [ stdenv.lib.maintainers.magnetophon ];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ magnetophon ];
+    platforms = platforms.linux;
   };
 }
-- 
cgit 1.4.1