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

skypeforlinux: Add GSettings schemas #44652

Merged
merged 5 commits into from
Aug 19, 2018
Merged

skypeforlinux: Add GSettings schemas #44652

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7ff92cc
skypeforlinux: add gsettings
zgrannan Aug 7, 2018
daf214d
Use wrapGAppsHook
zgrannan Aug 9, 2018
7bc7289
Move gtk3 to buildInputs
zgrannan Aug 12, 2018
59fc5ab
remove makeWrapper
zgrannan Aug 12, 2018
cd541bd
Use glib instead of gtk3
zgrannan Aug 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, dpkg, makeWrapper
, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, glibc, gnome3
, gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, xorg }:
, gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook, xorg }:

let

Expand Down Expand Up @@ -68,7 +68,9 @@ in stdenv.mkDerivation {

inherit src;

buildInputs = [ dpkg makeWrapper ];
nativeBuildInputs = [ wrapGAppsHook ];

buildInputs = [ dpkg gtk3 makeWrapper ];
Copy link
Member

@jtojnar jtojnar Aug 12, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

Alright, you do not need gtk3 but glib’s setup hooks. Could you add it to nativeBuildInputs with a comment “for setup hook populating GSETTINGS_SCHEMAS_PATH”?

Copy link
Member

Choose a reason for hiding this comment

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

Also makeWrapper is not used.


unpackPhase = "true";
installPhase = ''
Expand All @@ -78,6 +80,8 @@ in stdenv.mkDerivation {
rm -rf $out/opt $out/usr
rm $out/bin/skypeforlinux

ln -s "$out/share/skypeforlinux/skypeforlinux" "$out/bin/skypeforlinux"

# Otherwise it looks "suspicious"
chmod -R g-w $out
'';
Expand All @@ -88,8 +92,6 @@ in stdenv.mkDerivation {
patchelf --set-rpath ${rpath}:$out/share/skypeforlinux $file || true
done

ln -s "$out/share/skypeforlinux/skypeforlinux" "$out/bin/skypeforlinux"

# Fix the desktop link
substituteInPlace $out/share/applications/skypeforlinux.desktop \
--replace /usr/bin/ $out/bin/ \
Expand Down