Unverified Commit b25f6545 authored by Gergő Gutyina's avatar Gergő Gutyina Committed by GitHub
Browse files

treewide: move NIX_CFLAGS_LINK vars into env for structuredAttrs (#492176)

parents c0469a6d 87d79ab3

pkgs/applications/graphics/apngasm/2.nix

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec { 
    rm -rf libpng zlib zopfli

  '';



  NIX_CFLAGS_LINK = "-lzopfli";

  env.NIX_CFLAGS_LINK = "-lzopfli";



  installPhase = ''

    install -Dt $out/bin apngasm

pkgs/by-name/ap/aprutil/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { 
  ]

  ++ lib.optional stdenv.hostPlatform.isFreeBSD ./include-static-dependencies.patch;



  NIX_CFLAGS_LINK = [ "-lcrypt" ];

  env.NIX_CFLAGS_LINK = toString [ "-lcrypt" ];



  outputs = [

    "out"

pkgs/by-name/ds/dsniff/package.nix

+13 −2
Original line number Diff line number Diff line
@@ -103,8 +103,19 @@ stdenv.mkDerivation (finalAttrs: { 
    libnsl

    libnl

  ];

  NIX_CFLAGS_LINK = "-lglib-2.0 -lpthread -ltirpc -lnl-3 -lnl-genl-3";

  env.NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ];



  env = {

    NIX_CFLAGS_LINK = toString [

      "-lglib-2.0"

      "-lpthread"

      "-ltirpc"

      "-lnl-3"

      "-lnl-genl-3"

    ];

    NIX_CFLAGS_COMPILE = toString [

      "-I${libtirpc.dev}/include/tirpc"

    ];

  };

  postPatch = ''

    for patch in debian/patches/*.patch; do

      patch < $patch

pkgs/by-name/he/hebbot/package.nix

+4 −5
Original line number Diff line number Diff line
@@ -40,12 +40,11 @@ rustPlatform.buildRustPackage (finalAttrs: { 


  env = {

    OPENSSL_NO_VENDOR = 1;

  };



  NIX_CFLAGS_LINK = [

    NIX_CFLAGS_LINK = toString [

      "-L${lib.getLib openssl}/lib"

      "-L${lib.getLib sqlite}/lib"

    ];

  };



  passthru.updateScript = unstableGitUpdater { };

pkgs/by-name/io/iortcw/sp.nix

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

  nativeBuildInputs = [ makeWrapper ];



  env.NIX_CFLAGS_COMPILE = toString [

  env = {

    NIX_CFLAGS_COMPILE = toString [

      "-I${lib.getInclude SDL2}/include/SDL2"

      "-I${opusfile.dev}/include/opus"

    ];

  NIX_CFLAGS_LINK = [ "-lSDL2" ];

    NIX_CFLAGS_LINK = toString [

      "-lSDL2"

    ];

  };



  postInstall = ''

    for i in `find $out/opt/iortcw -maxdepth 1 -type f -executable`; do