Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e6d62eb73e0e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7ee6c6ad6d23
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 4, 2020

  1. heimdall: fix build on darwin

    @marsam
    marsam committed Jan 4, 2020
    Copy the full SHA
    a18e65f View commit details

Commits on Jan 5, 2020

  1. Merge pull request #76948 from marsam/fix-heimdall-darwin 

    heimdall: fix build on darwin
    @markuskowa
    markuskowa authored Jan 5, 2020
    Copy the full SHA
    7ee6c6a View commit details
Showing with 3 additions and 0 deletions.
  1. +3 −0 pkgs/tools/misc/heimdall/default.nix
3 changes: 3 additions & 0 deletions pkgs/tools/misc/heimdall/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 = ''