Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

pantheon-terminal: fixes "Using the 'memory' GSettings backend" issue #37896

Merged
merged 1 commit into from Mar 27, 2018
Merged

pantheon-terminal: fixes "Using the 'memory' GSettings backend" issue #37896

merged 1 commit into from Mar 27, 2018

Conversation

davidak
Copy link
Member

@davidak davidak commented Mar 26, 2018 •
edited

Motivation for this change

fix annoying issue

/cc @jtojnar

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@davidak davidak changed the title pantheon-terminal: fixes #10171 Using the 'memory' GSettings backend pantheon-terminal: fixes "Using the 'memory' GSettings backend" issue Mar 26, 2018
jtojnar
jtojnar reviewed Mar 26, 2018
View reviewed changes
pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix Outdated
@@ -16,7 +16,8 @@ stdenv.mkDerivation rec {
preFixup = ''
for f in $out/bin/*; do
wrapProgram $f \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$XDG_ICON_DIRS:$out/share"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you use wrapGAppsHook instead?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sure

@jtojnar
Copy link
Contributor

jtojnar commented Mar 26, 2018

Also the preConfigure attribute is not necessary, it points to a wrong path anyway.

@davidak davidak force-pushed the pantheon-terminal-1 branch 2 times, most recently from 56ca893 to d7b738e Compare March 26, 2018 22:48
jtojnar
jtojnar reviewed Mar 27, 2018
View reviewed changes
pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix Outdated
# For setup hook
gobjectIntrospection
];
buildInputs = with gnome3; [
glib gtk3 granite libnotify gettext vte_290 libgee
gsettings-desktop-schemas defaultIconTheme
gsettings-desktop-schemas defaultIconTheme wrapGAppsHook
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should go to nativeBuildInputs.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changed and tested.

@jtojnar
Copy link
Contributor

jtojnar commented Mar 27, 2018

@GrahamcOfBorg build pantheon.pantheon-terminal

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: pantheon.pantheon-terminal

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: pantheon.pantheon-terminal

Partial log (click to expand)

glibPreFixupPhase
hicolorPreFixupPhase
post-installation fixup
Wrapping program /nix/store/gri4bmwqvbxl05hm7yxkszi94qfzci9c-pantheon-terminal-0.4.3/bin/pantheon-terminal
shrinking RPATHs of ELF executables and libraries in /nix/store/gri4bmwqvbxl05hm7yxkszi94qfzci9c-pantheon-terminal-0.4.3
shrinking /nix/store/gri4bmwqvbxl05hm7yxkszi94qfzci9c-pantheon-terminal-0.4.3/bin/.pantheon-terminal-wrapped
strip is /nix/store/fzcs0fn6bb04m82frhlb78nc03ny3w55-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/gri4bmwqvbxl05hm7yxkszi94qfzci9c-pantheon-terminal-0.4.3/bin
patching script interpreter paths in /nix/store/gri4bmwqvbxl05hm7yxkszi94qfzci9c-pantheon-terminal-0.4.3
checking for references to /build in /nix/store/gri4bmwqvbxl05hm7yxkszi94qfzci9c-pantheon-terminal-0.4.3...

@jtojnar jtojnar merged commit 1ed3c93 into NixOS:master Mar 27, 2018
@davidak davidak deleted the pantheon-terminal-1 branch March 27, 2018 22:31
@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: pantheon.pantheon-terminal

Partial log (click to expand)

   Compiling rustc_privacy v0.0.0 (file:///build/rustc-1.24.0-src/src/librustc_privacy)
   Compiling rustc_save_analysis v0.0.0 (file:///build/rustc-1.24.0-src/src/librustc_save_analysis)
building of '/nix/store/6mm6pr840z429p4l9mk62gh7mr6khj3k-rustc-1.24.0.drv' timed out after 3600 seconds
cannot build derivation '/nix/store/68kg61kq3qlbfxdjan2s7hrd0fidyxri-cargo-0.24.0.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/2fvhpqf8jjcdzvifkpipb5r41pwvxl2d-librsvg-2.42.2.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/92wjazfxwjpwv6zkqr6xkdxcy1illhny-hook.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/v3lcrkp75gsvzdamwgdnfz802q8hvph6-icon-naming-utils-0.8.90.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/jd99116aq5lriwnh7v0sx6iz3j3wlwxw-adwaita-icon-theme-3.28.0.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/0i43mhvcq1137n3a17wp7i6i0v9w2lh2-pantheon-terminal-0.4.3.drv': 2 dependencies couldn't be built
�[31;1merror:�[0m build of '/nix/store/0i43mhvcq1137n3a17wp7i6i0v9w2lh2-pantheon-terminal-0.4.3.drv' failed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jtojnar jtojnar jtojnar left review comments

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@davidak @jtojnar @GrahamcOfBorg