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: 3d06bea57a94
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 14c19f7d01a6
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 9, 2019

  1. darwin.system_cmds: fix eval

    Ma27 committed Nov 9, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    Copy the full SHA
    14c19f7 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ appleDerivation {
# NIX_CFLAGS_COMPILE = lib.optionalString hostPlatform.isi686 "-D__i386__"
# + lib.optionalString hostPlatform.isx86_64 "-D__x86_64__"
# + lib.optionalString hostPlatform.isAarch32 "-D__arm__";
env.NIX_CFLAGS_COMPILE = [ "-DDAEMON_UID=1"
env.NIX_CFLAGS_COMPILE = builtins.toString ([ "-DDAEMON_UID=1"
"-DDAEMON_GID=1"
"-DDEFAULT_AT_QUEUE='a'"
"-DDEFAULT_BATCH_QUEUE='b'"
@@ -28,7 +28,7 @@ appleDerivation {
"-DAHZV1=64 "
"-DAU_SESSION_FLAG_HAS_TTY=0x4000"
"-DAU_SESSION_FLAG_HAS_AUTHENTICATED=0x4000"
] ++ lib.optional (!stdenv.isLinux) " -D__FreeBSD__ ";
] ++ lib.optional (!stdenv.isLinux) " -D__FreeBSD__ ");

patchPhase = ''
substituteInPlace login.tproj/login.c \