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

Commits on Nov 29, 2018

  1. pkgs/stdenv/generic/make-derivation.nix: s/targetPlatform/hostPlatform/

    @vaibhavsagar
    vaibhavsagar committed Nov 29, 2018
    Copy the full SHA
    b5504e2 View commit details

Commits on Nov 30, 2018

  1. Merge pull request #51255 from vaibhavsagar/fix-musl 

    pkgs/stdenv/generic/make-derivation.nix: s/targetPlatform/hostPlatform/
    @matthewbauer
    matthewbauer authored Nov 30, 2018

    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
    1cd300e View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/stdenv/generic/make-derivation.nix
2 changes: 1 addition & 1 deletion pkgs/stdenv/generic/make-derivation.nix
View file
Original file line number Diff line number Diff line change
@@ -93,7 +93,7 @@ rec {
++ depsTargetTarget ++ depsTargetTargetPropagated) == 0;
runtimeSensativeIfFixedOutput = fixedOutputDrv -> !noNonNativeDeps;
supportedHardeningFlags = [ "fortify" "stackprotector" "pie" "pic" "strictoverflow" "format" "relro" "bindnow" ];
defaultHardeningFlags = if stdenv.targetPlatform.isMusl
defaultHardeningFlags = if stdenv.hostPlatform.isMusl
then supportedHardeningFlags
else lib.remove "pie" supportedHardeningFlags;
enabledHardeningOptions =