about summary refs log tree commit diff
diff options
context:
space:
mode:
authormarkuskowa <markus.kowalewski@gmail.com>2020-01-05 16:23:07 +0100
committerGitHub <noreply@github.com>2020-01-05 16:23:07 +0100
commit7ee6c6ad6d23c056953a59f1d8932db6ebc998e9 (patch)
tree826c928ddd3ed74de20311dbf93b20288a0dc2bf
parente6d62eb73e0ebe165b91dbe653283318ceb28124 (diff)
parenta18e65f6a8ee1e1c90720632e69e004bc63f9565 (diff)
Merge pull request #76948 from marsam/fix-heimdall-darwin
heimdall: fix build on darwin
-rw-r--r--pkgs/tools/misc/heimdall/default.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/tools/misc/heimdall/default.nix b/pkgs/tools/misc/heimdall/default.nix
index a8100e455f0b8..26396fee507e7 100644
--- a/pkgs/tools/misc/heimdall/default.nix
+++ b/pkgs/tools/misc/heimdall/default.nix
@@ -21,11 +21,14 @@ mkDerivation {
 
   cmakeFlags = [
     "-DDISABLE_FRONTEND=${if enableGUI then "OFF" else "ON"}"
+    "-DLIBUSB_LIBRARY=${libusb1}"
   ];
 
   preConfigure = ''
     # Give ownership of the Galaxy S USB device to the logged in user.
     substituteInPlace heimdall/60-heimdall.rules --replace 'MODE="0666"' 'TAG+="uaccess"'
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    substituteInPlace libpit/CMakeLists.txt --replace "-std=gnu++11" ""
   '';
 
   installPhase = ''