From b499f924da71632e2d371067044f793461101937 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Mon, 19 Nov 2018 01:30:19 +0100 Subject: [PATCH] libxkbcommon: split version (for bitwig) --- .../libraries/libxkbcommon/libxkbcommon_7.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix diff --git a/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix b/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix new file mode 100644 index 00000000000..e730cc6eaab --- /dev/null +++ b/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, pkgconfig, yacc, flex, xkeyboard_config, libxcb, libX11 }: + +stdenv.mkDerivation rec { + name = "libxkbcommon-0.7.2"; + + src = fetchurl { + url = "http://xkbcommon.org/download/${name}.tar.xz"; + sha256 = "1n5rv5n210kjnkyrvbh04gfwaa7zrmzy1393p8nyqfw66lkxr918"; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ yacc flex xkeyboard_config libxcb ]; + + configureFlags = [ + "--with-xkb-config-root=${xkeyboard_config}/etc/X11/xkb" + "--with-x-locale-root=${libX11.out}/share/X11/locale" + ]; + + preBuild = stdenv.lib.optionalString stdenv.isDarwin '' + sed -i 's/,--version-script=.*$//' Makefile + ''; + + meta = with stdenv.lib; { + description = "A library to handle keyboard descriptions"; + homepage = http://xkbcommon.org; + license = licenses.mit; + maintainers = with maintainers; [ garbas ttuegel ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8265c9cf266..d7b6f21bcbb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11294,7 +11294,9 @@ with pkgs; libxdg_basedir = callPackage ../development/libraries/libxdg-basedir { }; - libxkbcommon = callPackage ../development/libraries/libxkbcommon { }; + libxkbcommon = libxkbcommon_8; + libxkbcommon_8 = callPackage ../development/libraries/libxkbcommon { }; + libxkbcommon_7 = callPackage ../development/libraries/libxkbcommon/libxkbcommon_7.nix { }; libxklavier = callPackage ../development/libraries/libxklavier { };