From a211eef81a02425f236c7b890bb5bcc9a60ae740 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 7 May 2016 10:46:52 +0200
Subject: [PATCH] heimdall: cosmetic

---
 pkgs/tools/misc/heimdall/default.nix | 41 +++++++++++++---------------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/pkgs/tools/misc/heimdall/default.nix b/pkgs/tools/misc/heimdall/default.nix
index 0c16b705a83d..f84ccce4eb99 100644
--- a/pkgs/tools/misc/heimdall/default.nix
+++ b/pkgs/tools/misc/heimdall/default.nix
@@ -1,5 +1,4 @@
-{ stdenv, fetchFromGitHub, zlib, libusb1, cmake, qt5
-, enableGUI ? false }:
+{ stdenv, fetchFromGitHub, zlib, libusb1, cmake, qt5, enableGUI ? false }:
 
 let version = "1.4.1-34-g7ebee1e"; in
 
@@ -18,30 +17,28 @@ stdenv.mkDerivation {
     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;
   };
 }