Commit 388815b1 authored by Grimmauld's avatar Grimmauld Committed by Alyssa Ross
Browse files

freerdp: drop freerdp 2.x, move to by-name 

The freerdp package name previuously pointed to the unmaintained freerdp version 2.x.
Version 2.x is no longer used in nixpkgs.
It was never clear `freerdp` would be pinned to 2.x versions indefinitely.

This removes the pin on the freerdp package and moves the package to by-name pattern.
parent 58e181f4

pkgs/applications/networking/remote/freerdp/default.nix

deleted100644 → 0
+0 −243
Original line number Diff line number Diff line 
{

  stdenv,

  lib,

  fetchFromGitHub,

  cmake,

  docbook-xsl-nons,

  libxslt,

  pkg-config,

  alsa-lib,

  faac,

  faad2,

  fetchpatch,

  ffmpeg,

  glib,

  openh264,

  openssl,

  pcre2,

  zlib,

  libX11,

  libXcursor,

  libXdamage,

  libXdmcp,

  libXext,

  libXi,

  libXinerama,

  libXrandr,

  libXrender,

  libXtst,

  libXv,

  libxkbcommon,

  libxkbfile,

  wayland,

  wayland-scanner,

  gstreamer,

  gst-plugins-base,

  gst-plugins-good,

  libunwind,

  orc,

  cairo,

  libusb1,

  libpulseaudio,

  cups,

  pcsclite,

  systemd,

  libjpeg_turbo,

  buildServer ? true,

  nocaps ? false,

  AudioToolbox,

  AVFoundation,

  Carbon,

  Cocoa,

  CoreMedia,

  withUnfree ? false,



  # tries to compile and run generate_argument_docbook.c

  withManPages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,



  buildPackages,

}:



let

  cmFlag = flag: if flag then "ON" else "OFF";

  disabledTests =

    [

      # this one is probably due to our sandbox

      {

        dir = "libfreerdp/crypto/test";

        file = "Test_x509_cert_info.c";

      }

    ]

    ++ lib.optionals stdenv.hostPlatform.isDarwin [

      {

        dir = "winpr/libwinpr/sysinfo/test";

        file = "TestGetComputerName.c";

      }

    ];



  inherit (lib) optionals;



in

stdenv.mkDerivation rec {

  pname = "freerdp";

  version = "2.11.7";



  src = fetchFromGitHub {

    owner = "FreeRDP";

    repo = "FreeRDP";

    rev = version;

    hash = "sha256-w+xyMNFmKylSheK0yAGl8J6MXly/HUjjAfR9Qq3s/kA=";

  };



  patches = [

    # GCC 14 compatibility

    (fetchpatch {

      url = "https://github.com/FreeRDP/FreeRDP/commit/5b14b7cbdd36414f1838047f21502654bd32ebb1.patch";

      hash = "sha256-EWLfmjGJGWA/sY2E2DnFKhPbzhOVbXZPCrV8i1XuSeY=";

    })

    (fetchpatch {

      url = "https://github.com/FreeRDP/FreeRDP/commit/efa899d3deb8595a29fabb2a2251722f9d7e0d7f.patch";

      hash = "sha256-hjqNexYq+3iO2L2L9wT2tWbHz0BEtl/y7jgQT4kpNIM=";

    })

    (fetchpatch {

      url = "https://github.com/FreeRDP/FreeRDP/commit/0c20fac8f1deeeca3df93a6619542e5d9176f0f0.patch";

      hash = "sha256-cEzNPteucoI5KoGEM3C6mg2kW9uWImPebZEV6nssexY=";

    })

  ];



  postPatch =

    ''

      export HOME=$TMP



      # skip NIB file generation on darwin

      sed -z 's/NIB file generation.*//' -i client/Mac{,/cli}/CMakeLists.txt



      # failing test(s)

      ${lib.concatMapStringsSep "\n" (e: ''

        substituteInPlace ${e.dir}/CMakeLists.txt \

          --replace ${e.file} ""

        rm ${e.dir}/${e.file}

      '') disabledTests}



      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" "${lib.getLib pcsclite}/lib/libpcsclite.so"

    ''

    + lib.optionalString nocaps ''

      substituteInPlace "libfreerdp/locale/keyboard_xkbfile.c" \

        --replace "RDP_SCANCODE_CAPSLOCK" "RDP_SCANCODE_LCONTROL"

    '';



  buildInputs =

    [

      cairo

      cups

      faad2

      ffmpeg

      glib

      gst-plugins-base

      gst-plugins-good

      gstreamer

      libX11

      libXcursor

      libXdamage

      libXdmcp

      libXext

      libXi

      libXinerama

      libXrandr

      libXrender

      libXtst

      libXv

      libjpeg_turbo

      libpulseaudio

      libunwind

      libusb1

      libxkbcommon

      libxkbfile

      openh264

      openssl

      orc

      pcre2

      pcsclite

      zlib

    ]

    ++ optionals stdenv.hostPlatform.isLinux [

      alsa-lib

      systemd

      wayland

    ]

    ++ optionals stdenv.hostPlatform.isDarwin [

      AudioToolbox

      AVFoundation

      Carbon

      Cocoa

      CoreMedia

    ]

    ++ optionals withUnfree [

      faac

    ];



  nativeBuildInputs = [

    cmake

    libxslt

    docbook-xsl-nons

    pkg-config

    wayland-scanner

  ];



  doCheck = true;



  # https://github.com/FreeRDP/FreeRDP/issues/8526#issuecomment-1357134746

  cmakeFlags =

    [

      "-Wno-dev"

      "-DCMAKE_INSTALL_LIBDIR=lib"

      "-DDOCBOOKXSL_DIR=${docbook-xsl-nons}/xml/xsl/docbook"

    ]

    ++ lib.mapAttrsToList (k: v: "-D${k}=${cmFlag v}") {

      BUILD_TESTING = false; # false is recommended by upstream

      WITH_CAIRO = (cairo != null);

      WITH_CUPS = (cups != null);

      WITH_FAAC = (withUnfree && faac != null);

      WITH_FAAD2 = (faad2 != null);

      WITH_JPEG = (libjpeg_turbo != null);

      WITH_OPENH264 = (openh264 != null);

      WITH_OSS = false;

      WITH_MANPAGES = withManPages;

      WITH_PCSC = (pcsclite != null);

      WITH_PULSE = (libpulseaudio != null);

      WITH_SERVER = buildServer;

      WITH_VAAPI = false; # false is recommended by upstream

      WITH_X11 = true;

    };



  env.NIX_CFLAGS_COMPILE = toString (

    lib.optionals stdenv.hostPlatform.isDarwin [

      "-include AudioToolbox/AudioToolbox.h"

    ]

    ++ lib.optionals stdenv.cc.isClang [

      "-Wno-error=incompatible-function-pointer-types"

    ]

  );



  NIX_LDFLAGS = lib.optionals stdenv.hostPlatform.isDarwin [

    "-framework AudioToolbox"

  ];



  meta = with lib; {

    description = "Remote Desktop Protocol Client";

    longDescription = ''

      FreeRDP is a client-side implementation of the Remote Desktop Protocol (RDP)

      following the Microsoft Open Specifications.

    '';

    homepage = "https://www.freerdp.com/";

    changelog = "https://github.com/FreeRDP/FreeRDP/releases/tag/${src.rev}";

    license = licenses.asl20;

    maintainers = with maintainers; [ peterhoeg ];

    platforms = platforms.unix;

  };

}

pkgs/top-level/all-packages.nix

+1 −12
Original line number Diff line number Diff line
@@ -13179,18 +13179,7 @@ with pkgs; 














  inherit (xorg) xlsfonts;



























  inherit













    ({













      freerdp = callPackage ../applications/networking/remote/freerdp {













        inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Carbon Cocoa CoreMedia;













        inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good;













      };













      freerdp3 = callPackage ../applications/networking/remote/freerdp/3.nix {};













    })













    freerdp













    freerdp3













    ;

























  freerdp3 = freerdp;















  freerdpUnstable = freerdp;





























  gimp = callPackage ../applications/graphics/gimp {