paraver: Downgrade wx to 2.8 and add wxpropgrid
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:
parent
a076d7d3d0
commit
e65c801a20
@ -5,13 +5,14 @@
|
|||||||
, libxml2
|
, libxml2
|
||||||
, xml2
|
, xml2
|
||||||
, fetchurl
|
, fetchurl
|
||||||
, wxGTK31
|
, wxGTK28
|
||||||
, autoconf
|
, autoconf
|
||||||
, automake
|
, automake
|
||||||
|
, wxpropgrid
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
wx = wxGTK31;
|
wx = wxGTK28;
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "wxparaver";
|
pname = "wxparaver";
|
||||||
@ -36,9 +37,9 @@ stdenv.mkDerivation rec {
|
|||||||
# Patch shebang as /usr/bin/env is missing in nix
|
# Patch shebang as /usr/bin/env is missing in nix
|
||||||
sed -i '1c#!/bin/sh' src/paraver-cfgs/install.sh
|
sed -i '1c#!/bin/sh' src/paraver-cfgs/install.sh
|
||||||
|
|
||||||
sed -i '1524d' src/wxparaver/src/gtimeline.cpp
|
#sed -i '1524d' src/wxparaver/src/gtimeline.cpp
|
||||||
sed -i '806d' src/wxparaver/src/gtimeline.cpp
|
#sed -i '806d' src/wxparaver/src/gtimeline.cpp
|
||||||
sed -i '142d' src/wxparaver/src/paravermain.cpp
|
#sed -i '142d' src/wxparaver/src/paravermain.cpp
|
||||||
'';
|
'';
|
||||||
#TODO: Move the sed commands to proper patches (and maybe send them upstream?)
|
#TODO: Move the sed commands to proper patches (and maybe send them upstream?)
|
||||||
|
|
||||||
@ -51,6 +52,7 @@ stdenv.mkDerivation rec {
|
|||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--with-boost=${boost}"
|
"--with-boost=${boost}"
|
||||||
"--with-wx-config=${wx}/bin/wx-config"
|
"--with-wx-config=${wx}/bin/wx-config"
|
||||||
|
"--with-wxpropgrid-dir=${wxpropgrid}"
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
26
bsc/wxpropgrid/default.nix
Normal file
26
bsc/wxpropgrid/default.nix
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
{
|
||||||
|
stdenv
|
||||||
|
, fetchurl
|
||||||
|
, wxGTK28
|
||||||
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
|
#wx = wxGTK31; # BUG
|
||||||
|
wx = wxGTK28;
|
||||||
|
in
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "wxpropgrid";
|
||||||
|
version = "1.4.15";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "http://prdownloads.sourceforge.net/wxpropgrid/wxpropgrid-${version}-src.tar.gz";
|
||||||
|
sha256 = "1f62468x5s4h775bn5svlkv0lzzh06aciljpiqn5k3w2arkaijgh";
|
||||||
|
};
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
wx
|
||||||
|
];
|
||||||
|
|
||||||
|
}
|
@ -97,6 +97,7 @@ let
|
|||||||
|
|
||||||
fftw = callPackage ./bsc/fftw/default.nix { };
|
fftw = callPackage ./bsc/fftw/default.nix { };
|
||||||
|
|
||||||
|
wxpropgrid = callPackage ./bsc/wxpropgrid/default.nix { };
|
||||||
paraver = callPackage ./bsc/paraver/default.nix { };
|
paraver = callPackage ./bsc/paraver/default.nix { };
|
||||||
paraverDebug = bsc.paraver.overrideAttrs (old:
|
paraverDebug = bsc.paraver.overrideAttrs (old:
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user