From a28940d9d542f3d7f2a5f88c4f2701a1818cf153 Mon Sep 17 00:00:00 2001 From: Shea Levy <shea@shealevy.com> Date: Wed, 16 Nov 2011 20:21:07 +0000 Subject: [PATCH] sqlite: Use {C,LD}FLAGS instead of NIX_CFLAGS_* Now the flags are used when cross-building, too svn path=/nixpkgs/trunk/; revision=30454 --- pkgs/development/libraries/sqlite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 626e3b1297ea..5d256bc70241 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation { configureFlags = "--enable-threadsafe"; - NIX_CFLAGS_COMPILE = "-DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_SECURE_DELETE=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY=1"; - NIX_CFLAGS_LINK = if readline != null then "-lncurses" else ""; + CFLAGS = "-DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_SECURE_DELETE=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY=1"; + LDFLAGS = if readline != null then "-lncurses" else ""; meta = { homepage = http://www.sqlite.org/;