diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-08-31 11:57:05 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-09-16 22:04:28 +0000 |
commit | a0842e8b20cbe1ed717b72775428d1f8fc047fa4 (patch) | |
tree | b86d0614a477f7e092d626d59b888d085aaca400 /nixpkgs/pkgs/desktops/gnome-3/apps | |
parent | c36b32d476b520ed0d2a37cd0973f98583d6dc7c (diff) | |
parent | 8d1510abfb592339e13ce8f6db6f29c1f8b72924 (diff) | |
download | nixlib-a0842e8b20cbe1ed717b72775428d1f8fc047fa4.tar nixlib-a0842e8b20cbe1ed717b72775428d1f8fc047fa4.tar.gz nixlib-a0842e8b20cbe1ed717b72775428d1f8fc047fa4.tar.bz2 nixlib-a0842e8b20cbe1ed717b72775428d1f8fc047fa4.tar.lz nixlib-a0842e8b20cbe1ed717b72775428d1f8fc047fa4.tar.xz nixlib-a0842e8b20cbe1ed717b72775428d1f8fc047fa4.tar.zst nixlib-a0842e8b20cbe1ed717b72775428d1f8fc047fa4.zip |
Merge commit '8d1510abfb592339e13ce8f6db6f29c1f8b72924'
Diffstat (limited to 'nixpkgs/pkgs/desktops/gnome-3/apps')
3 files changed, 63 insertions, 78 deletions
diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix index c95d135e9e73..ac1e9ee85c01 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix @@ -1,39 +1,80 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3, glib, gtk3, pango, wrapGAppsHook, python3 -, gobject-introspection, gjs, libunistring, gsettings-desktop-schemas, adwaita-icon-theme, gnome-desktop }: +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, gettext +, gnome3 +, glib +, gtk3 +, pango +, wrapGAppsHook +, python3 +, gobject-introspection +, gjs +, libunistring +, gsettings-desktop-schemas +, adwaita-icon-theme +, gnome-desktop +}: stdenv.mkDerivation rec { - name = "gnome-characters-${version}"; + pname = "gnome-characters"; version = "3.32.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-characters/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-characters/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1mpg125x9k879ryg8xgbm9w1amx6b3iq9sqv7xfii7kzaanjb4js"; }; + nativeBuildInputs = [ + gettext + gobject-introspection + meson + ninja + pkgconfig + python3 + wrapGAppsHook + ]; + + + buildInputs = [ + adwaita-icon-theme + gjs + glib + gnome-desktop # for typelib + gsettings-desktop-schemas + gtk3 + libunistring + pango + ]; + postPatch = '' chmod +x meson_post_install.py # patchShebangs requires executable file patchShebangs meson_post_install.py ''; + dontWrapGApps = true; + + # Fixes https://github.com/NixOS/nixpkgs/issues/31168 + postFixup = '' + for file in $out/share/org.gnome.Characters/org.gnome.Characters \ + $out/share/org.gnome.Characters/org.gnome.Characters.BackgroundService + do + sed -e $"2iimports.package._findEffectiveEntryPointName = () => \'$(basename $file)\' " \ + -i $file + + wrapProgram $file "''${gappsWrapperArgs[@]}" + done + ''; + passthru = { updateScript = gnome3.updateScript { - packageName = "gnome-characters"; - attrPath = "gnome3.gnome-characters"; + packageName = pname; + attrPath = "gnome3.${pname}"; }; }; - nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook python3 gobject-introspection ]; - buildInputs = [ - glib gtk3 gjs pango gsettings-desktop-schemas - adwaita-icon-theme libunistring - # typelib - gnome-desktop - ]; - - mesonFlags = [ - "-Ddbus_service_dir=${placeholder "out"}/share/dbus-1/services" - ]; - meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Design/Apps/CharacterMap; description = "Simple utility application to find and insert unusual characters"; diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix index 2941d629f8f7..4a34f12912f7 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix @@ -1,8 +1,8 @@ { stdenv, meson, ninja, gettext, fetchurl, pkgconfig , wrapGAppsHook, itstool, desktop-file-utils, python3 -, glib, gtk3, evolution-data-server +, glib, gtk3, evolution-data-server, gnome-online-accounts , libuuid, webkitgtk, zeitgeist -, gnome3, libxml2, gsettings-desktop-schemas }: +, gnome3, libxml2, gsettings-desktop-schemas, tracker }: let version = "3.32.2"; @@ -26,8 +26,8 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - glib gtk3 libuuid webkitgtk gnome3.tracker - gnome3.gnome-online-accounts zeitgeist + glib gtk3 libuuid webkitgtk tracker + gnome-online-accounts zeitgeist gsettings-desktop-schemas evolution-data-server gnome3.adwaita-icon-theme diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix deleted file mode 100644 index e5bd4d8b950f..000000000000 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ stdenv, gettext, fetchurl, libxml2, libgdata -, pkgconfig, gtk3, glib, tracker, tracker-miners -, itstool, gegl, babl, libdazzle, gfbgraph, grilo-plugins -, grilo, gnome-online-accounts -, desktop-file-utils, wrapGAppsHook -, gnome3, gdk-pixbuf, gexiv2, geocode-glib -, dleyna-renderer, dbus, meson, ninja, python3, gsettings-desktop-schemas }: - -let - pname = "gnome-photos"; - version = "3.32.0"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "160vqmcqvyzby27wd2lzwzgbfl6jxxk7phhnqh9498r3clr73haj"; - }; - - # doCheck = true; - - nativeBuildInputs = [ - pkgconfig gettext itstool meson ninja libxml2 - desktop-file-utils wrapGAppsHook python3 - ]; - buildInputs = [ - gtk3 glib gegl babl libgdata libdazzle - gsettings-desktop-schemas - gdk-pixbuf gnome3.adwaita-icon-theme - gfbgraph grilo-plugins grilo - gnome-online-accounts tracker - gexiv2 geocode-glib dleyna-renderer - tracker-miners # For 'org.freedesktop.Tracker.Miner.Files' GSettings schema - dbus - ]; - - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Photos; - description = "Access, organize and share your photos"; - maintainers = gnome3.maintainers; - license = licenses.gpl3Plus; - platforms = platforms.linux; - }; -} |