diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-06-23 13:39:01 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-09-10 01:34:50 +0200 |
| commit | e1cb839d17d7ec6bdf97624e0f1c0f0af6fb62c3 (patch) | |
| tree | 3288c417d734b8a3394dfc7a0bc1eb30d8515e43 /pkgs/tools/graphics | |
| parent | 41fbd5568913fbbdc6e0b608d78bd14f0e4c1150 (diff) | |
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.
Diffstat (limited to 'pkgs/tools/graphics')
| -rw-r--r-- | pkgs/tools/graphics/zbar/default.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index bb1081074b9..116f32a701b 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { pname = "zbar"; version = "0.23"; + outputs = [ "out" "py" "lib" "dev" "doc" "man" ]; + src = fetchFromGitHub { owner = "mchehab"; repo = "zbar"; @@ -54,7 +56,7 @@ stdenv.mkDerivation rec { ]; configureFlags = (if enableDbus then [ - "--with-dbusconfdir=${placeholder "out"}/etc/dbus-1/system.d" + "--with-dbusconfdir=${placeholder "out"}/etc" ] else [ "--without-dbus" ]) ++ lib.optionals (!enableVideo) [ @@ -63,9 +65,10 @@ stdenv.mkDerivation rec { "--without-qt" ]; - postInstall = optionalString enableDbus '' - install -Dm644 dbus/org.linuxtv.Zbar.conf $out/etc/dbus-1/system.d/org.linuxtv.Zbar.conf - ''; + makeFlags = [ + "pyexecdir=${placeholder "py"}/${python.sitePackages}" + "pythondir=${placeholder "py"}/${python.sitePackages}" + ]; meta = with lib; { description = "Bar code reader"; |