summary refs log tree commit diff
diff options
context:
space:
mode:
authorMarc Weber <marco-oweber@gmx.de>2014-01-11 22:11:32 +0100
committerVladimír Čunát <vcunat@gmail.com>2014-01-28 16:10:12 +0100
commit577c20c23b8590fcbb527f7831f8def0c52c479e (patch)
tree3a6cf7ecd423a3f69eec61b588fa8d693bab2761
parenta8a5a5905904b1319af5a0e1cfe03e577333013e (diff)
downloadnixpkgs-577c20c23b8590fcbb527f7831f8def0c52c479e.tar
nixpkgs-577c20c23b8590fcbb527f7831f8def0c52c479e.tar.gz
nixpkgs-577c20c23b8590fcbb527f7831f8def0c52c479e.tar.bz2
nixpkgs-577c20c23b8590fcbb527f7831f8def0c52c479e.tar.lz
nixpkgs-577c20c23b8590fcbb527f7831f8def0c52c479e.tar.xz
nixpkgs-577c20c23b8590fcbb527f7831f8def0c52c479e.tar.zst
nixpkgs-577c20c23b8590fcbb527f7831f8def0c52c479e.zip
tigervnc: fix ctrl-* keys, eg ctrl-c ctrl-v ctrl-d by applying patch to fltk
I'm unsure about
- is it ok to apply this patch globally, or should it be overridden for tigervnc only?
- how many rebuilds it triggers
- whether it was neccessary to update to latest dev version (seems to work)
The bug report indicates that others distros just includes this patch (?)

Cf. #1498. vcunat: the patch should be usable globally, as e.g. Arch does it.
Using autoreconfHook doesn't work for me, maybe --force is bad for it.
-rw-r--r--pkgs/development/libraries/fltk/fltk13.nix19
1 files changed, 17 insertions, 2 deletions
diff --git a/pkgs/development/libraries/fltk/fltk13.nix b/pkgs/development/libraries/fltk/fltk13.nix
index c6951db228b..8fb4d40b1db 100644
--- a/pkgs/development/libraries/fltk/fltk13.nix
+++ b/pkgs/development/libraries/fltk/fltk13.nix
@@ -1,5 +1,8 @@
 { composableDerivation, fetchurl, pkgconfig, x11, inputproto, libXi
-, freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng }:
+, freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng
+
+, automake, autoconf, libtool
+}:
 
 let inherit (composableDerivation) edf; in
 
@@ -14,7 +17,12 @@ composableDerivation.composableDerivation {} {
 
   propagatedBuildInputs = [ x11 inputproto libXi freeglut ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  enableParallelBilding = true;
+
+  nativeBuildInputs = [
+    pkgconfig
+    automake autoconf libtool # only required because of patch
+  ];
 
   flags =
     # this could be tidied up (?).. eg why does it require freeglut without glSupport?
@@ -46,4 +54,11 @@ composableDerivation.composableDerivation {} {
     description = "A C++ cross-platform light-weight GUI library binding";
     homepage = http://www.fltk.org;
   };
+
+  patches = [
+    # https://bugs.archlinux.org/task/36186
+    (fetchurl {
+    url = "https://bugs.archlinux.org/task/36186?getfile=10750";
+    sha256 = "1hpb1i87nc3zw6mgpgf3bfv557ci930bsn6rwlhaif51nlqd2wbj";
+  }) ];
 }