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

Commits on Sep 29, 2019

  1. Copy the full SHA
    dfb8a8c View commit details
Showing with 6 additions and 2 deletions.
  1. +6 −2 pkgs/top-level/static.nix
8 changes: 6 additions & 2 deletions pkgs/top-level/static.nix
Original file line number Diff line number Diff line change
@@ -69,6 +69,10 @@ in {
haskellStaticAdapter;
};

nghttp2 = super.nghttp2.override {
enableApp = false;
};

ncurses = super.ncurses.override {
enableStatic = true;
};
@@ -78,14 +82,14 @@ in {
} // optionalAttrs super.stdenv.hostPlatform.isDarwin {
pythonSupport = false;
});
zlib = super.zlib.override {
zlib = (super.zlib.override {
static = true;
shared = false;

# Don’t use new stdenv zlib because
# it doesn’t like the --disable-shared flag
stdenv = super.stdenv;
};
}).static;
xz = super.xz.override {
enableStatic = true;
};