Unverified Commit 89e57280 authored by Stefan Frijters's avatar Stefan Frijters
Browse files

lazarus: move NIX_LDFLAGS into env for structuredAttrs

parent 47d1670d

pkgs/development/compilers/fpc/lazarus.nix

+26 −23
Original line number Diff line number Diff line
@@ -43,6 +43,8 @@ let 
    )

  );



  LCL_PLATFORM = if withQt then "qt${qtVersion}" else "gtk2";



  qtVersion = lib.versions.major qtbase.version;

in

stdenv.mkDerivation rec {
@@ -95,9 +97,9 @@ stdenv.mkDerivation rec { 
    "bigide"

  ];



  LCL_PLATFORM = if withQt then "qt${qtVersion}" else "gtk2";



  NIX_LDFLAGS = lib.concatStringsSep " " (

  env = {

    inherit LCL_PLATFORM;

    NIX_LDFLAGS = toString (

      [

        "-L${lib.getLib stdenv.cc.cc}/lib"

        "-lX11"
@@ -118,6 +120,7 @@ stdenv.mkDerivation rec { 
        "-lQt${qtVersion}Pas"

      ]

    );

  };



  preBuild = ''

    mkdir -p $out/share "$out/lazarus"