summary refs log tree commit diff
path: root/pkgs/development/tools/misc/gtkperf
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2017-09-02 11:28:36 -0500
committerWill Dietz <w@wdtz.org>2018-07-12 17:35:51 -0500
commit026b88d54f69231246b6d390ace15598b001f44a (patch)
tree9d033076cbd7e51564f43fee3ee41e037157e7df /pkgs/development/tools/misc/gtkperf
parent22c94d366fb49e6cad9edeabaebdeaedd933d715 (diff)
downloadnixpkgs-026b88d54f69231246b6d390ace15598b001f44a.tar
nixpkgs-026b88d54f69231246b6d390ace15598b001f44a.tar.gz
nixpkgs-026b88d54f69231246b6d390ace15598b001f44a.tar.bz2
nixpkgs-026b88d54f69231246b6d390ace15598b001f44a.tar.lz
nixpkgs-026b88d54f69231246b6d390ace15598b001f44a.tar.xz
nixpkgs-026b88d54f69231246b6d390ace15598b001f44a.tar.zst
nixpkgs-026b88d54f69231246b6d390ace15598b001f44a.zip
gtkperf: Add test selection patch from phoronix/openbenchmarking
Patch seems to not change default functionality, always use.
Diffstat (limited to 'pkgs/development/tools/misc/gtkperf')
-rw-r--r--pkgs/development/tools/misc/gtkperf/bench.patch60
-rw-r--r--pkgs/development/tools/misc/gtkperf/default.nix3
2 files changed, 63 insertions, 0 deletions
diff --git a/pkgs/development/tools/misc/gtkperf/bench.patch b/pkgs/development/tools/misc/gtkperf/bench.patch
new file mode 100644
index 00000000000..3d00a03e9a5
--- /dev/null
+++ b/pkgs/development/tools/misc/gtkperf/bench.patch
@@ -0,0 +1,60 @@
+--- gtkperf/src/callbacks.c	2005-10-30 11:33:42.000000000 +0000
++++ gtkperf-patched/src/callbacks.c	2008-05-23 23:41:17.000000000 +0100
+@@ -219,6 +219,13 @@
+ }
+
+
++void
++on_cmdline_test(char *optarg)
++{
++	appdata->test_type = atoi(optarg);
++}
++
++
+ /* Initialize appdata */
+ void
+ setup_appdata(AppData * appdata_in)
+@@ -398,7 +405,7 @@
+ 	appdata->pixbuf_drawing = gdk_pixbuf_new_from_file (filename, NULL);
+
+ 	gtk_combo_box_set_active (GTK_COMBO_BOX (appdata->combobox_testtype),
+-				  0);
++				  appdata->test_type);
+
+ 	/* create end mark to info textview */
+ 	GtkTextIter iter;
+--- gtkperf/src/callbacks.h	2005-10-30 10:21:23.000000000 +0000
++++ gtkperf-patched/src/callbacks.h	2008-05-23 23:22:30.000000000 +0100
+@@ -13,6 +13,7 @@
+ void on_cmdline_run_all ();
+ void on_cmdline_help () ;
+ void on_cmdline_count (char *optarg) ;
++void on_cmdline_test (char *optarg) ;
+ void on_window_main_show (AppData * data);
+
+ gboolean
+--- gtkperf/src/main.c	2005-10-30 11:26:42.000000000 +0000
++++ gtkperf-patched/src/main.c	2008-05-23 23:44:02.000000000 +0100
+@@ -65,9 +65,10 @@
+ 			{"help", 0, 0, 0},
+ 			{"automatic", 0, 0, 0},
+ 			{"count", 1, 0, 0},
++			{"test", 1, 0, 0},
+ 			{0, 0, 0, 0}
+ 		};
+-		c = getopt_long (argc, argv, "hac:",
++		c = getopt_long (argc, argv, "hac:t:",
+ 			long_options, &option_index);
+ 		if (c == -1)
+ 			break;
+@@ -104,6 +105,10 @@
+ 				on_cmdline_count(optarg);
+ 				break;
+
++			case 't':
++				on_cmdline_test(optarg);
++				break;
++
+ 			default:
+ 			case 'h':
+ 				on_cmdline_help ();
diff --git a/pkgs/development/tools/misc/gtkperf/default.nix b/pkgs/development/tools/misc/gtkperf/default.nix
index cb753b8f283..5280b69cdce 100644
--- a/pkgs/development/tools/misc/gtkperf/default.nix
+++ b/pkgs/development/tools/misc/gtkperf/default.nix
@@ -12,6 +12,9 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ gtk2 libintl ];
 
+  # https://openbenchmarking.org/innhold/7e9780c11550d09aa67bdba71248facbe2d781db
+  patches = [ ./bench.patch ];
+
   meta = with stdenv.lib; {
     description = "Application designed to test GTK+ performance";
     homepage = http://gtkperf.sourceforge.net/;