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

treewide: move NIX_LDFLAGS into env for structuredAttrs (l-o) (#486055)

parents 992c98e5 056ccdfc

pkgs/by-name/li/libdiscid/package.nix

+8 −1
Original line number Diff line number Diff line
@@ -23,7 +23,14 @@ stdenv.mkDerivation (finalAttrs: { 
    hash = "sha256-lGq2iGt7c4h8HntEPeQcd7X+IykRLm0kvjrLswRWSSs=";

  };



  NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework CoreFoundation -framework IOKit";

  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {

    NIX_LDFLAGS = toString [

      "-framework"

      "CoreFoundation"

      "-framework"

      "IOKit"

    ];

  };



  passthru.updateScript = nix-update-script { };

pkgs/by-name/li/libdvdread_4_9_9/package.nix

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


  buildInputs = [ libdvdcss ];



  NIX_LDFLAGS = "-ldvdcss";

  env.NIX_LDFLAGS = "-ldvdcss";



  postInstall = ''

    ln -s dvdread $out/include/libdvdread

pkgs/by-name/li/libfakekey/package.nix

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

  ];



  NIX_LDFLAGS = "-lX11";

  env.NIX_LDFLAGS = "-lX11";



  meta = {

    description = "X virtual keyboard library";

pkgs/by-name/li/libgdiplus/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { 
    ./configure-pkg-config.patch

  ];



  NIX_LDFLAGS = "-lgif";

  env.NIX_LDFLAGS = "-lgif";



  outputs = [

    "out"

pkgs/by-name/li/libmikmod/package.nix

+3 −1
Original line number Diff line number Diff line
@@ -29,7 +29,9 @@ stdenv.mkDerivation (finalAttrs: { 
    "man"

  ];



  NIX_LDFLAGS = optionalString stdenv.hostPlatform.isLinux "-lasound";

  env = lib.optionalAttrs stdenv.hostPlatform.isLinux {

    NIX_LDFLAGS = "-lasound";

  };



  enableParallelBuilding = true;