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

Commits on Nov 17, 2018

  1. desktop-file-utils: use patch for font media type 

    Upstream seems to release very slowly - this commit has been in for some
time, but they haven't cut a new release.

Fixes #50402.
    @michaelpj
    michaelpj committed Nov 17, 2018
    Copy the full SHA
    a953f01 View commit details

  2. Merge pull request #50493 from michaelpj/imp/desktop-file-utils-patch 

    desktop-file-utils: use patch for font media type
    @c0bw3b
    c0bw3b authored Nov 17, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    93b6863 View commit details
Showing with 9 additions and 1 deletion.
  1. +9 −1 pkgs/tools/misc/desktop-file-utils/default.nix
10 changes: 9 additions & 1 deletion pkgs/tools/misc/desktop-file-utils/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, glib, libintl }:
{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, libintl }:

with stdenv.lib;

@@ -10,6 +10,14 @@ stdenv.mkDerivation rec {
sha256 = "119kj2w0rrxkhg4f9cf5waa55jz1hj8933vh47vcjipcplql02bc";
};

patches = [
# Makes font a recognized media type. Committed upstream, but no release has been made.
(fetchpatch {
url = "https://gitlab.freedesktop.org/xdg/desktop-file-utils/commit/92af4108750ceaf4191fd54e255885c7d8a78b70.patch";
sha256 = "14sqy10p5skp6hv4hgiwnj9hpr460250x42k5z0390l6nr6gahsq";
})
];

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glib libintl ];