public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sqldiff, sqlite-analyzer: Fix Darwin build 

lowPrio dropped, too, because the contents of these derivations don't
appear in any others.
This commit is contained in:
Benjamin Esham 2019-09-20 08:19:04 +02:00 committed by Doron Behar
parent e714798f27
commit 1e136a97fb
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/sqlite/tools.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, unzip, sqlite, tcl }: { stdenv, fetchurl, unzip, sqlite, tcl, Foundation }:
let let
archiveVersion = import ./archive-version.nix stdenv.lib; archiveVersion = import ./archive-version.nix stdenv.lib;
@ -12,7 +12,7 @@ let
}; };
nativeBuildInputs = [ unzip ]; nativeBuildInputs = [ unzip ];
buildInputs = [ tcl ]; buildInputs = [ tcl ] ++ stdenv.lib.optional stdenv.isDarwin Foundation;
makeFlags = [ makeTarget ]; makeFlags = [ makeTarget ];

6
pkgs/top-level/all-packages.nix
View File

@ -15412,9 +15412,9 @@ in
sqlite = lowPrio (callPackage ../development/libraries/sqlite { }); sqlite = lowPrio (callPackage ../development/libraries/sqlite { });
sqlite-analyzer = lowPrio (callPackage ../development/libraries/sqlite/tools.nix { }).sqlite-analyzer; inherit (callPackage ../development/libraries/sqlite/tools.nix {
inherit (darwin.apple_sdk.frameworks) Foundation;
sqldiff = lowPrio (callPackage ../development/libraries/sqlite/tools.nix { }).sqldiff; }) sqlite-analyzer sqldiff;
sqlar = callPackage ../development/libraries/sqlite/sqlar.nix { }; sqlar = callPackage ../development/libraries/sqlite/sqlar.nix { };