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: 5cc156966192
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 09cc9dea29be
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 9, 2019

  1. libgdata: remove obsolete cflags fix

    @hedning
    hedning committed Mar 9, 2019
    Copy the full SHA
    cdcec26 View commit details

  2. fixup! gnome3.gnome-desktop: 3.30.2.1 -> 3.31.92

    @hedning
    hedning committed Mar 9, 2019
    Copy the full SHA
    09cc9de View commit details
Showing with 0 additions and 7 deletions.
  1. +0 −5 pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
  2. +0 −2 pkgs/development/libraries/libgdata/default.nix
5 changes: 0 additions & 5 deletions pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
View file
Original file line number Diff line number Diff line change
@@ -34,11 +34,6 @@ stdenv.mkDerivation rec {
bubblewrap_bin = "${bubblewrap}/bin/bwrap";
inherit (builtins) storeDir;
})
(fetchpatch {
name = "fix-missing-font-cache";
url = https://gitlab.gnome.org/GNOME/gnome-desktop/commit/b87de7495160dbf48f01aa1ddb361fc2556ffd0c.patch;
sha256 = "1aw7lw93kcflmqmbx25cwja25441i8xzvgjm1pfsxvw3vr8j6scb";
})
];

mesonFlags = [
2 changes: 0 additions & 2 deletions pkgs/development/libraries/libgdata/default.nix
View file
Original file line number Diff line number Diff line change
@@ -10,8 +10,6 @@ stdenv.mkDerivation rec {
sha256 = "0fj54yqxdapdppisqm1xcyrpgcichdmipq0a0spzz6009ikzgi45";
};

NIX_CFLAGS_COMPILE = "-I${gnome3.libsoup.dev}/include/libsoup-gnome-2.4/ -I${gcr}/include/gcr-3 -I${gcr}/include/gck-1";

nativeBuildInputs = [ pkgconfig intltool gobject-introspection ];

buildInputs = [ gnome3.libsoup libxml2 glib liboauth gcr gnome3.gnome-online-accounts p11-kit openssl uhttpmock ];