diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2020-04-05 20:04:04 -0400 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2020-04-05 20:39:12 -0400 |
| commit | 9683e64ff5b4a07418c18af4c115f906d02a756d (patch) | |
| tree | c07e3d5cffa699a5ff1d6631be4e5da87f85f764 /pkgs/desktops | |
| parent | 51e44cc0baf9137132d8b4cff96ba4e7d374bc6f (diff) | |
| download | nixlib-9683e64ff5b4a07418c18af4c115f906d02a756d.tar nixlib-9683e64ff5b4a07418c18af4c115f906d02a756d.tar.gz nixlib-9683e64ff5b4a07418c18af4c115f906d02a756d.tar.bz2 nixlib-9683e64ff5b4a07418c18af4c115f906d02a756d.tar.lz nixlib-9683e64ff5b4a07418c18af4c115f906d02a756d.tar.xz nixlib-9683e64ff5b4a07418c18af4c115f906d02a756d.tar.zst nixlib-9683e64ff5b4a07418c18af4c115f906d02a756d.zip | |
pantheon.gala: 3.2.0 -> 3.3.0
https://github.com/elementary/gala/releases/tag/3.3.0
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/pantheon/desktop/gala/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/desktops/pantheon/desktop/gala/plugins-dir.patch | 30 |
2 files changed, 16 insertions, 18 deletions
diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 5791fb5c58f7..643e66aef92f 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "gala"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1vf55ls3h20zpf0yxb206cijq8nkf89z2lmhccb4i1g2zajd31ix"; + sha256 = "02g6x190lylng8d07pwx2bqcc71rq48f0dxh30mgndfii6k21qgs"; }; passthru = { diff --git a/pkgs/desktops/pantheon/desktop/gala/plugins-dir.patch b/pkgs/desktops/pantheon/desktop/gala/plugins-dir.patch index e83308ea5526..f08652e9f630 100644 --- a/pkgs/desktops/pantheon/desktop/gala/plugins-dir.patch +++ b/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') |