alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

qtbase: fix sed syntax in .pc file fixup

Browse source
This commit is contained in:
Thomas Tuegel 2017-03-11 16:25:48 -06:00
parent bf6c90ed67
commit e24261ed16
No known key found for this signature in database
GPG key ID: 22CBF5249D4B4D59
4 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
View file

@ -269,9 +269,12 @@ stdenv.mkDerivation {
done
popd
fi
''
# fixup .pc file (where to find 'moc' etc.)
sed "s|^host_bins=.*|host_bins=$dev/bin|" -i "$dev/lib/pkgconfig/Qt5Core.pc"
# fixup .pc file (where to find 'moc' etc.)
+ lib.optionalString (!stdenv.isDarwin) ''
sed -i "$dev/lib/pkgconfig/Qt5Core.pc" \
-e "/^host_bins=/ c host_bins=$dev/bin"
'';
inherit lndir;

2
pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
View file

@ -272,7 +272,7 @@ stdenv.mkDerivation {
# fixup .pc file (where to find 'moc' etc.)
+ lib.optionalString (!stdenv.isDarwin) ''
sed -i "$dev/lib/pkgconfig/Qt5Core.pc" \
"s|^host_bins=.*|host_bins=$dev/bin|"
-e "/^host_bins=/ c host_bins=$dev/bin"
''
# Don't move .prl files on darwin because they end up in

2
pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
View file

@ -233,7 +233,7 @@ stdenv.mkDerivation {
# fixup .pc file (where to find 'moc' etc.)
+ lib.optionalString (!stdenv.isDarwin) ''
sed -i "$dev/lib/pkgconfig/Qt5Core.pc" \
"s|^host_bins=.*|host_bins=$dev/bin|"
-e "/^host_bins=/ c host_bins=$dev/bin"
''
# Don't move .prl files on darwin because they end up in

2
pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
View file

@ -230,7 +230,7 @@ stdenv.mkDerivation {
# fixup .pc file (where to find 'moc' etc.)
+ lib.optionalString (!stdenv.isDarwin) ''
sed -i "$dev/lib/pkgconfig/Qt5Core.pc" \
"s|^host_bins=.*|host_bins=$dev/bin|"
-e "/^host_bins=/ c host_bins=$dev/bin"
''
# Don't move .prl files on darwin because they end up in