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

Commits on Mar 20, 2018

  1. steam: add dependencies for Surviving Mars 

    (cherry picked from commit 7921618)
    @abbradar
    abbradar committed Mar 20, 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
    69e8d7d View commit details

  2. xdg_utils: fix xdg-screensaver 

    (cherry picked from commit ab67f36)
    @abbradar
    abbradar committed Mar 20, 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
    97a2621 View commit details
Showing with 6 additions and 1 deletion.
  1. +4 −0 pkgs/games/steam/chrootenv.nix
  2. +2 −1 pkgs/tools/X11/xdg-utils/default.nix
4 changes: 4 additions & 0 deletions pkgs/games/steam/chrootenv.nix
View file
Original file line number Diff line number Diff line change
@@ -109,6 +109,7 @@ in buildFHSUserEnv rec {
networkmanager098

# Verified games requirements
xorg.libXt
xorg.libXmu
xorg.libxcb
libGLU
@@ -121,6 +122,9 @@ in buildFHSUserEnv rec {
openssl
libidn
tbb
wayland
mesa_noglu
libxkbcommon

# Other things from runtime
flac
3 changes: 2 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, which, gnugrep, gnused, coreutils
, w3m, which, gnugrep, gnused, coreutils, xset
, mimiSupport ? false, gawk ? null }:

assert mimiSupport -> gawk != null;
@@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
file() { ${file}/bin/file "$@"; }\
awk() { ${gawk}/bin/awk "$@"; }\
sort() { ${coreutils}/bin/sort "$@"; }\
xset() { ${xset}/bin/xset "$@"; }\
&#' -i "$out"/bin/*
substituteInPlace $out/bin/xdg-open \