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

Commits on Nov 2, 2019

  1. Tweak cross-compilation of some netbsd stuff 

    This makes, at least, the following packages compile with musl:

* netbsd.compat
* netbsd.getent
* netbsd.fts
    @kirelagin
    kirelagin committed Nov 2, 2019
    Copy the full SHA
    60944c7 View commit details

Commits on Nov 3, 2019

  1. fixup! Tweak cross-compilation of some netbsd stuff

    @kirelagin
    kirelagin committed Nov 3, 2019
    Copy the full SHA
    8e912bc View commit details

  2. Merge pull request #72639 from kirelagin/netbsd-musl 

    Tweak cross-compilation of some netbsd stuff
    @Ericson2314
    Ericson2314 authored Nov 3, 2019
    Copy the full SHA
    b2372b8 View commit details
Showing with 7 additions and 2 deletions.
  1. +7 −2 pkgs/os-specific/bsd/netbsd/default.nix
9 changes: 7 additions & 2 deletions pkgs/os-specific/bsd/netbsd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -127,6 +127,11 @@ let
nativeBuildInputs = [ makeMinimal ];
buildInputs = [ zlib ];

# the build system re-runs `./configure` with `HOST_CC` (which is their
# name for Build CC) as a compiler to make `defs.mk`, which is installed
depsBuildBuild = [ buildPackages.stdenv.cc ] ++ buildInputs;
HOST_CC = "${buildPackages.stdenv.cc.targetPrefix}cc";

# temporarily use gnuinstall for bootstrapping
# bsdinstall will be built later
makeFlags = [
@@ -218,9 +223,9 @@ let
];
skipIncludesPhase = true;
buildPhase = ''
cc -c -Iinclude -Ilib/libc/include lib/libc/gen/fts.c \
"$CC" -c -Iinclude -Ilib/libc/include lib/libc/gen/fts.c \
-o lib/libc/gen/fts.o
ar -rsc libfts.a lib/libc/gen/fts.o
"$AR" -rsc libfts.a lib/libc/gen/fts.o
'';
installPhase = ''
runHook preInstall