Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5c72219eb303
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b30f86ffc6a5
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Sep 26, 2019

  1. xdg-utils: add missing perl dependencies 

    Or else `xdg-screensaver suspend <WINDOW_ID>` fails with errors like:

  Can't locate Net/DBus.pm in @inc [...]

This increases the closure of xdg-utils from 53 MiB to 119 MiB.

(The issue was found when testing retroarch.)

(cherry picked from commit e584eba)
    @bjornfor
    bjornfor committed Sep 26, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    kraenhansen Kræn Hansen
    SSH Key Fingerprint: Pl/0muSeAJtfZzXTskmf7NspKHTlgrI4SZS/qPTQ5Eg
    Verified
    Learn about vigilant mode
    Copy the full SHA
    60493b4 View commit details

  2. retroarch: 1.7.5 -> 1.7.8.4 

    Fixes missing GUI elements.

(cherry picked from commit bf7a1d6)
    @bjornfor
    bjornfor committed Sep 26, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    kraenhansen Kræn Hansen
    SSH Key Fingerprint: Pl/0muSeAJtfZzXTskmf7NspKHTlgrI4SZS/qPTQ5Eg
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b30f86f View commit details
Showing with 9 additions and 3 deletions.
  1. +2 −2 pkgs/misc/emulators/retroarch/default.nix
  2. +7 −1 pkgs/tools/X11/xdg-utils/default.nix
4 changes: 2 additions & 2 deletions pkgs/misc/emulators/retroarch/default.nix
View file
Original file line number Diff line number Diff line change
@@ -27,12 +27,12 @@ let

in stdenv.mkDerivation rec {
pname = "retroarch-bare";
version = "1.7.5";
version = "1.7.8.4";

src = fetchFromGitHub {
owner = "libretro";
repo = "RetroArch";
sha256 = "1jfpgl34jjxn3dvxd1kd564swkw7v98hnn562v998b7vllz3dxdm";
sha256 = "1i3i23xwvmck8k2fpalr49np7xjzfg507243mybqrljawlnbxvph";
rev = "v${version}";
};

8 changes: 7 additions & 1 deletion pkgs/tools/X11/xdg-utils/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchFromGitHub
, file, libxslt, docbook_xml_dtd_412, docbook_xsl, xmlto
, w3m, gnugrep, gnused, coreutils, xset
, w3m, gnugrep, gnused, coreutils, xset, perlPackages
, mimiSupport ? false, gawk ? null }:

assert mimiSupport -> gawk != null;
@@ -13,6 +13,11 @@ let
rev = "8e0070f17bcd3612ee83cb84e663e7c7fabcca3d";
sha256 = "15gw2nyrqmdsdin8gzxihpn77grhk9l97jp7s7pr7sl4n9ya2rpj";
};

perlPath = with perlPackages; makePerlPath [
NetDBus XMLTwig XMLParser X11Protocol
];

in

stdenv.mkDerivation rec {
@@ -39,6 +44,7 @@ stdenv.mkDerivation rec {
awk() { ${gawk}/bin/awk "$@"; }\
sort() { ${coreutils}/bin/sort "$@"; }\
xset() { ${xset}/bin/xset "$@"; }\
perl() { PERL5LIB=${perlPath} ${perlPackages.perl}/bin/perl "$@"; }\
&#' -i "$out"/bin/*
substituteInPlace $out/bin/xdg-open \