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.

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

obsidian: init at 0.7.3 #91454

Merged
merged 6 commits into from Jun 27, 2020
Merged

obsidian: init at 0.7.3 #91454

merged 6 commits into from Jun 27, 2020

Conversation

ConradMearns
Copy link
Contributor

Motivation for this change

Adds Obsidian editor version 0.7.3 (#89089)

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@@ -19,6 +19,9 @@ appimageTools.wrapType2 rec {
export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
'';

# Strip version from binary name.
extraInstallCommands = "mv $out/bin/${name} $out/bin/${pname}";
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I get mixed results with this... When running nix-build -A obsidian from the root of my cloned nixpkgs folder, the operation works correctly. However, in my /etc/nixos/config, if I import my custom branch and include obsidian, then it remains obsidian-0.7.3

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Found a good example in the notable package. Tested the fix on a seperate branch, got the expected name.

@Ma27 Ma27 merged commit c0c786c into NixOS:master Jun 27, 2020
eliandoran added a commit to eliandoran/nixpkgs that referenced this pull request Dec 30, 2021
Apparently the last attempt to use `wrapGAppsHook` into `extraPkgs`
failed to solve the issue. Found in NixOS#91454 a potential solution
that might also work here.
eliandoran added a commit to eliandoran/nixpkgs that referenced this pull request Dec 30, 2021
commit 2d26a73
Author: Elian Doran <contact@eliandoran.me>
Date:   Wed Dec 29 02:00:18 2021 +0200

    keeweb: Use alternative solution for GSettings

    Apparently the last attempt to use `wrapGAppsHook` into `extraPkgs`
    failed to solve the issue. Found in NixOS#91454 a potential solution
    that might also work here.

commit 9ea5fde
Author: Elian Doran <contact@eliandoran.me>
Date:   Wed Dec 29 01:52:19 2021 +0200

    keeweb: Fix open/save dialogs by wrapping GSettings
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants