diff options
Diffstat (limited to 'nixpkgs/pkgs/desktops/pantheon/desktop/gala/plugins-dir.patch')
| -rw-r--r-- | nixpkgs/pkgs/desktops/pantheon/desktop/gala/plugins-dir.patch | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/gala/plugins-dir.patch b/nixpkgs/pkgs/desktops/pantheon/desktop/gala/plugins-dir.patch index e83308ea5526..f08652e9f630 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/gala/plugins-dir.patch +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/gala/plugins-dir.patch @@ -1,22 +1,20 @@ diff --git a/meson.build b/meson.build -index 6b20a60..205699b 100644 +index 78113d6..926596c 100644 --- a/meson.build +++ b/meson.build -@@ -38,7 +38,7 @@ conf.set_quoted('PACKAGE_VERSION', gala_version) +@@ -24,13 +24,14 @@ vapi_dir = meson.current_source_dir() / 'vapi' + + data_dir = join_paths(get_option('prefix'), get_option('datadir')) + plugins_dir = join_paths(get_option('prefix'), get_option('libdir'), meson.project_name(), 'plugins') ++plugins_dir_for_build = join_paths('/run/current-system/sw/lib/', meson.project_name(), 'plugins') + pkgdata_dir = join_paths(get_option('prefix'), get_option('datadir'), meson.project_name()) + pkglib_dir = join_paths(get_option('prefix'), get_option('libdir'), meson.project_name()) + + conf = configuration_data() conf.set_quoted('DATADIR', data_dir) conf.set_quoted('PKGDATADIR', pkgdata_dir) - conf.set_quoted('PKGLIBDIR', pkglib_dir) --conf.set_quoted('PLUGINSDIR', plugins_dir) -+conf.set_quoted('PLUGINSDIR', '/run/current-system/sw/lib/gala/plugins') - conf.set_quoted('RELEASE_NAME', 'Window Manager.') +-conf.set_quoted('PLUGINDIR', plugins_dir) ++conf.set_quoted('PLUGINDIR', plugins_dir_for_build) + conf.set_quoted('RESOURCEPATH', '/org/pantheon/desktop/gala') conf.set_quoted('VERSION', gala_version) - conf.set_quoted('VERSION_INFO', (is_release ? 'Release' : 'Development')) -@@ -83,7 +83,7 @@ add_project_arguments([ - '-DDATADIR="@0@"'.format(data_dir), - '-DPKGDATADIR="@0@"'.format(pkgdata_dir), - '-DPKGLIBDIR="@0@"'.format(pkglib_dir), -- '-DPLUGINDIR="@0@"'.format(plugins_dir), -+ '-DPLUGINDIR="@0@"'.format('/run/current-system/sw/lib/gala/plugins'), - '-DSCHEMA="org.pantheon.desktop.gala"', - '-DRESOURCEPATH="/org/pantheon/desktop/gala"', - + conf.set_quoted('SCHEMA', 'org.pantheon.desktop.gala') |