diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-06 10:38:20 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-06 10:38:20 +0100 |
| commit | 17ab5f9d88b3b4e8442421bc4bf4eb1e913bcc6a (patch) | |
| tree | f140d6d2cd9ecd708dc82303f3f5b279d0a368b4 /pkgs/tools/misc | |
| parent | 828f93a32665c9c72f7bf441878a91a11213fdf3 (diff) | |
| parent | 30121dffd40d50c6d4234cdeb9e3b057f848b2b6 (diff) | |
| download | nixpkgs-17ab5f9d88b3b4e8442421bc4bf4eb1e913bcc6a.tar nixpkgs-17ab5f9d88b3b4e8442421bc4bf4eb1e913bcc6a.tar.gz nixpkgs-17ab5f9d88b3b4e8442421bc4bf4eb1e913bcc6a.tar.bz2 nixpkgs-17ab5f9d88b3b4e8442421bc4bf4eb1e913bcc6a.tar.lz nixpkgs-17ab5f9d88b3b4e8442421bc4bf4eb1e913bcc6a.tar.xz nixpkgs-17ab5f9d88b3b4e8442421bc4bf4eb1e913bcc6a.tar.zst nixpkgs-17ab5f9d88b3b4e8442421bc4bf4eb1e913bcc6a.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/heimdall/default.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/tools/misc/heimdall/default.nix b/pkgs/tools/misc/heimdall/default.nix index a8100e455f0..26396fee507 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 = '' |