summary refs log tree commit diff
path: root/pkgs/tools/misc/heimdall/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/tools/misc/heimdall/default.nix')
-rw-r--r--pkgs/tools/misc/heimdall/default.nix52
1 files changed, 24 insertions, 28 deletions
diff --git a/pkgs/tools/misc/heimdall/default.nix b/pkgs/tools/misc/heimdall/default.nix
index e82f61e69f5b..f84ccce4eb99 100644
--- a/pkgs/tools/misc/heimdall/default.nix
+++ b/pkgs/tools/misc/heimdall/default.nix
@@ -1,17 +1,15 @@
-{ stdenv, fetchFromGitHub, zlib, libusb1, cmake, qt5
-, enableGUI ? false }:
+{ stdenv, fetchFromGitHub, zlib, libusb1, cmake, qt5, enableGUI ? false }:
 
-let version = "d0526a3"; in
-let verName = "1.4.2pre"; in
+let version = "1.4.1-34-g7ebee1e"; in
 
-stdenv.mkDerivation rec {
-  name = "heimdall-${verName}";
+stdenv.mkDerivation {
+  name = "heimdall-${version}";
 
   src = fetchFromGitHub {
     owner  = "Benjamin-Dobell";
     repo   = "Heimdall";
-    rev    = "${version}";
-    sha256 = "1y8gvqprajlml1z6mjcrlj54m9xsr8691nqagakkkis7hs1lgzmp";
+    rev    = "v${version}";
+    sha256 = "10c71k251wxd05j6c76qlar5sd73zam1c1g2cq3cscqayd7rzafg";
   };
 
   buildInputs = [ zlib libusb1 cmake ];
@@ -19,30 +17,28 @@ stdenv.mkDerivation rec {
     sed -i '/heimdall-frontend/d' CMakeLists.txt
   '';
   enableParallelBuilding = true;
-  cmakeFlags = ["-DQt5Widgets_DIR=${qt5.qtbase}/lib/cmake/Qt5Widgets"
-                "-DQt5Gui_DIR=${qt5.qtbase}/lib/cmake/Qt5Gui"
-                "-DQt5Core_DIR=${qt5.qtbase}/lib/cmake/Qt5Core"
-                "-DBUILD_TYPE=Release"];
+  cmakeFlags = [
+    "-DQt5Widgets_DIR=${qt5.qtbase}/lib/cmake/Qt5Widgets"
+    "-DQt5Gui_DIR=${qt5.qtbase}/lib/cmake/Qt5Gui"
+    "-DQt5Core_DIR=${qt5.qtbase}/lib/cmake/Qt5Core"
+    "-DBUILD_TYPE=Release"
+  ];
 
-  preConfigure =
-    ''
-      # Give ownership of the Galaxy S USB device to the logged in user.
-      substituteInPlace heimdall/60-heimdall.rules --replace 'MODE="0666"' 'TAG+="uaccess"'
-    '';
+  preConfigure = ''
+    # Give ownership of the Galaxy S USB device to the logged in user.
+    substituteInPlace heimdall/60-heimdall.rules --replace 'MODE="0666"' 'TAG+="uaccess"'
+  '';
 
-  installPhase =
-    ''
-      mkdir -p $out/bin $out/share/doc/heimdall $out/lib/udev/rules.d
-      cp bin/heimdall $out/bin
-      cp ../Linux/README $out/share/doc/heimdall
-      cp ../heimdall/60-heimdall.rules $out/lib/udev/rules.d
-    '' + stdenv.lib.optionalString enableGUI ''
-      cp bin/heimdall-frontend $out/bin
-    '';
+  installPhase = ''
+    mkdir -p $out/bin $out/share/doc/heimdall $out/lib/udev/rules.d
+    cp "bin/"* $out/bin/
+    cp ../Linux/README $out/share/doc/heimdall
+    cp ../heimdall/60-heimdall.rules $out/lib/udev/rules.d
+  '';
 
   meta = {
-    homepage = http://www.glassechidna.com.au/products/heimdall/;
-    description = "A cross-platform open-source tool suite used to flash firmware onto Samsung Galaxy S devices";
+    homepage = "http://www.glassechidna.com.au/products/heimdall/";
+    description = "A cross-platform tool suite to flash firmware onto Samsung Galaxy S devices";
     license = stdenv.lib.licenses.mit;
   };
 }