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: f910fd4995da
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: db0abe98bfa7
Choose a head ref
  • 2 commits
  • 6 files changed
  • 1 contributor

Commits on Nov 16, 2018

  1. ghc: disable pie, for now limit to musl since not default yet elsewhere

    @dtzWill
    dtzWill committed Nov 16, 2018
    Copy the full SHA
    6ebb2c3 View commit details

  2. glibc: disable pie hardening, limit to musl for now

    @dtzWill
    dtzWill committed Nov 16, 2018
    Copy the full SHA
    db0abe9 View commit details
2 changes: 1 addition & 1 deletion pkgs/development/compilers/ghc/8.2.2.nix
View file
Original file line number Diff line number Diff line change
@@ -232,7 +232,7 @@ stdenv.mkDerivation (rec {
checkTarget = "test";
doCheck = false; # fails with "testsuite/tests: No such file or directory. Stop."

hardeningDisable = [ "format" ];
hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";

postInstall = ''
for bin in "$out"/lib/${name}/bin/*; do
2 changes: 1 addition & 1 deletion pkgs/development/compilers/ghc/8.4.4.nix
View file
Original file line number Diff line number Diff line change
@@ -204,7 +204,7 @@ stdenv.mkDerivation (rec {

checkTarget = "test";

hardeningDisable = [ "format" ];
hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";

postInstall = ''
for bin in "$out"/lib/${name}/bin/*; do
2 changes: 1 addition & 1 deletion pkgs/development/compilers/ghc/8.6.1.nix
View file
Original file line number Diff line number Diff line change
@@ -189,7 +189,7 @@ stdenv.mkDerivation (rec {

checkTarget = "test";

hardeningDisable = [ "format" ];
hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";

postInstall = ''
for bin in "$out"/lib/${name}/bin/*; do
2 changes: 1 addition & 1 deletion pkgs/development/compilers/ghc/8.6.2.nix
View file
Original file line number Diff line number Diff line change
@@ -189,7 +189,7 @@ stdenv.mkDerivation (rec {

checkTarget = "test";

hardeningDisable = [ "format" ];
hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";

postInstall = ''
for bin in "$out"/lib/${name}/bin/*; do
2 changes: 1 addition & 1 deletion pkgs/development/compilers/ghc/head.nix
View file
Original file line number Diff line number Diff line change
@@ -171,7 +171,7 @@ stdenv.mkDerivation (rec {

checkTarget = "test";

hardeningDisable = [ "format" ];
hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";

postInstall = ''
for bin in "$out"/lib/${name}/bin/*; do
5 changes: 4 additions & 1 deletion pkgs/development/libraries/glibc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -35,7 +35,10 @@ callPackage ./common.nix { inherit stdenv; } {
# The stackprotector and fortify hardening flags are autodetected by glibc
# and enabled by default if supported. Setting it for every gcc invocation
# does not work.
hardeningDisable = [ "stackprotector" "fortify" ];
hardeningDisable = [ "stackprotector" "fortify" ]
# XXX: Not actually musl-speciic but since only musl enables pie by default,
# limit rebuilds by only disabling pie w/musl
++ stdenv.lib.optional stdenv.hostPlatform.isMusl "pie";

# When building glibc from bootstrap-tools, we need libgcc_s at RPATH for
# any program we run, because the gcc will have been placed at a new