Commit 3db11767 authored by Nicolas Benes's avatar Nicolas Benes
Browse files

fetchurl, fetchgitlab: fix curlOpts extension 

PR #464475 enables __structuredAttrs and makes curlOpts a bash array.
Consequently, it must be extended as such to be effective.

See also https://github.com/NixOS/nixpkgs/pull/464475#issuecomment-3649765507
parent 5ac634e4

pkgs/build-support/fetchgitlab/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ lib.makeOverridable ( 
              cat > private-token <<EOF

              PRIVATE-TOKEN: ''$${varBase}PASSWORD

              EOF

              curlOpts="$curlOpts --header @./private-token"

              curlOpts+=(--header @./private-token)

            ''

        );

        netrcImpureEnvVars = [

pkgs/build-support/fetchurl/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ lib.extendMkDerivation { 
        else

          ''

            ${netrcPhase}

            curlOpts="$curlOpts --netrc-file $PWD/netrc"

            curlOpts+=(--netrc-file "$PWD/netrc")

          '';



      inherit meta;