zbar: Split to multiple outputs

Also fix D-Bus config dir path: The configure script is appending `/dbus-1/system.d`
so when we added passed in `$out/etc/dbus-1/system.d`, it ended up with extra nesting.
This commit is contained in:
Jan Tojnar
2019-09-10 01:34:50 +02:00
parent 41fbd55689
commit e1cb839d17
3 changed files with 18 additions and 10 deletions
@@ -15,15 +15,20 @@ stdenv.mkDerivation {
sha256 = "0yrc302a2fhbzryb10718ky4fymfcps3lk67ivis1qab5kbp6z8r";
};
buildInputs = [ imagemagick qrencode ] ++ stdenv.lib.optional testQR zbar;
dontBuild = true;
dontStrip = true;
dontPatchELF = true;
preInstall = ''
substituteInPlace asc-to-gif.sh \
--replace "convert" "${imagemagick}/bin/convert" \
--replace "qrencode" "${qrencode.bin}/bin/qrencode"
preInstall = let
substitutions = [
''--replace "convert" "${imagemagick}/bin/convert"''
''--replace "qrencode" "${qrencode.bin}/bin/qrencode"''
] ++ stdenv.lib.optional testQR [
''--replace "hash zbarimg" "true"'' # hash does not work on NixOS
''--replace "$(zbarimg --raw" "$(${zbar.out}/bin/zbarimg --raw"''
];
in ''
substituteInPlace asc-to-gif.sh ${stdenv.lib.concatStringsSep " " substitutions}
'';
installPhase = ''