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: 15d5a2adc191
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 156ee198b2e3
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Apr 11, 2020

  1. freerdp: 2.0.0-rc4 -> 2.0.0 (#84885) 

    * freerdp: 2.0.0-rc4 -> 2.0.0

* freerdp: add Xtst for input in shadow server, libxslt for manpages

* freerdp: nits
    @lheckemann
    lheckemann authored Apr 11, 2020
    Copy the full SHA
    156ee19 View commit details
Showing with 10 additions and 7 deletions.
  1. +10 −7 pkgs/applications/networking/remote/freerdp/default.nix
17 changes: 10 additions & 7 deletions pkgs/applications/networking/remote/freerdp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig
, alsaLib, ffmpeg, glib, openssl, pcre, zlib
, libX11, libXcursor, libXdamage, libXext, libXi, libXinerama, libXrandr, libXrender, libXv
, libX11, libXcursor, libXdamage, libXext, libXi, libXinerama, libXrandr, libXrender, libXv, libXtst
, libxkbcommon, libxkbfile
, wayland
, gstreamer, gst-plugins-base, gst-plugins-good, libunwind, orc
, libxslt
, libusb1
, libpulseaudio ? null
, cups ? null
, pcsclite ? null
@@ -14,13 +16,13 @@

stdenv.mkDerivation rec {
pname = "freerdp";
version = "2.0.0-rc4";
version = "2.0.0";

src = fetchFromGitHub {
owner = "FreeRDP";
repo = "FreeRDP";
rev = version;
sha256 = "0546i0m2d4nz5jh84ngwzpcm3c43fp987jk6cynqspsmvapab6da";
sha256 = "0d2559v0z1jnq6jlrvsgdf8p6gd27m8kwdnxckl1x0ygaxs50bqc";
};

# outputs = [ "bin" "out" "dev" ];
@@ -31,7 +33,7 @@ stdenv.mkDerivation rec {
--replace "Requires:" "Requires: @WINPR_PKG_CONFIG_FILENAME@"
'' + lib.optionalString (pcsclite != null) ''
substituteInPlace "winpr/libwinpr/smartcard/smartcard_pcsc.c" \
--replace "libpcsclite.so" "${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so"
--replace "libpcsclite.so" "${lib.getLib pcsclite}/lib/libpcsclite.so"
'' + lib.optionalString nocaps ''
substituteInPlace "libfreerdp/locale/keyboard_xkbfile.c" \
--replace "RDP_SCANCODE_CAPSLOCK" "RDP_SCANCODE_LCONTROL"
@@ -40,9 +42,10 @@ stdenv.mkDerivation rec {
buildInputs = with lib; [
alsaLib cups ffmpeg glib openssl pcre pcsclite libpulseaudio zlib
gstreamer gst-plugins-base gst-plugins-good libunwind orc
libX11 libXcursor libXdamage libXext libXi libXinerama libXrandr libXrender libXv
libX11 libXcursor libXdamage libXext libXi libXinerama libXrandr libXrender libXv libXtst
libxkbcommon libxkbfile
wayland
wayland libusb1
libxslt
] ++ optional stdenv.isLinux systemd;

nativeBuildInputs = [
@@ -71,7 +74,7 @@ stdenv.mkDerivation rec {
'';
homepage = "http://www.freerdp.com/";
license = licenses.asl20;
maintainers = with maintainers; [ peterhoeg ];
maintainers = with maintainers; [ peterhoeg lheckemann ];
platforms = platforms.unix;
};
}