Merge commit 'b53902f535f2c63d71e916b9de22dbcfeec9d99e' into staging

2020-07-29 18:24:08 -05:00
parent 84bb019048 b53902f535
commit 1a3b07cf8e
4 changed files with 3 additions and 5 deletions
@@ -61,7 +61,7 @@ in stdenv.mkDerivation rec {
    # gcc together as compilers and we need clang for the sources generation.
    # However, clang emits tons of warnings about gcc's atomic-base library.
    "-DCMAKE_CXX_FLAGS=-Wno-braced-scalar-init"
-  ] ++ lib.optional stdenv.isDarwin "-DCMAKE_FIND_FRAMEWORK=LAST";
+  ];

  fixupPhase = ''
    wrapProgram $out/bin/oz --set OZEMACS ${emacs}/bin/emacs