public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki 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
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+5 -2
View File
@@ -269,9 +269,12 @@ stdenv.mkDerivation {
done done
popd popd
fi fi
''
# fixup .pc file (where to find 'moc' etc.) # fixup .pc file (where to find 'moc' etc.)
sed "s|^host_bins=.*|host_bins=$dev/bin|" -i "$dev/lib/pkgconfig/Qt5Core.pc" + lib.optionalString (!stdenv.isDarwin) ''
sed -i "$dev/lib/pkgconfig/Qt5Core.pc" \
-e "/^host_bins=/ c host_bins=$dev/bin"
''; '';
inherit lndir; inherit lndir;
pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
+1 -1
View File
@@ -272,7 +272,7 @@ stdenv.mkDerivation {
# fixup .pc file (where to find 'moc' etc.) # fixup .pc file (where to find 'moc' etc.)
+ lib.optionalString (!stdenv.isDarwin) '' + lib.optionalString (!stdenv.isDarwin) ''
sed -i "$dev/lib/pkgconfig/Qt5Core.pc" \ 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 # Don't move .prl files on darwin because they end up in
pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
+1 -1
View File
@@ -233,7 +233,7 @@ stdenv.mkDerivation {
# fixup .pc file (where to find 'moc' etc.) # fixup .pc file (where to find 'moc' etc.)
+ lib.optionalString (!stdenv.isDarwin) '' + lib.optionalString (!stdenv.isDarwin) ''
sed -i "$dev/lib/pkgconfig/Qt5Core.pc" \ 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 # Don't move .prl files on darwin because they end up in
pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
+1 -1
View File
@@ -230,7 +230,7 @@ stdenv.mkDerivation {
# fixup .pc file (where to find 'moc' etc.) # fixup .pc file (where to find 'moc' etc.)
+ lib.optionalString (!stdenv.isDarwin) '' + lib.optionalString (!stdenv.isDarwin) ''
sed -i "$dev/lib/pkgconfig/Qt5Core.pc" \ 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 # Don't move .prl files on darwin because they end up in