Unverified Commit 4a6d5a4f authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge branch 'staging' into staging-next

parents 06388167 61836995

lib/systems/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ rec { 
        else if final.isFreeBSD             then "fblibc"

        else if final.isNetBSD              then "nblibc"

        else if final.isAvr                 then "avrlibc"

        else if final.isGhcjs               then null

        else if final.isNone                then "newlib"

        # TODO(@Ericson2314) think more about other operating systems

        else                                     "native/impure";

pkgs/applications/audio/polyphone/default.nix

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ mkDerivation rec { 
  qmakeFlags = [

    "DEFINES+=USE_LOCAL_STK"

    "DEFINES+=USE_LOCAL_QCUSTOMPLOT"

    "INCLUDEPATH+=${libjack2}/include/jack"

  ];



  meta = with lib; {

pkgs/build-support/bintools-wrapper/ld-wrapper.sh

+6 −4
Original line number Diff line number Diff line
@@ -55,10 +55,12 @@ if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "${NIX_STORE:-}" 
            # produces '-syslibroot //' linker flag. It's a no-op,

            # which does not introduce impurities.

            n+=1; skip "$p2"

        elif [ "${p:0:1}" = / ] && badPath "$p"; then

            # We cannot skip this; barf.

            echo "impure path \`$p' used in link" >&2

            exit 1

        elif [ "${p:0:10}" = /LIBPATH:/ ] && badPath "${p:9}"; then

            reject "${p:9}"

        # We need to not match LINK.EXE-style flags like

        # /NOLOGO or /LIBPATH:/nix/store/foo

        elif [[ $p =~ ^/[^:]*/ ]] && badPath "$p"; then

            reject "$p"

        elif [ "${p:0:9}" = --sysroot ]; then

            # Our ld is not built with sysroot support (Can we fix that?)

            :

pkgs/build-support/cc-wrapper/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -518,7 +518,7 @@ stdenv.mkDerivation { 
    ''



    # TODO: categorize these and figure out a better place for them

    + optionalString hostPlatform.isCygwin ''

    + optionalString targetPlatform.isWindows ''

      hardening_unsupported_flags+=" pic"

    '' + optionalString targetPlatform.isMinGW ''

      hardening_unsupported_flags+=" stackprotector fortify"

pkgs/build-support/setup-hooks/make-binary-wrapper/make-binary-wrapper.sh

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ wrapProgramBinary() { 
      hidden="${hidden}_"

    done

    mv "$prog" "$hidden"

    makeWrapper "$hidden" "$prog" --inherit-argv0 "${@:2}"

    makeBinaryWrapper "$hidden" "$prog" --inherit-argv0 "${@:2}"

}



# Generate source code for the wrapper in such a way that the wrapper inputs