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

Jump to bottom

cinnamon.cinnamon-screensaver: init at 4.4.0 #86069

Merged
merged 5 commits into from Sep 5, 2020
Merged

cinnamon.cinnamon-screensaver: init at 4.4.0 #86069

merged 5 commits into from Sep 5, 2020

Conversation

mkg20001
Copy link
Member

@mkg20001 mkg20001 commented Apr 26, 2020 •
edited

Motivation for this change
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.

worldofpeace
worldofpeace reviewed Apr 26, 2020
View reviewed changes
pkgs/data/icons/iso-flags/default.nix
Comment on lines +39 to +38
installPhase = ''
mkdir -p $out/share
mv build $out/share/iso-flags
'';
Copy link
Contributor

Choose a reason for hiding this comment

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

makefile really has no install smh

Copy link
Member Author

Choose a reason for hiding this comment

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

so is this ok? or what should we do?

Copy link
Contributor

Choose a reason for hiding this comment

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

Ideally, we would open a PR adding the install target to https://github.com/joielechong/iso-country-flags-svg-collection/blob/master/Makefile

Copy link
Member Author

Choose a reason for hiding this comment

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

Don't know if that's what the authors intent, as the project is less about installable icon sets, more about generating the resources. It's just the linuxmint team that decided to package it up

worldofpeace
worldofpeace reviewed Apr 26, 2020
View reviewed changes
pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix Outdated
Comment on lines 91 to 105
postFixup = ''
for f in $out/bin/*; do
wrapProgram "$f" "--prefix" "GI_TYPELIB_PATH" ":" "$out/lib/girepository-1.0"
done
'';
Copy link
Contributor

Choose a reason for hiding this comment

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

this should be unneeded if you have gobject-introspection in 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.

it doesn't recognize the typelib in $out

Copy link
Contributor

Choose a reason for hiding this comment

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

It really should https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/gobject-introspection/setup-hook.sh#L21, if not we have a very problematic bug. Do you see giDiscoverSelf in nix log?

Copy link
Member Author

Choose a reason for hiding this comment

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

https://termbin.com/318if
Nope.

@worldofpeace
Copy link
Contributor

And they ported to meson on master linuxmint/cinnamon-screensaver@997ae6a 🤣

@mkg20001
Copy link
Member Author

I already tried to package master, but it seems to be one major ahead and doesn't work with the old stuff

@mkg20001 mkg20001 force-pushed the pkg/cinnamon-screensaver branch 2 times, most recently from 49075ee to e4c4062 Compare May 1, 2020 16:59
@mkg20001
Copy link
Member Author

4.6.0 seems out, so I'd have to update this

@mkg20001
Copy link
Member Author

Unsure how to handle since we'd have a mix of 4.4 on master, 4.4 on my patch branch (stuff that isn't upstreamed) and a bunch of 4.6 stuff

I prefer not breaking my current setup 🤣

@mkg20001
Copy link
Member Author

Getting 4.4 shipped, then updating to 4.6? (All of cinnamon, then)

@worldofpeace
Copy link
Contributor

@ofborg eval

@worldofpeace
Copy link
Contributor

Had to fix release.nix to evaluate 😦

@worldofpeace worldofpeace merged commit 98572a2 into NixOS:master Sep 5, 2020
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

@worldofpeace worldofpeace worldofpeace left review comments

Assignees
No one assigned
Labels
6.topic: cinnamon 8.has: package (new) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@mkg20001 @worldofpeace @jtojnar