Unverified Commit 0fe992af authored by Doron Behar's avatar Doron Behar Committed by GitHub
Browse files

octave: move NIX_LDFLAGS into env for structuredAttrs (#486100)

parents 97a36cb6 31baa9d9

pkgs/development/interpreters/octave/default.nix

+9 −5
Original line number Diff line number Diff line
@@ -171,11 +171,15 @@ stdenv.mkDerivation (finalAttrs: { 


  enableParallelBuilding = true;



  env =

    lib.optionalAttrs stdenv.hostPlatform.isDarwin {

      # Fix linker error on Darwin (see https://trac.macports.org/ticket/61865)

  NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-lobjc";



      NIX_LDFLAGS = "-lobjc";

    }

    // lib.optionalAttrs use64BitIdx {

      # See https://savannah.gnu.org/bugs/?50339

  F77_INTEGER_8_FLAG = lib.optionalString use64BitIdx "-fdefault-integer-8";

      F77_INTEGER_8_FLAG = "-fdefault-integer-8";

    };



  configureFlags = [

    "--with-blas=blas"