nvidia-texture-tools: 1388 -> 2.1.0

1 files changed, 23 insertions, 25 deletions

diff --git a/pkgs/development/libraries/nvidia-texture-tools/default.nix b/pkgs/development/libraries/nvidia-texture-tools/default.nix
index f35d363e575..a010ae9bd1a 100644
--- a/pkgs/development/libraries/nvidia-texture-tools/default.nix
+++ b/pkgs/development/libraries/nvidia-texture-tools/default.nix
@@ -1,43 +1,41 @@
-{ stdenv, fetchsvn, cmake, libpng, ilmbase, libtiff, zlib, libjpeg
-, mesa, libX11
-}:
+{ stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  # No support yet for cg, cuda, glew, glut, openexr.
-
-  name = "nvidia-texture-tools-1388";
-
-  src = fetchsvn {
-    url = "http://nvidia-texture-tools.googlecode.com/svn/trunk";
-    rev = "1388";
-    sha256 = "0pwxqx5l16nqidzm6mwd3rd4gbbknkz6q8cxnvf7sggjpbcvm2d6";
+  name = "nvidia-texture-tools-${version}";
+  version = "2.1.0";
+
+  src = fetchFromGitHub {
+    owner = "castano";
+    repo = "nvidia-texture-tools";
+    rev = version;
+    sha256 = "0p8ja0k323nkgm07z0qlslg6743vimy9rf3wad2968az0vwzjjyx";
   };
 
-  buildInputs = [ cmake libpng ilmbase libtiff zlib libjpeg mesa libX11 ];
+  nativeBuildInputs = [ cmake ];
 
-  hardeningDisable = [ "format" ];
-
-  patchPhase = ''
-    # Fix build due to missing dependnecies.
-    echo 'target_link_libraries(bc7 nvmath)' >> src/nvtt/bc7/CMakeLists.txt
-    echo 'target_link_libraries(bc6h nvmath)' >> src/nvtt/bc6h/CMakeLists.txt
+  outputs = [ "out" "dev" "lib" ];
 
+  postPatch = ''
     # Make a recently added pure virtual function just virtual,
     # to keep compatibility.
     sed -i 's/virtual void endImage() = 0;/virtual void endImage() {}/' src/nvtt/nvtt.h
-
-    # Fix building shared libraries.
-    sed -i 's/SET(NVIMAGE_SHARED TRUE)/SET(NVIMAGE_SHARED TRUE)\nSET(NVTHREAD_SHARED TRUE)/' CMakeLists.txt
   '';
 
   cmakeFlags = [
     "-DNVTT_SHARED=TRUE"
   ];
 
-  meta = {
+  postInstall = ''
+    moveToOutput include "$dev"
+    moveToOutput lib "$lib"
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
     description = "A set of cuda-enabled texture tools and compressors";
-    homepage = "http://developer.nvidia.com/object/texture_tools.html";
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.linux;
+    homepage = "https://github.com/castano/nvidia-texture-tools";
+    license = licenses.mit;
+    platforms = platforms.linux;
   };
 }