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: 238554904f07
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: eb5a7a5bf978
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on May 20, 2018

  1. nixos/cjdns: fix service for i686 (#40740) 

    service failed to start because of MemoryDenyWriteExecute = true,
which seems not to work on i686

(cherry picked from commit f4ec18a)
    @xeji
    xeji committed May 20, 2018
    Copy the full SHA
    7dac244 View commit details

  2. Merge #37636: wrapFirefox: update icon location 

    (cherry picked from commit 6ca5577)
Fixes #38536.
    @vcunat
    Thomas Tuegel authored and vcunat committed May 20, 2018
    Copy the full SHA
    eb5a7a5 View commit details
Showing with 7 additions and 4 deletions.
  1. +2 −1 nixos/modules/services/networking/cjdns.nix
  2. +5 −3 pkgs/applications/networking/browsers/firefox/wrapper.nix
3 changes: 2 additions & 1 deletion nixos/modules/services/networking/cjdns.nix
View file
Original file line number Diff line number Diff line change
@@ -260,7 +260,8 @@ in
RestartSec = 1;
CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_RAW CAP_SETUID";
ProtectSystem = true;
MemoryDenyWriteExecute = true;
# Doesn't work on i686, causing service to fail
MemoryDenyWriteExecute = !pkgs.stdenv.isi686;
ProtectHome = true;
PrivateTmp = true;
};
8 changes: 5 additions & 3 deletions pkgs/applications/networking/browsers/firefox/wrapper.nix
View file
Original file line number Diff line number Diff line change
@@ -130,9 +130,11 @@ let
mkdir -p "$out/share"
ln -s "${browser}/share/icons" "$out/share/icons"
else
mkdir -p "$out/share/icons/hicolor/128x128/apps"
ln -s "${browser}/lib/${browserName}-"*"/browser/icons/mozicon128.png" \
"$out/share/icons/hicolor/128x128/apps/${browserName}.png"
for res in 16 32 48 64 128; do
mkdir -p "$out/share/icons/hicolor/''${res}x''${res}/apps"
ln -s "${browser}/lib/${browserName}/browser/chrome/icons/default/default''${res}.png" \
"$out/share/icons/hicolor/''${res}x''${res}/apps/${browserName}.png"
done
fi
install -D -t $out/share/applications $desktopItem/share/applications/*