about summary refs log tree commit diff
path: root/pkgs/misc
diff options
context:
space:
mode:
authorNikolay Amiantov <ab@fmap.me>2017-06-04 00:58:42 +0300
committerGitHub <noreply@github.com>2017-06-04 00:58:42 +0300
commit0011f9065a1ad1da4db67bec8d535d91b0a78fba (patch)
tree58b2a284a2fe864689d43601d1f067d35f8adb14 /pkgs/misc
parent0dc54737306051cf8649394b96f5e9513616fa8b (diff)
parente7530e6a5a1d8858e48f1a2c7ea90a5b6aba9478 (diff)
downloadnixlib-0011f9065a1ad1da4db67bec8d535d91b0a78fba.tar
nixlib-0011f9065a1ad1da4db67bec8d535d91b0a78fba.tar.gz
nixlib-0011f9065a1ad1da4db67bec8d535d91b0a78fba.tar.bz2
nixlib-0011f9065a1ad1da4db67bec8d535d91b0a78fba.tar.lz
nixlib-0011f9065a1ad1da4db67bec8d535d91b0a78fba.tar.xz
nixlib-0011f9065a1ad1da4db67bec8d535d91b0a78fba.tar.zst
nixlib-0011f9065a1ad1da4db67bec8d535d91b0a78fba.zip
Merge pull request #26152 from abbradar/wine-reorder
wine: reorganize packages
Diffstat (limited to 'pkgs/misc')
-rw-r--r--pkgs/misc/emulators/wine/base.nix10
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix
index 80070dec2d91..92815ffaa0af 100644
--- a/pkgs/misc/emulators/wine/base.nix
+++ b/pkgs/misc/emulators/wine/base.nix
@@ -91,9 +91,13 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
           ((map (links "share/wine/gecko") geckos)
         ++ (map (links "share/wine/mono")  monos))}
   '' + lib.optionalString supportFlags.gstreamerSupport ''
-    wrapProgram "$out/bin/wine" \
-      --argv0 "" \
-      --prefix GST_PLUGIN_SYSTEM_PATH_1_0 ":" "$GST_PLUGIN_SYSTEM_PATH_1_0"
+    for i in wine wine64; do
+      if [ -e "$out/bin/$i" ]; then
+        wrapProgram "$out/bin/$i" \
+          --argv0 "" \
+          --prefix GST_PLUGIN_SYSTEM_PATH_1_0 ":" "$GST_PLUGIN_SYSTEM_PATH_1_0"
+      fi
+    done
   '';
   
   enableParallelBuilding = true;