mate-desktop: some fixes, improvements, and new packages #33039
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
romildo
changed the title
romildo
changed the title
GrahamcOfBorg
added
10.rebuild-darwin: 1-10
10.rebuild-linux: 11-100
and removed
10.rebuild-darwin: 0
10.rebuild-linux: 1-10
labels
…op_schemas Now it is propagated by gtk3.
mate-control-center depends on mate-settings-daemon, but the later needs gsettings schemas provided by the former. To fix this the gsettings schema path from mate-control-center is added to XDG_DATA_DIRS at session startup.
GrahamcOfBorg
added
10.rebuild-darwin: 11-100
and removed
10.rebuild-darwin: 1-10
labels
There is a bug on the glib hooker that prevents running its pre fixup phase if it is listed before hicolor_icon_theme in the dependencies of a derivation.
dezgeg
reviewed
Jan 8, 2018
| pythonPackages.pygobject3 | ||
| ]; | ||
|
|
||
| configureFlags = [ "--with-cajadir=$$out/lib/caja/extensions-2.0" ]; |
There was a problem hiding this comment.
Does this actually eventualy get expanded correctly? Usually it's done like this:
preConfigure = ''
configureFlagsArray+=("--with-cajadir=$$out/lib/caja/extensions-2.0")
'';
There was a problem hiding this comment.
It is working here and in other packages too.
$ nix-build --option build-use-chroot true -K -A mate.python-caja 2>&1 | tee /var/tmp/nix-build.log
[...]
Libraries have been installed in:
/nix/store/72q7hql2lwwmgqm5jd3lr896mqkv53fq-python-caja-1.18.1/lib/caja/extensions-2.0
[...]
$ find . -type f -exec grep --color -nH -e 'configureFlags.*\$\$' {} +
./pkgs/desktops/mate/python-caja/default.nix:27: configureFlags = [ "--with-cajadir=$$out/lib/caja/extensions-2.0" ];
./pkgs/desktops/mate/python-caja/default.nix~:26: configureFlags = [ "--with-caja-extension-dir=$$out/lib/caja/extensions-2.0" ];
./pkgs/desktops/mate/caja-dropbox/default.nix:26: configureFlags = [ "--with-caja-extension-dir=$$out/lib/caja/extensions-2.0" ];
./pkgs/desktops/mate/caja-dropbox/default.nix~:34: configureFlags = [ "--with-cajadir=$$out/lib/caja/extensions-2.0" ];
./pkgs/desktops/mate/engrampa/default.nix:29: configureFlags = [ "--with-cajadir=$$out/lib/caja/extensions-2.0" ];
./pkgs/desktops/mate/caja-extensions/default.nix:35: configureFlags = [ "--with-cajadir=$$out/lib/caja/extensions-2.0" ];
./pkgs/applications/editors/emacs-modes/maude/default.nix:12: configureFlags = "--with-lispdir=$$out/share/emacs/site-lisp";
./pkgs/applications/editors/emacs-modes/bbdb/default.nix:15: configureFlags = "--with-package-dir=$$out/share/emacs/site-lisp";
./pkgs/development/libraries/libmtp/default.nix:17: configureFlags = [ "--with-udev=$$bin/lib/udev" ];
There was a problem hiding this comment.
Searching for '$$' in nix files shows several other cases of using '$$' in configureFlags.
There was a problem hiding this comment.
Ok, fair enough. But it really is a bad pattern to do, it's a completely unpredictable whether it's going to work or not, or even fail silently.
For example before commit 3d59a8e ncurses appeared to build fine, but the pkgconfig file was wrong, containing unexpanded $(out) / $$out etc.
There was a problem hiding this comment.
In the next updates I can abandon this bad pattern and follow your suggestion.
|
Nice work! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)