on iko/ghcjs-patch-master help sign in
Use full set of expression flags
commit511db5ff866073764db37c28910b85f4aa577cda authorMoritz Angermann <moritz.angermann@gmail.com> dateFri 20 Apr 2018, 18:44 (9 years ago) parentdd47498
1 file changed+2−2
compat/driver.nix+2−2
compat/driver.nix+2−2
@@ -32,7 +32,7 @@ with rec {
3232 }; in e;
3333};
3434{ mkDerivation, stdenv, flags ? {} }:
35−let expr = expr0 (stdenv.lib.traceVal flags);
35+let expr = expr0 flags;
3636 pname = expr.package.identifier.name;
3737in mkDerivation ({
3838 inherit pname;
@@ -46,7 +46,7 @@ in mkDerivation ({
4646 description = expr.package.synopsis;
4747 license = resolve.license stdenv expr.package.license;
4848
49− configureFlags = pkgs.lib.mapAttrsToList (flag: enabled: (if enabled then "-f" else "-f-") + flag) flags;
49+ configureFlags = pkgs.lib.mapAttrsToList (flag: enabled: (if enabled then "-f" else "-f-") + flag) expr.flags;
5050} // pkgs.lib.optionalAttrs (builtins.hasAttr pname expr.components) {
5151 libraryHaskellDepends = expr.components.${pname}.depends;
5252 libraryPkgconfigDepends = expr.components.${pname}.pkgconfig or [];