diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-09-21 13:14:09 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-09-21 13:14:09 +0200 |
| commit | 41af38f3728bd64b80721c44ed1fb019978cbc1b (patch) | |
| tree | f95e41e3f80b5f9f1f5a6c3462b6352a12575c40 /pkgs/tools/graphics | |
| parent | f0fec244ca380b9d3e617ee7b419c59758c8b0f1 (diff) | |
| parent | 22d7eb74d9b554fe6a18e6542ff85bc38f0bc923 (diff) | |
| download | nixpkgs-41af38f3728bd64b80721c44ed1fb019978cbc1b.tar nixpkgs-41af38f3728bd64b80721c44ed1fb019978cbc1b.tar.gz nixpkgs-41af38f3728bd64b80721c44ed1fb019978cbc1b.tar.bz2 nixpkgs-41af38f3728bd64b80721c44ed1fb019978cbc1b.tar.lz nixpkgs-41af38f3728bd64b80721c44ed1fb019978cbc1b.tar.xz nixpkgs-41af38f3728bd64b80721c44ed1fb019978cbc1b.tar.zst nixpkgs-41af38f3728bd64b80721c44ed1fb019978cbc1b.zip | |
Merge branch 'staging-next'
Diffstat (limited to 'pkgs/tools/graphics')
| -rw-r--r-- | pkgs/tools/graphics/zbar/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index 6423a84badc..687c4832e47 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -8,6 +8,7 @@ , qtbase , qtx11extras , wrapQtAppsHook +, wrapGAppsHook , gtk3 , xmlto , docbook_xsl @@ -36,6 +37,7 @@ stdenv.mkDerivation rec { autoreconfHook docbook_xsl wrapQtAppsHook + wrapGAppsHook ]; buildInputs = [ @@ -71,7 +73,7 @@ stdenv.mkDerivation rec { dontWrapGApps = true; postFixup = lib.optionalString enableVideo '' - wrapProgram "$out/bin/zbarcam-gtk" "''${gappsWrapperArgs[@]}" + wrapGApp "$out/bin/zbarcam-gtk" wrapQtApp "$out/bin/zbarcam-qt" ''; |