diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2017-09-05 10:11:06 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-09-05 10:11:06 +0200 |
commit | d7ef196c26d3aff394da21122a8c4d08066aef7c (patch) | |
tree | 33a50d79d2918172b9afeb2ba8b7623cb1fd606d /pkgs/desktops/gnome-3 | |
parent | 2b928b477519afdef86f14a32770fd35fff86ae5 (diff) | |
parent | a9e60689f48a97e0067c6a8312895e4ee7e66620 (diff) | |
download | nixpkgs-d7ef196c26d3aff394da21122a8c4d08066aef7c.tar nixpkgs-d7ef196c26d3aff394da21122a8c4d08066aef7c.tar.gz nixpkgs-d7ef196c26d3aff394da21122a8c4d08066aef7c.tar.bz2 nixpkgs-d7ef196c26d3aff394da21122a8c4d08066aef7c.tar.lz nixpkgs-d7ef196c26d3aff394da21122a8c4d08066aef7c.tar.xz nixpkgs-d7ef196c26d3aff394da21122a8c4d08066aef7c.tar.zst nixpkgs-d7ef196c26d3aff394da21122a8c4d08066aef7c.zip |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/desktops/gnome-3')
-rw-r--r-- | pkgs/desktops/gnome-3/3.24/misc/gpaste/default.nix | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/3.24/misc/gpaste/default.nix index 2bfc6c73eb4..a43f9206cdd 100644 --- a/pkgs/desktops/gnome-3/3.24/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome-3/3.24/misc/gpaste/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, vala_0_32, glib, gjs, mutter -, pango, gtk3, gnome3, dbus, clutter, appstream-glib, makeWrapper, systemd, gobjectIntrospection }: +{ stdenv, fetchurl, autoreconfHook, pkgconfig, vala, glib, gjs, mutter +, pango, gtk3, gnome3, dbus, clutter, appstream-glib, wrapGAppsHook, systemd, gobjectIntrospection }: stdenv.mkDerivation rec { version = "3.24.2"; @@ -10,9 +10,10 @@ stdenv.mkDerivation rec { sha256 = "16142jfpkz8qfs7zp9k3c5l9pnvxbr5yygj8jdpx6by1142s6340"; }; - buildInputs = [ autoreconfHook pkgconfig vala_0_32 glib gjs mutter + nativeBuildInputs = [ autoreconfHook pkgconfig vala wrapGAppsHook ]; + buildInputs = [ glib gjs mutter gnome3.adwaita-icon-theme gtk3 gnome3.gnome_control_center dbus - clutter pango appstream-glib makeWrapper systemd gobjectIntrospection ]; + clutter pango appstream-glib systemd gobjectIntrospection ]; configureFlags = [ "--with-controlcenterdir=$(out)/gnome-control-center/keybindings" "--with-dbusservicesdir=$(out)/share/dbus-1/services" @@ -20,19 +21,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - preFixup = - let - libPath = stdenv.lib.makeLibraryPath - [ glib gtk3 clutter pango ]; - in - '' - for i in $out/libexec/gpaste/*; do - wrapProgram $i \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" - done - ''; - meta = with stdenv.lib; { homepage = https://github.com/Keruspe/GPaste; description = "Clipboard management system with GNOME3 integration"; |