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/applications/misc/electrum/default.nix | |
| parent | 41fbd5568913fbbdc6e0b608d78bd14f0e4c1150 (diff) | |
| download | nixpkgs-e1cb839d17d7ec6bdf97624e0f1c0f0af6fb62c3.tar nixpkgs-e1cb839d17d7ec6bdf97624e0f1c0f0af6fb62c3.tar.gz nixpkgs-e1cb839d17d7ec6bdf97624e0f1c0f0af6fb62c3.tar.bz2 nixpkgs-e1cb839d17d7ec6bdf97624e0f1c0f0af6fb62c3.tar.lz nixpkgs-e1cb839d17d7ec6bdf97624e0f1c0f0af6fb62c3.tar.xz nixpkgs-e1cb839d17d7ec6bdf97624e0f1c0f0af6fb62c3.tar.zst nixpkgs-e1cb839d17d7ec6bdf97624e0f1c0f0af6fb62c3.zip | |
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/applications/misc/electrum/default.nix')
| -rw-r--r-- | pkgs/applications/misc/electrum/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index c48d458567d..0ebeb1beffa 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -88,7 +88,7 @@ python3Packages.buildPythonApplication { --replace ${libsecp256k1_name} ${secp256k1}/lib/libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary} '' + (if enableQt then '' substituteInPlace ./electrum/qrscanner.py \ - --replace ${libzbar_name} ${zbar}/lib/libzbar${stdenv.hostPlatform.extensions.sharedLibrary} + --replace ${libzbar_name} ${zbar.lib}/lib/libzbar${stdenv.hostPlatform.extensions.sharedLibrary} '' else '' sed -i '/qdarkstyle/d' contrib/requirements/requirements.txt ''); |