varcila/bscpkgs
1
0
Fork 0
forked from rarias/bscpkgs
Code Pull Requests Activity

paraver: Downgrade wx to 2.8 and add wxpropgrid

Browse Source 
Fixes a problem with i3 when opening a new timeline view, which caused a
rapid switch between paraver main window and the timeline.
This commit is contained in:
Rodrigo Arias
2020-11-19 16:36:47 +01:00
parent a076d7d3d0
commit e65c801a20
3 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bsc/paraver/default.nix
View File

@@ -5,13 +5,14 @@
, libxml2
, xml2
, fetchurl
, wxGTK31
, wxGTK28
, autoconf
, automake
, wxpropgrid
}:
let
wx = wxGTK31;
wx = wxGTK28;
in
stdenv.mkDerivation rec {
pname = "wxparaver";
@@ -36,9 +37,9 @@ stdenv.mkDerivation rec {
# Patch shebang as /usr/bin/env is missing in nix
sed -i '1c#!/bin/sh' src/paraver-cfgs/install.sh
sed -i '1524d' src/wxparaver/src/gtimeline.cpp
sed -i '806d' src/wxparaver/src/gtimeline.cpp
sed -i '142d' src/wxparaver/src/paravermain.cpp
#sed -i '1524d' src/wxparaver/src/gtimeline.cpp
#sed -i '806d' src/wxparaver/src/gtimeline.cpp
#sed -i '142d' src/wxparaver/src/paravermain.cpp
'';
#TODO: Move the sed commands to proper patches (and maybe send them upstream?)
@@ -51,6 +52,7 @@ stdenv.mkDerivation rec {
configureFlags = [
"--with-boost=${boost}"
"--with-wx-config=${wx}/bin/wx-config"
"--with-wxpropgrid-dir=${wxpropgrid}"
];
buildInputs = [