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

Commits on Jun 4, 2019

  1. freerdp: add nocaps option that turns Caps Lock into Control

    Elmo Todurov committed Jun 4, 2019
    Copy the full SHA
    52208c3 View commit details

Commits on Jun 9, 2019

  1. Merge pull request #61858 from cf6b88f/freerdp-nocaps 

    freerdp: add nocaps option that turns Caps Lock into Control
    @peterhoeg
    peterhoeg authored Jun 9, 2019
    Copy the full SHA
    4d2bd93 View commit details
Showing with 4 additions and 0 deletions.
  1. +4 −0 pkgs/applications/networking/remote/freerdp/default.nix
4 changes: 4 additions & 0 deletions pkgs/applications/networking/remote/freerdp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,6 +9,7 @@
, pcsclite ? null
, systemd ? null
, buildServer ? true
, nocaps ? false
}:

stdenv.mkDerivation rec {
@@ -31,6 +32,9 @@ stdenv.mkDerivation rec {
'' + lib.optionalString (pcsclite != null) ''
substituteInPlace "winpr/libwinpr/smartcard/smartcard_pcsc.c" \
--replace "libpcsclite.so" "${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so"
'' + lib.optionalString nocaps ''
substituteInPlace "libfreerdp/locale/keyboard_xkbfile.c" \
--replace "RDP_SCANCODE_CAPSLOCK" "RDP_SCANCODE_LCONTROL"
'';

buildInputs = with lib; [