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: 3a63bee15450
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 094f290f35c2
Choose a head ref
  • 4 commits
  • 4 files changed
  • 2 contributors

Commits on Sep 29, 2019

  1. brotli: add staticOnly option

    @matthewbauer @domenkozar
    matthewbauer authored and domenkozar committed Sep 29, 2019

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: F3510FE5691629A1
    Learn about vigilant mode
    Copy the full SHA
    7ebd599 View commit details

  2. boehm-gc: support static + musl

    @matthewbauer @domenkozar
    matthewbauer authored and domenkozar committed Sep 29, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    85210e1 View commit details

  3. busybox: fix musl builds 

    You shouldn’t need to add anything with musl builds. The libc will
configure these values for you.
    @matthewbauer @domenkozar
    matthewbauer authored and domenkozar committed Sep 29, 2019
    Copy the full SHA
    5ba8c04 View commit details

  4. bohem-gc: fix static build

    @domenkozar
    domenkozar committed Sep 29, 2019
    Copy the full SHA
    094f290 View commit details
Showing with 16 additions and 12 deletions.
  1. +3 −5 pkgs/development/libraries/boehm-gc/default.nix
  2. +1 −5 pkgs/os-specific/linux/busybox/default.nix
  3. +8 −2 pkgs/tools/compression/brotli/default.nix
  4. +4 −0 pkgs/top-level/static.nix
8 changes: 3 additions & 5 deletions pkgs/development/libraries/boehm-gc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,20 +15,18 @@ stdenv.mkDerivation rec {
};

outputs = [ "out" "dev" "doc" ];
separateDebugInfo = stdenv.isLinux;
separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl";

preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform.libc == "musl") ''
export NIX_CFLAGS_COMPILE+=" -D_GNU_SOURCE -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR"
'';

patches =
# https://github.com/ivmai/bdwgc/pull/208
patches = # https://github.com/ivmai/bdwgc/pull/208
lib.optional stdenv.hostPlatform.isRiscV ./riscv.patch;

configureFlags =
[ "--enable-cplusplus" "--with-libatomic-ops=none" ]
++ lib.optional enableLargeConfig "--enable-large-config"
++ lib.optional (stdenv.hostPlatform.libc == "musl") "--disable-static";
++ lib.optional enableLargeConfig "--enable-large-config";

doCheck = true; # not cross;

6 changes: 1 addition & 5 deletions pkgs/os-specific/linux/busybox/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, lib, buildPackages, fetchurl
, enableStatic ? false
, enableMinimal ? false
, useMusl ? stdenv.hostPlatform.libc == "musl", musl
, useMusl ? stdenv.hostPlatform.libc == "musl"
, extraConfig ? ""
}:

@@ -88,10 +88,6 @@ stdenv.mkDerivation rec {
runHook postConfigure
'';

postConfigure = lib.optionalString useMusl ''
makeFlagsArray+=("CC=${stdenv.cc.targetPrefix}cc -isystem ${musl.dev}/include -B${musl}/lib -L${musl}/lib")
'';

depsBuildBuild = [ buildPackages.stdenv.cc ];

buildInputs = lib.optionals (enableStatic && !useMusl && stdenv.cc.libc ? static) [ stdenv.cc.libc stdenv.cc.libc.static ];
10 changes: 8 additions & 2 deletions pkgs/tools/compression/brotli/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake }:
{ stdenv, fetchFromGitHub, cmake, fetchpatch, staticOnly ? false }:

# ?TODO: there's also python lib in there

@@ -15,7 +15,13 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [ cmake ];

cmakeFlags = [];
patches = stdenv.lib.optional staticOnly (fetchpatch {
url = "https://github.com/google/brotli/pull/655/commits/7289e5a378ba13801996a84d89d8fe95c3fc4c11.patch";
sha256 = "1bghbdvj24jrvb0sqfdif9vwg7wx6pn8dvl6flkrcjkhpj0gi0jg";
});

cmakeFlags = []
++ stdenv.lib.optional staticOnly "-DBUILD_SHARED_LIBS=OFF";

outputs = [ "out" "dev" "lib" ];

4 changes: 4 additions & 0 deletions pkgs/top-level/static.nix
View file
Original file line number Diff line number Diff line change
@@ -159,6 +159,10 @@ in {
};
};

brotli = super.brotli.override {
staticOnly = true;
};

llvmPackages_8 = super.llvmPackages_8 // {
libraries = super.llvmPackages_8.libraries // rec {
libcxxabi = super.llvmPackages_8.libraries.libcxxabi.override {