alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

pantheon.gala: 3.2.0 -> 3.3.0

Browse source 
https://github.com/elementary/gala/releases/tag/3.3.0
This commit is contained in:
worldofpeace 2020-04-05 20:04:04 -04:00
parent 51e44cc0ba
commit 9683e64ff5
2 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/desktops/pantheon/desktop/gala/default.nix
View file

@ -26,13 +26,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gala"; pname = "gala";
version = "3.2.0"; version = "3.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "elementary"; owner = "elementary";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1vf55ls3h20zpf0yxb206cijq8nkf89z2lmhccb4i1g2zajd31ix"; sha256 = "02g6x190lylng8d07pwx2bqcc71rq48f0dxh30mgndfii6k21qgs";
}; };
passthru = { passthru = {

30
pkgs/desktops/pantheon/desktop/gala/plugins-dir.patch
View file

@ -1,22 +1,20 @@
diff --git a/meson.build b/meson.build diff --git a/meson.build b/meson.build
index 6b20a60..205699b 100644 index 78113d6..926596c 100644
--- a/meson.build --- a/meson.build
+++ b/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('DATADIR', data_dir)
conf.set_quoted('PKGDATADIR', pkgdata_dir) conf.set_quoted('PKGDATADIR', pkgdata_dir)
conf.set_quoted('PKGLIBDIR', pkglib_dir) -conf.set_quoted('PLUGINDIR', plugins_dir)
-conf.set_quoted('PLUGINSDIR', plugins_dir) +conf.set_quoted('PLUGINDIR', plugins_dir_for_build)
+conf.set_quoted('PLUGINSDIR', '/run/current-system/sw/lib/gala/plugins') conf.set_quoted('RESOURCEPATH', '/org/pantheon/desktop/gala')
conf.set_quoted('RELEASE_NAME', 'Window Manager.')
conf.set_quoted('VERSION', gala_version) conf.set_quoted('VERSION', gala_version)
conf.set_quoted('VERSION_INFO', (is_release ? 'Release' : 'Development')) conf.set_quoted('SCHEMA', 'org.pantheon.desktop.gala')
@@ -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"',