tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
faust: replace qt4 with qt5
Bart Brouns
2 years ago
d58c684e
e40b5250
+69
-12
4 changed files
expand all
collapse all
unified
split
pkgs
applications
audio
faust
faust2alqt.nix
faust2jaqt.nix
faust2lv2.nix
top-level
all-packages.nix
+29
-3
pkgs/applications/audio/faust/faust2alqt.nix
···
1
{ faust
2
, alsa-lib
3
-
, qt4
0
0
4
}:
5
-
0
0
0
0
0
0
0
0
0
0
0
0
0
0
6
faust.wrapWithBuildEnv {
7
8
baseName = "faust2alqt";
9
10
propagatedBuildInputs = [
11
alsa-lib
12
-
qt4
13
];
14
0
0
0
0
0
0
0
0
0
0
15
}
···
1
{ faust
2
, alsa-lib
3
+
, qtbase
4
+
, writeText
5
+
, makeWrapper
6
}:
7
+
let
8
+
# Wrap the binary coming out of the the compilation script, so it knows QT_PLUGIN_PATH
9
+
wrapBinary = writeText "wrapBinary" ''
10
+
source ${makeWrapper}/nix-support/setup-hook
11
+
for p in $FILES; do
12
+
workpath=$PWD
13
+
cd -- "$(dirname "$p")"
14
+
binary=$(basename --suffix=.dsp "$p")
15
+
rm -f .$binary-wrapped
16
+
wrapProgram $binary --set QT_PLUGIN_PATH "${qtbase}/${qtbase.qtPluginPrefix}"
17
+
sed -i $binary -e 's@exec@cd "$(dirname "$(readlink -f "''${BASH_SOURCE[0]}")")" \&\& exec@g'
18
+
cd $workpath
19
+
done
20
+
'';
21
+
in
22
faust.wrapWithBuildEnv {
23
24
baseName = "faust2alqt";
25
26
propagatedBuildInputs = [
27
alsa-lib
28
+
qtbase
29
];
30
31
+
dontWrapQtApps = true;
32
+
33
+
preFixup = ''
34
+
for script in "$out"/bin/*; do
35
+
# append the wrapping code to the compilation script
36
+
cat ${wrapBinary} >> $script
37
+
# prevent the qmake error when running the script
38
+
sed -i "/QMAKE=/c\ QMAKE="${qtbase.dev}/bin/qmake"" $script
39
+
done
40
+
'';
41
}
+30
-3
pkgs/applications/audio/faust/faust2jaqt.nix
···
1
{ faust
2
, jack2
3
-
, qt4
4
, libsndfile
5
, alsa-lib
0
0
6
, which
7
}:
8
-
0
0
0
0
0
0
0
0
0
0
0
0
0
0
9
faust.wrapWithBuildEnv {
10
11
baseName = "faust2jaqt";
···
17
18
propagatedBuildInputs = [
19
jack2
20
-
qt4
21
libsndfile
22
alsa-lib
23
which
24
];
25
0
0
0
0
0
0
0
0
0
0
0
26
}
···
1
{ faust
2
, jack2
3
+
, qtbase
4
, libsndfile
5
, alsa-lib
6
+
, writeText
7
+
, makeWrapper
8
, which
9
}:
10
+
let
11
+
# Wrap the binary coming out of the the compilation script, so it knows QT_PLUGIN_PATH
12
+
wrapBinary = writeText "wrapBinary" ''
13
+
source ${makeWrapper}/nix-support/setup-hook
14
+
for p in $FILES; do
15
+
workpath=$PWD
16
+
cd -- "$(dirname "$p")"
17
+
binary=$(basename --suffix=.dsp "$p")
18
+
rm -f .$binary-wrapped
19
+
wrapProgram $binary --set QT_PLUGIN_PATH "${qtbase}/${qtbase.qtPluginPrefix}"
20
+
sed -i $binary -e 's@exec@cd "$(dirname "$(readlink -f "''${BASH_SOURCE[0]}")")" \&\& exec@g'
21
+
cd $workpath
22
+
done
23
+
'';
24
+
in
25
faust.wrapWithBuildEnv {
26
27
baseName = "faust2jaqt";
···
33
34
propagatedBuildInputs = [
35
jack2
36
+
qtbase
37
libsndfile
38
alsa-lib
39
which
40
];
41
42
+
43
+
dontWrapQtApps = true;
44
+
45
+
preFixup = ''
46
+
for script in "$out"/bin/*; do
47
+
# append the wrapping code to the compilation script
48
+
cat ${wrapBinary} >> $script
49
+
# prevent the qmake error when running the script
50
+
sed -i "/QMAKE=/c\ QMAKE="${qtbase.dev}/bin/qmake"" $script
51
+
done
52
+
'';
53
}
+7
-3
pkgs/applications/audio/faust/faust2lv2.nix
···
1
{ boost
2
, faust
3
, lv2
4
-
, qt4
5
, which
6
-
7
}:
8
9
faust.wrapWithBuildEnv {
10
11
baseName = "faust2lv2";
12
13
-
propagatedBuildInputs = [ boost lv2 qt4 which ];
14
0
0
0
0
0
15
}
···
1
{ boost
2
, faust
3
, lv2
4
+
, qtbase
5
, which
0
6
}:
7
8
faust.wrapWithBuildEnv {
9
10
baseName = "faust2lv2";
11
12
+
propagatedBuildInputs = [ boost lv2 qtbase ];
13
14
+
dontWrapQtApps = true;
15
+
16
+
preFixup = ''
17
+
sed -i "/QMAKE=/c\ QMAKE="${qtbase.dev}/bin/qmake"" "$out"/bin/faust2lv2;
18
+
'';
19
}
+3
-3
pkgs/top-level/all-packages.nix
···
37850
37851
faust2 = callPackage ../applications/audio/faust/faust2.nix { };
37852
37853
-
faust2alqt = callPackage ../applications/audio/faust/faust2alqt.nix { };
37854
37855
faust2alsa = callPackage ../applications/audio/faust/faust2alsa.nix { };
37856
···
37862
37863
faust2jackrust = callPackage ../applications/audio/faust/faust2jackrust.nix { };
37864
37865
-
faust2jaqt = callPackage ../applications/audio/faust/faust2jaqt.nix { };
37866
37867
faust2ladspa = callPackage ../applications/audio/faust/faust2ladspa.nix { };
37868
37869
-
faust2lv2 = callPackage ../applications/audio/faust/faust2lv2.nix { };
37870
37871
faustlive = callPackage ../applications/audio/faust/faustlive.nix { };
37872
···
37850
37851
faust2 = callPackage ../applications/audio/faust/faust2.nix { };
37852
37853
+
faust2alqt = libsForQt5.callPackage ../applications/audio/faust/faust2alqt.nix { };
37854
37855
faust2alsa = callPackage ../applications/audio/faust/faust2alsa.nix { };
37856
···
37862
37863
faust2jackrust = callPackage ../applications/audio/faust/faust2jackrust.nix { };
37864
37865
+
faust2jaqt = libsForQt5.callPackage ../applications/audio/faust/faust2jaqt.nix { };
37866
37867
faust2ladspa = callPackage ../applications/audio/faust/faust2ladspa.nix { };
37868
37869
+
faust2lv2 = libsForQt5.callPackage ../applications/audio/faust/faust2lv2.nix { };
37870
37871
faustlive = callPackage ../applications/audio/faust/faustlive.nix { };
37872