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

Commits on May 2, 2017

  1. freerdp: 20170201 -> 20170502

    Volth committed May 2, 2017
    Copy the full SHA
    cfd8314 View commit details

Commits on May 4, 2017

  1. Merge pull request #25463 from volth/freerdp-20170502 

    freerdp: 20170201 -> 20170502
    @joachifm
    joachifm authored May 4, 2017
    Copy the full SHA
    c49b92f View commit details
Showing with 7 additions and 36 deletions.
  1. +7 −11 pkgs/applications/networking/remote/freerdp/default.nix
  2. +0 −25 pkgs/applications/networking/remote/freerdp/dlopen-absolute-paths.diff
18 changes: 7 additions & 11 deletions pkgs/applications/networking/remote/freerdp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, substituteAll, cmake, pkgconfig
{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig
, alsaLib, ffmpeg_2, glib, openssl, pcre, zlib
, libX11, libXcursor, libXdamage, libXext, libXi, libXinerama, libXrandr, libXrender, libXv
, libxkbcommon, libxkbfile
@@ -14,13 +14,13 @@

stdenv.mkDerivation rec {
name = "freerdp-git-${version}";
version = "20170201";
version = "20170502";

src = fetchFromGitHub {
owner = "FreeRDP";
repo = "FreeRDP";
rev = "6001cb710dc67eb8811362b7bf383754257a902b";
sha256 = "0l2lwqk2r8rq8a0f91wbb30kqg21fv0k0508djpwj0pa9n73fgmg";
rev = "8569102c3a011602de3a1cdf69f7c69adbb864ee";
sha256 = "0m61aiy8l3ybnk2d2kjmpp9ql31zfs63gjixyj9x95jd4m507j67";
};

# outputs = [ "bin" "out" "dev" ];
@@ -29,15 +29,11 @@ stdenv.mkDerivation rec {
export HOME=$TMP
substituteInPlace "libfreerdp/freerdp.pc.in" \
--replace "Requires:" "Requires: @WINPR_PKG_CONFIG_FILENAME@"
'' + lib.optionalString (pcsclite != null) ''
substituteInPlace "winpr/libwinpr/smartcard/smartcard_pcsc.c" \
--replace "libpcsclite.so" "${pcsclite}/lib/libpcsclite.so"
'';

patches = with lib; [
] ++ optional (pcsclite != null)
(substituteAll {
src = ./dlopen-absolute-paths.diff;
inherit pcsclite;
});

buildInputs = with lib; [
alsaLib cups ffmpeg_2 glib openssl pcre pcsclite libpulseaudio zlib
gstreamer gst-plugins-base gst-plugins-good
25 changes: 0 additions & 25 deletions pkgs/applications/networking/remote/freerdp/dlopen-absolute-paths.diff
View file

This file was deleted.