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
base: d84bd7493920
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 1fb6bb97910a
Choose a head ref
  • 4 commits
  • 1 file changed
  • 1 contributor

Commits on Dec 6, 2020

  1. top-level/static.nix: Don’t add -static LDFLAGS in darwin 

    We can’t do fully static here, like "static" flag in libev does. I’m
not 100% sure if this is necessary for Linux (makeStaticBinaries
should set -static flag automatically), but leaving as is to avoid
breaking anything.
    @matthewbauer
    matthewbauer committed Dec 6, 2020
    Copy the full SHA
    924c4eb View commit details
    Browse the repository at this point in the history

  2. top-level/static.nix: also enable static for nixUnstable

    @matthewbauer
    matthewbauer committed Dec 6, 2020
    Copy the full SHA
    399ac47 View commit details
    Browse the repository at this point in the history

  3. top-level/static.nix: put makeStaticDarwin first in staticAdapters 

    This needs to go first since the .override will reset the mkDerivation
function, removing any other customisations done afterwards. Kind of
hacky, but seems to work correctly right now.
    @matthewbauer
    matthewbauer committed Dec 6, 2020
    Copy the full SHA
    805c9d4 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2020

  1. Merge pull request #106115 from matthewbauer/static-nix-darwin 

    Improve static Nix Darwin support
    @matthewbauer
    matthewbauer committed Dec 8, 2020
    Copy the full SHA
    1fb6bb9 View commit details
    Browse the repository at this point in the history