Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

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

authored by Tuomas Tynkkynen and committed by Vladimír Čunát e80e4ba2 5a8ad2d7

+10 -10
+1 -1
pkgs/applications/version-management/subversion/default.nix
··· 46 ${if saslSupport then "--with-sasl=${sasl}" else "--without-sasl"} 47 ${if httpSupport then "--with-serf=${serf}" else "--without-serf"} 48 --with-zlib=${zlib} 49 - --with-sqlite=${sqlite} 50 ''; 51 52 preBuild = ''
··· 46 ${if saslSupport then "--with-sasl=${sasl}" else "--without-sasl"} 47 ${if httpSupport then "--with-serf=${serf}" else "--without-serf"} 48 --with-zlib=${zlib} 49 + --with-sqlite=${sqlite.dev} 50 ''; 51 52 preBuild = ''
+1 -1
pkgs/development/interpreters/php/default.nix
··· 90 }; 91 92 sqlite = { 93 - configureFlags = ["--with-pdo-sqlite=${sqlite}"]; 94 buildInputs = [ sqlite ]; 95 }; 96
··· 90 }; 91 92 sqlite = { 93 + configureFlags = ["--with-pdo-sqlite=${sqlite.dev}"]; 94 buildInputs = [ sqlite ]; 95 }; 96
+1 -1
pkgs/development/libraries/kerberos/heimdal.nix
··· 32 "--sysconfdir=/etc" 33 "--localstatedir=/var" 34 "--enable-hdb-openldap-module" 35 - "--with-sqlite3=${sqlite}" 36 "--with-libedit=${libedit}" 37 "--with-openssl=${openssl.dev}" 38 "--without-x"
··· 32 "--sysconfdir=/etc" 33 "--localstatedir=/var" 34 "--enable-hdb-openldap-module" 35 + "--with-sqlite3=${sqlite.dev}" 36 "--with-libedit=${libedit}" 37 "--with-openssl=${openssl.dev}" 38 "--without-x"
+1 -1
pkgs/development/perl-modules/DBD-SQLite/default.nix
··· 10 11 propagatedBuildInputs = [ DBI ]; 12 13 - makeMakerFlags = "SQLITE_LOCATION=${sqlite}"; 14 15 patches = [ 16 # Support building against our own sqlite.
··· 10 11 propagatedBuildInputs = [ DBI ]; 12 13 + makeMakerFlags = "SQLITE_LOCATION=${sqlite.dev}"; 14 15 patches = [ 16 # Support building against our own sqlite.
+1 -1
pkgs/development/tools/misc/global/default.nix
··· 20 "--with-ltdl-include=${libtool}/include" 21 "--with-ltdl-lib=${libtool.lib}/lib" 22 "--with-ncurses=${ncurses.dev}" 23 - "--with-sqlite3=${sqlite}" 24 "--with-exuberant-ctags=${ctags}/bin/ctags" 25 "--with-posix-sort=${coreutils}/bin/sort" 26 ];
··· 20 "--with-ltdl-include=${libtool}/include" 21 "--with-ltdl-lib=${libtool.lib}/lib" 22 "--with-ncurses=${ncurses.dev}" 23 + "--with-sqlite3=${sqlite.dev}" 24 "--with-exuberant-ctags=${ctags}/bin/ctags" 25 "--with-posix-sort=${coreutils}/bin/sort" 26 ];
+1 -1
pkgs/games/crawl/crawl_purify.patch
··· 7 8 ifndef CROSSHOST 9 - SQLITE_INCLUDE_DIR := /usr/include 10 - + SQLITE_INCLUDE_DIR := ${sqlite}/include 11 else 12 # This is totally wrong, works only with some old-style setups, and 13 # on some architectures of Debian/new FHS multiarch -- excluding, for
··· 7 8 ifndef CROSSHOST 9 - SQLITE_INCLUDE_DIR := /usr/include 10 + + SQLITE_INCLUDE_DIR := ${sqlite.dev}/include 11 else 12 # This is totally wrong, works only with some old-style setups, and 13 # on some architectures of Debian/new FHS multiarch -- excluding, for
+1 -1
pkgs/games/crawl/default.nix
··· 33 ''; 34 35 makeFlags = [ "prefix=$(out)" "FORCE_CC=gcc" "FORCE_CXX=g++" "HOSTCXX=g++" 36 - "SAVEDIR=~/.crawl" "sqlite=${sqlite}" ] 37 ++ stdenv.lib.optionals tileMode [ "TILES=y" "dejavu_fonts=${dejavu_fonts}" ]; 38 39 postInstall = if tileMode then "mv $out/bin/crawl $out/bin/crawl-tiles" else "";
··· 33 ''; 34 35 makeFlags = [ "prefix=$(out)" "FORCE_CC=gcc" "FORCE_CXX=g++" "HOSTCXX=g++" 36 + "SAVEDIR=~/.crawl" "sqlite=${sqlite.dev}" ] 37 ++ stdenv.lib.optionals tileMode [ "TILES=y" "dejavu_fonts=${dejavu_fonts}" ]; 38 39 postInstall = if tileMode then "mv $out/bin/crawl $out/bin/crawl-tiles" else "";
+1 -1
pkgs/servers/xmpp/ejabberd/default.nix
··· 90 (lib.enableFeature withIconv "iconv") 91 (lib.enableFeature withTools "tools") 92 (lib.enableFeature withRedis "redis") 93 - ] ++ lib.optional withSqlite "--with-sqlite3=${sqlite}"; 94 95 enableParallelBuilding = true; 96
··· 90 (lib.enableFeature withIconv "iconv") 91 (lib.enableFeature withTools "tools") 92 (lib.enableFeature withRedis "redis") 93 + ] ++ lib.optional withSqlite "--with-sqlite3=${sqlite.dev}"; 94 95 enableParallelBuilding = true; 96
+1 -1
pkgs/tools/backup/bacula/default.nix
··· 13 ++ stdenv.lib.optional (!stdenv.isDarwin) acl; 14 15 configureFlags = [ 16 - "--with-sqlite3=${sqlite}" 17 "--with-postgresql=${postgresql}" 18 ]; 19
··· 13 ++ stdenv.lib.optional (!stdenv.isDarwin) acl; 14 15 configureFlags = [ 16 + "--with-sqlite3=${sqlite.dev}" 17 "--with-postgresql=${postgresql}" 18 ]; 19
+1 -1
pkgs/tools/backup/bareos/default.nix
··· 53 ] ++ optionals (readline != null) [ "--disable-conio" "--enable-readline" "--with-readline=${readline.dev}" ] 54 ++ optional (python != null) "--with-python=${python}" 55 ++ optional (openssl != null) "--with-openssl=${openssl.dev}" 56 - ++ optional (sqlite != null) "--with-sqlite3=${sqlite}" 57 ++ optional (postgresql != null) "--with-postgresql=${postgresql}" 58 ++ optional (libmysql != null) "--with-mysql=${libmysql}" 59 ++ optional (zlib != null) "--with-zlib=${zlib}"
··· 53 ] ++ optionals (readline != null) [ "--disable-conio" "--enable-readline" "--with-readline=${readline.dev}" ] 54 ++ optional (python != null) "--with-python=${python}" 55 ++ optional (openssl != null) "--with-openssl=${openssl.dev}" 56 + ++ optional (sqlite != null) "--with-sqlite3=${sqlite.dev}" 57 ++ optional (postgresql != null) "--with-postgresql=${postgresql}" 58 ++ optional (libmysql != null) "--with-mysql=${libmysql}" 59 ++ optional (zlib != null) "--with-zlib=${zlib}"