alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

treewide: Make explicit that 'dev' output of sqlite is used

Browse source
This commit is contained in:
Tuomas Tynkkynen 2016-04-16 20:47:23 +03:00 committed by Vladimír Čunát
parent 5a8ad2d7a8
commit e80e4ba2bb
10 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/version-management/subversion/default.nix
View file

@ -46,7 +46,7 @@ let
${if saslSupport then "--with-sasl=${sasl}" else "--without-sasl"} ${if saslSupport then "--with-sasl=${sasl}" else "--without-sasl"}
${if httpSupport then "--with-serf=${serf}" else "--without-serf"} ${if httpSupport then "--with-serf=${serf}" else "--without-serf"}
--with-zlib=${zlib} --with-zlib=${zlib}
--with-sqlite=${sqlite} --with-sqlite=${sqlite.dev}
''; '';
preBuild = '' preBuild = ''

2
pkgs/development/interpreters/php/default.nix
View file

@ -90,7 +90,7 @@ let
}; };
sqlite = { sqlite = {
configureFlags = ["--with-pdo-sqlite=${sqlite}"]; configureFlags = ["--with-pdo-sqlite=${sqlite.dev}"];
buildInputs = [ sqlite ]; buildInputs = [ sqlite ];
}; };

2
pkgs/development/libraries/kerberos/heimdal.nix
View file

@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
"--sysconfdir=/etc" "--sysconfdir=/etc"
"--localstatedir=/var" "--localstatedir=/var"
"--enable-hdb-openldap-module" "--enable-hdb-openldap-module"
"--with-sqlite3=${sqlite}" "--with-sqlite3=${sqlite.dev}"
"--with-libedit=${libedit}" "--with-libedit=${libedit}"
"--with-openssl=${openssl.dev}" "--with-openssl=${openssl.dev}"
"--without-x" "--without-x"

2
pkgs/development/perl-modules/DBD-SQLite/default.nix
View file

@ -10,7 +10,7 @@ buildPerlPackage rec {
propagatedBuildInputs = [ DBI ]; propagatedBuildInputs = [ DBI ];
makeMakerFlags = "SQLITE_LOCATION=${sqlite}"; makeMakerFlags = "SQLITE_LOCATION=${sqlite.dev}";
patches = [ patches = [
# Support building against our own sqlite. # Support building against our own sqlite.

2
pkgs/development/tools/misc/global/default.nix
View file

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
"--with-ltdl-include=${libtool}/include" "--with-ltdl-include=${libtool}/include"
"--with-ltdl-lib=${libtool.lib}/lib" "--with-ltdl-lib=${libtool.lib}/lib"
"--with-ncurses=${ncurses.dev}" "--with-ncurses=${ncurses.dev}"
"--with-sqlite3=${sqlite}" "--with-sqlite3=${sqlite.dev}"
"--with-exuberant-ctags=${ctags}/bin/ctags" "--with-exuberant-ctags=${ctags}/bin/ctags"
"--with-posix-sort=${coreutils}/bin/sort" "--with-posix-sort=${coreutils}/bin/sort"
]; ];

2
pkgs/games/crawl/crawl_purify.patch
View file

@ -7,7 +7,7 @@ index b7e2fbf..5ff23db 100644
ifndef CROSSHOST ifndef CROSSHOST
- SQLITE_INCLUDE_DIR := /usr/include - SQLITE_INCLUDE_DIR := /usr/include
+ SQLITE_INCLUDE_DIR := ${sqlite}/include + SQLITE_INCLUDE_DIR := ${sqlite.dev}/include
else else
# This is totally wrong, works only with some old-style setups, and # This is totally wrong, works only with some old-style setups, and
# on some architectures of Debian/new FHS multiarch -- excluding, for # on some architectures of Debian/new FHS multiarch -- excluding, for

2
pkgs/games/crawl/default.nix
View file

@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
''; '';
makeFlags = [ "prefix=$(out)" "FORCE_CC=gcc" "FORCE_CXX=g++" "HOSTCXX=g++" makeFlags = [ "prefix=$(out)" "FORCE_CC=gcc" "FORCE_CXX=g++" "HOSTCXX=g++"
"SAVEDIR=~/.crawl" "sqlite=${sqlite}" ] "SAVEDIR=~/.crawl" "sqlite=${sqlite.dev}" ]
++ stdenv.lib.optionals tileMode [ "TILES=y" "dejavu_fonts=${dejavu_fonts}" ]; ++ stdenv.lib.optionals tileMode [ "TILES=y" "dejavu_fonts=${dejavu_fonts}" ];
postInstall = if tileMode then "mv $out/bin/crawl $out/bin/crawl-tiles" else ""; postInstall = if tileMode then "mv $out/bin/crawl $out/bin/crawl-tiles" else "";

2
pkgs/servers/xmpp/ejabberd/default.nix
View file

@ -90,7 +90,7 @@ in stdenv.mkDerivation rec {
(lib.enableFeature withIconv "iconv") (lib.enableFeature withIconv "iconv")
(lib.enableFeature withTools "tools") (lib.enableFeature withTools "tools")
(lib.enableFeature withRedis "redis") (lib.enableFeature withRedis "redis")
] ++ lib.optional withSqlite "--with-sqlite3=${sqlite}"; ] ++ lib.optional withSqlite "--with-sqlite3=${sqlite.dev}";
enableParallelBuilding = true; enableParallelBuilding = true;

2
pkgs/tools/backup/bacula/default.nix
View file

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional (!stdenv.isDarwin) acl; ++ stdenv.lib.optional (!stdenv.isDarwin) acl;
configureFlags = [ configureFlags = [
"--with-sqlite3=${sqlite}" "--with-sqlite3=${sqlite.dev}"
"--with-postgresql=${postgresql}" "--with-postgresql=${postgresql}"
]; ];

2
pkgs/tools/backup/bareos/default.nix
View file

@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
] ++ optionals (readline != null) [ "--disable-conio" "--enable-readline" "--with-readline=${readline.dev}" ] ] ++ optionals (readline != null) [ "--disable-conio" "--enable-readline" "--with-readline=${readline.dev}" ]
++ optional (python != null) "--with-python=${python}" ++ optional (python != null) "--with-python=${python}"
++ optional (openssl != null) "--with-openssl=${openssl.dev}" ++ optional (openssl != null) "--with-openssl=${openssl.dev}"
++ optional (sqlite != null) "--with-sqlite3=${sqlite}" ++ optional (sqlite != null) "--with-sqlite3=${sqlite.dev}"
++ optional (postgresql != null) "--with-postgresql=${postgresql}" ++ optional (postgresql != null) "--with-postgresql=${postgresql}"
++ optional (libmysql != null) "--with-mysql=${libmysql}" ++ optional (libmysql != null) "--with-mysql=${libmysql}"
++ optional (zlib != null) "--with-zlib=${zlib}" ++ optional (zlib != null) "--with-zlib=${zlib}"