Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0390f5939d9c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 84145de7b2cc
Choose a head ref
  • 2 commits
  • 4 files changed
  • 1 contributor

Commits on Mar 10, 2019

  1. squash! gnome3.gnome-sound-recorder: 3.28.2 -> 3.31.92

    @hedning
    hedning committed Mar 10, 2019
    Copy the full SHA
    0c8ce11 View commit details

  2. squash! gnome3.gedit: 3.30.2 -> 3.31.92

    @hedning
    hedning committed Mar 10, 2019
    Copy the full SHA
    84145de View commit details
15 changes: 0 additions & 15 deletions pkgs/desktops/gnome-3/apps/gedit/block-update-desktop.patch
View file

This file was deleted.

9 changes: 2 additions & 7 deletions pkgs/desktops/gnome-3/apps/gedit/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
, pkgconfig, gtk3, glib, adwaita-icon-theme
, libpeas, gtksourceview4, gsettings-desktop-schemas
, wrapGAppsHook, ninja, libsoup, libxml2
, gnome3, gspell, perl, itstool }:
, gnome3, gspell, perl, itstool, desktop-file-utils }:

stdenv.mkDerivation rec {
name = "gedit-${version}";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [
pkgconfig wrapGAppsHook meson ninja libxml2
python3 perl itstool
python3 perl itstool desktop-file-utils
];

buildInputs = [
@@ -25,11 +25,6 @@ stdenv.mkDerivation rec {
gsettings-desktop-schemas gspell
];

patches = [
# Do not update desktop database
./block-update-desktop.patch
];

postPatch = ''
chmod +x build-aux/meson/post_install.py
chmod +x plugins/externaltools/scripts/gedit-tool-merge.pl
8 changes: 2 additions & 6 deletions pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, gettext, gobject-introspection, wrapGAppsHook, gjs, glib, gtk3, gdk_pixbuf, gst_all_1, gnome3
, meson, ninja, python3, hicolor-icon-theme }:
, meson, ninja, python3, hicolor-icon-theme, desktop-file-utils }:

stdenv.mkDerivation rec {
pname = "gnome-sound-recorder";
@@ -12,14 +12,10 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [
pkgconfig gettext meson ninja gobject-introspection
wrapGAppsHook python3 hicolor-icon-theme
wrapGAppsHook python3 hicolor-icon-theme desktop-file-utils
];
buildInputs = [ gjs glib gtk3 gdk_pixbuf ] ++ (with gst_all_1; [ gstreamer.dev gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]);

patches = [
./fix-post-install.patch
];

postPatch = ''
chmod +x build-aux/meson_post_install.py
patchShebangs build-aux/meson_post_install.py
11 changes: 0 additions & 11 deletions pkgs/desktops/gnome-3/apps/gnome-sound-recorder/fix-post-install.patch
View file

This file was deleted.