← Back to branch summary

~sergiusens/snapcraft/1500505

« back to all changes in this revision

Viewing changes to snapcraft/plugins/qml.py

  • Committer: Snappy Tarmac
  • Author(s): Daniel Holbach, Leo Arias
  • Date: 2015-10-05 19:54:20 UTC
  • mfrom: (231.1.9 fix-pep8-and-doc-indentation)
  • Revision ID: snappy_tarmac-20151005195420-w1ql5nndj5413sb5
Fix markdown indentation, make pep8 and pyflakes3 happy. by elopio approved by elopio

Show diffs side-by-side

added added

removed removed

Lines of Context:
snapcraft/plugins/qml.py
81
81
            "LD_LIBRARY_PATH=%s/usr/lib/%s:$LD_LIBRARY_PATH" % (root, arch),
82
82
            # Mir config
83
83
            "MIR_SOCKET=/run/mir_socket",
84
 
            "MIR_CLIENT_PLATFORM_PATH=%s/usr/lib/%s/mir/client-platform" % (root, arch),
 
84
            "MIR_CLIENT_PLATFORM_PATH={}/usr/lib/{}/mir/client-platform"
 
85
            .format(root, arch),
85
86
            # XKB config
86
87
            "XKB_CONFIG_ROOT=%s/usr/share/X11/xkb" % root,
87
88
            # Qt Platform to Mir
89
90
            "QTCHOOSER_NO_GLOBAL_DIR=1",
90
91
            "QT_SELECT=snappy-qt5",
91
92
            # Qt Libs
92
 
            "LD_LIBRARY_PATH=%s/usr/lib/%s/qt5/libs:$LD_LIBRARY_PATH" % (root, arch),
93
 
            "LD_LIBRARY_PATH=%s/usr/lib/%s/pulseaudio:$LD_LIBRARY_PATH" % (root, arch),
 
93
            "LD_LIBRARY_PATH={}/usr/lib/{}/qt5/libs:$LD_LIBRARY_PATH"
 
94
            .format(root, arch),
 
95
            "LD_LIBRARY_PATH={}/usr/lib/{}/pulseaudio:$LD_LIBRARY_PATH"
 
96
            .format(root, arch),
94
97
            # Qt Modules
95
98
            "QT_PLUGIN_PATH=%s/usr/lib/%s/qt5/plugins" % (root, arch),
96
99
            "QML2_IMPORT_PATH=%s/usr/lib/%s/qt5/qml" % (root, arch),
97
100
            # Mesa Libs
98
 
            "LD_LIBRARY_PATH=%s/usr/lib/%s/mesa:$LD_LIBRARY_PATH" % (root, arch),
99
 
            "LD_LIBRARY_PATH=%s/usr/lib/%s/mesa-egl:$LD_LIBRARY_PATH" % (root, arch),
 
101
            "LD_LIBRARY_PATH={}/usr/lib/{}/mesa:$LD_LIBRARY_PATH"
 
102
            .format(root, arch),
 
103
            "LD_LIBRARY_PATH={}/usr/lib/{}/mesa-egl:$LD_LIBRARY_PATH"
 
104
            .format(root, arch),
100
105
            # XDG Config
101
106
            "XDG_CONFIG_DIRS=%s/etc/xdg:$XDG_CONFIG_DIRS" % root,
102
107
            "XDG_CONFIG_DIRS=%s/usr/xdg:$XDG_CONFIG_DIRS" % root,