summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorBart Brouns <bart@magnetophon.nl>2018-10-07 17:35:56 +0200
committerBart Brouns <bart@magnetophon.nl>2018-10-07 17:41:37 +0200
commitc1949a3449740e1ca72d0080714d2f28d7b83cf0 (patch)
treec290e80b973bc1429c14f72a544cb69f34683482 /pkgs
parent123cb978d3e8aba2709e63966df39564b77fa71e (diff)
downloadnixlib-c1949a3449740e1ca72d0080714d2f28d7b83cf0.tar
nixlib-c1949a3449740e1ca72d0080714d2f28d7b83cf0.tar.gz
nixlib-c1949a3449740e1ca72d0080714d2f28d7b83cf0.tar.bz2
nixlib-c1949a3449740e1ca72d0080714d2f28d7b83cf0.tar.lz
nixlib-c1949a3449740e1ca72d0080714d2f28d7b83cf0.tar.xz
nixlib-c1949a3449740e1ca72d0080714d2f28d7b83cf0.tar.zst
nixlib-c1949a3449740e1ca72d0080714d2f28d7b83cf0.zip
libclthreads: 2.4.0 -> 2.4.2
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/libclthreads/default.nix18
1 files changed, 8 insertions, 10 deletions
diff --git a/pkgs/development/libraries/libclthreads/default.nix b/pkgs/development/libraries/libclthreads/default.nix
index 6d37eb19c712..a2f6858a05c9 100644
--- a/pkgs/development/libraries/libclthreads/default.nix
+++ b/pkgs/development/libraries/libclthreads/default.nix
@@ -2,20 +2,17 @@
 
 stdenv.mkDerivation rec {
   name = "libclthreads-${version}";
-  version = "2.4.0";
+  version = "2.4.2";
 
   src = fetchurl {
     url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/clthreads-${version}.tar.bz2";
-    sha256 = "1s8xx99z6llv46cvkllmd72v2pkzbfl5gngcql85mf14mxkdb7x6";
+    sha256 = "0cbs1w89q8wfjrrhvxf6xk0y02nkjl5hd0yb692c8ma01i6b2nf6";
   };
 
   patchPhase = ''
-    # Fix hardcoded paths to executables
-    sed -e "s@/usr/bin/install@install@" -i ./Makefile
-    sed -e "s@/sbin/ldconfig@ldconfig@" -i ./Makefile
-
-    # Remove useless symlink: /lib64 -> /lib
-    sed -e '/ln -sf \$(CLTHREADS_MIN) \$(PREFIX)\/\$(LIBDIR)\/\$(CLTHREADS_SO)/d' -i ./Makefile
+    cd source
+    # don't run ldconfig:
+    sed -e "/ldconfig/d" -i ./Makefile
   '';
 
   makeFlags = [
@@ -24,12 +21,13 @@ stdenv.mkDerivation rec {
   ];
 
   preInstall = ''
-    # The Makefile does not create the include directory
+    # The Makefile does not create the include and lib directories
     mkdir -p $out/include
+    mkdir -p $out/lib
   '';
 
   postInstall = ''
-    ln -s $out/lib/libclthreads.so.${version} $out/lib/libclthreads.so
+    ln $out/lib/libclthreads.so $out/lib/libclthreads.so.2
   '';
 
   meta = with stdenv.lib; {