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

Commits on Oct 9, 2020

  1. xdg-desktop-portal-gtk: 1.7.1 → 1.8.0 

    https://github.com/flatpak/xdg-desktop-portal-gtk/releases/tag/1.8.0

Also correct license and stop using pkg-config alias.
    @jtojnar
    jtojnar committed Oct 9, 2020
    Copy the full SHA
    ddbd818 View commit details

  2. Merge pull request #100100 from jtojnar/xdg-desktop-portal-gtk-1.8 

    xdg-desktop-portal-gtk: 1.7.1 → 1.8.0
    @jtojnar
    jtojnar authored Oct 9, 2020
    Copy the full SHA
    7a074c9 View commit details
Showing with 5 additions and 5 deletions.
  1. +5 −5 pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
10 changes: 5 additions & 5 deletions pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv
, fetchFromGitHub
, autoreconfHook
, pkgconfig
, pkg-config
, libxml2
, xdg-desktop-portal
, gtk3
@@ -13,19 +13,19 @@

stdenv.mkDerivation rec {
pname = "xdg-desktop-portal-gtk";
version = "1.7.1";
version = "1.8.0";

src = fetchFromGitHub {
owner = "flatpak";
repo = pname;
rev = version;
sha256 = "183iha9dxmvprn99ymgz17jx1lyn1fj5jyj6ghxl716zn9mxmird";
sha256 = "0987fwsdgkcd3mh3scvg2kyg4ay1rr5w16js4pl3pavw9yhl9lbi";
};

nativeBuildInputs = [
autoreconfHook
libxml2
pkgconfig
pkg-config
wrapGAppsHook
xdg-desktop-portal
];
@@ -42,6 +42,6 @@ stdenv.mkDerivation rec {
description = "Desktop integration portals for sandboxed apps";
maintainers = with maintainers; [ jtojnar ];
platforms = platforms.linux;
license = licenses.lgpl21;
license = licenses.lgpl2Plus;
};
}