diff options
| author | Robin Gloster <mail@glob.in> | 2021-05-24 09:55:24 -0500 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2021-05-24 09:55:24 -0500 |
| commit | 4bc5fbef9d159e143fb7e2c3231932e6e76f667c (patch) | |
| tree | e2198f5c552e0667d838b8ec764ddb3a4d8f6dec /pkgs/development/libraries/sqlite/sqlar.nix | |
| parent | jq: fix build with structured-attrs on darwin (diff) | |
| parent | Merge pull request #123802 from superherointj/package-virtmanager-bugfix (diff) | |
| download | nixpkgs-origin/structured-attrs.tar.gz | |
Merge remote-tracking branch 'upstream/master' into structured-attrsorigin/structured-attrs
Diffstat (limited to 'pkgs/development/libraries/sqlite/sqlar.nix')
| -rw-r--r-- | pkgs/development/libraries/sqlite/sqlar.nix | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/pkgs/development/libraries/sqlite/sqlar.nix b/pkgs/development/libraries/sqlite/sqlar.nix index 0828f2f45543..9063879b7e37 100644 --- a/pkgs/development/libraries/sqlite/sqlar.nix +++ b/pkgs/development/libraries/sqlite/sqlar.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchurl, fuse, zlib }: +{ lib, stdenv, fetchurl, fuse, zlib +, withFuse ? true }: stdenv.mkDerivation { pname = "sqlar"; @@ -9,12 +10,21 @@ stdenv.mkDerivation { sha256 = "09pikkbp93gqypn3da9zi0dzc47jyypkwc9vnmfzhmw7kpyv8nm9"; }; - buildInputs = [ fuse zlib ]; + postPatch = '' + substituteInPlace Makefile \ + --replace 'gcc' '${stdenv.cc.targetPrefix}cc' + ''; + + buildInputs = [ zlib ] + ++ lib.optional withFuse fuse; - buildFlags = [ "sqlar" "sqlarfs" "CFLAGS=-Wno-error" ]; + buildFlags = [ "CFLAGS=-Wno-error" "sqlar" ] + ++ lib.optional withFuse "sqlarfs"; installPhase = '' - install -D -t $out/bin sqlar sqlarfs + install -D -t $out/bin sqlar + '' + lib.optionalString withFuse '' + install -D -t $out/bin sqlarfs ''; meta = with lib; { |
