diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2020-07-29 18:20:56 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2020-07-29 18:20:56 -0500 |
| commit | 22f82fc8caa6d65e20324c237940e3a668d312e9 (patch) | |
| tree | 9b1926171b5db01f70ace9449a9567e3ef9409ad /pkgs/applications/gis | |
| parent | e36b1d4ad14cca19a82d586c67a71665a5ed3830 (diff) | |
Revert "Merge pull request #94090 from sikmir/fix-cmake-hook"
This reverts commit e36b1d4ad14cca19a82d586c67a71665a5ed3830, reversing changes made to c2ea7318bef4f50a6d1e07b54a479698ada1e7d4. Should go to staging.
Diffstat (limited to 'pkgs/applications/gis')
| -rw-r--r-- | pkgs/applications/gis/openorienteering-mapper/default.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix index 540fa2718975e..39f8694dd1774 100644 --- a/pkgs/applications/gis/openorienteering-mapper/default.nix +++ b/pkgs/applications/gis/openorienteering-mapper/default.nix @@ -56,6 +56,8 @@ mkDerivation rec { "-DLICENSING_PROVIDER:BOOL=OFF" "-DMapper_MANUAL_QTHELP:BOOL=OFF" ] ++ stdenv.lib.optionals stdenv.isDarwin [ + # Usually enabled on Darwin + "-DCMAKE_FIND_FRAMEWORK=never" # FindGDAL is broken and always finds /Library/Framework unless this is # specified "-DGDAL_INCLUDE_DIR=${gdal}/include" |