JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #38486: glib: add bin output

Browse Source
This commit is contained in:
Vladimír Čunát 2018-08-31 12:29:14 +02:00
commit 12874e4f81
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
12 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/audio/gradio/default.nix
View File

@ -56,7 +56,7 @@ in stdenv.mkDerivation rec {
enableParallelBuilding = true;
postInstall = ''
${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas
glib-compile-schemas "$out"/share/glib-2.0/schemas
'';
patches = [ ./0001-Remove-post-install-script-that-hardcodes-paths.patch ];

2
pkgs/applications/science/logic/tlaplus/toolbox.nix
View File

@ -44,7 +44,7 @@ in stdenv.mkDerivation {
--run "set -x; cd $out/toolbox" \
--add-flags "-data ~/.tla-toolbox" \
--prefix PATH : "${jre}/bin" \
--prefix LD_LIBRARY_PATH : "${swt}/lib:${gtk}/lib:${libXtst}/lib:${glib}/lib"
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ swt gtk libXtst glib ]}"
echo -e "\nCreating TLA Toolbox icons..."
pushd "$src"

2
pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
View File

@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
'';
preFixup = ''
substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib.dev}/bin/gapplication"
substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib.bin}/bin/gapplication"
'';
passthru = {

2
pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
View File

@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
postInstall = ''
mkdir -p $out/share/gsettings-schemas/$name
mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name
${glib.dev}/bin/glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas
glib-compile-schemas "$out/share/gsettings-schemas/$name/glib-2.0/schemas"
'';
meta = with stdenv.lib; {

2
pkgs/desktops/gnome-3/core/tracker-miners/default.nix
View File

@ -85,7 +85,7 @@ in stdenv.mkDerivation rec {
'';
postInstall = ''
${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas
glib-compile-schemas "$out/share/glib-2.0/schemas"
'';
passthru = {

2
pkgs/desktops/gnome-3/core/tracker/default.nix
View File

@ -40,7 +40,7 @@ in stdenv.mkDerivation rec {
'';
postInstall = ''
${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas
glib-compile-schemas "$out/share/glib-2.0/schemas"
'';
passthru = {

2
pkgs/desktops/gnome-3/extensions/caffeine/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
buildPhase = ''
${bash}/bin/bash ./update-locale.sh
${glib.dev}/bin/glib-compile-schemas --strict --targetdir=caffeine@patapon.info/schemas/ caffeine@patapon.info/schemas
glib-compile-schemas --strict --targetdir=caffeine@patapon.info/schemas/ caffeine@patapon.info/schemas
'';
installPhase = ''

2
pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
View File

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
];
buildPhase = ''
${glib.dev}/bin/glib-compile-schemas --targetdir=${uuid}/schemas ${uuid}/schemas
glib-compile-schemas --targetdir=${uuid}/schemas ${uuid}/schemas
'';
installPhase = ''

2
pkgs/desktops/gnome-3/extensions/volume-mixer.nix
View File

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
];
buildPhase = ''
${glib.dev}/bin/glib-compile-schemas --targetdir=${uuid}/schemas ${uuid}/schemas
glib-compile-schemas --targetdir=${uuid}/schemas ${uuid}/schemas
'';
installPhase = ''

2
pkgs/desktops/gnome-3/misc/pidgin/default.nix
View File

@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
schemas_dir="$share_dir/gsettings-schemas/${name}/glib-2.0/schemas"
mkdir -p "$schemas_dir"
mv schemas/* "$schemas_dir" # fix Emacs syntax highlighting: */
${glib.dev}/bin/glib-compile-schemas "$schemas_dir"
glib-compile-schemas "$schemas_dir"
locale_dir="$share_dir/locale"
mkdir -p "$locale_dir"

10
pkgs/development/libraries/glib/default.nix
View File

@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
./gobject_init_on_demand.patch
] ++ [ ./schema-override-variable.patch ];
outputs = [ "out" "dev" "devdoc" ];
outputs = [ "bin" "out" "dev" "devdoc" ];
outputBin = "dev";
setupHook = ./setup-hook.sh;
@ -104,12 +104,16 @@ stdenv.mkDerivation rec {
DETERMINISTIC_BUILD = 1;
postInstall = ''
mkdir -p $bin/bin
for app in gapplication gdbus gio gsettings; do
mv "$dev/bin/$app" "$bin/bin"
done
moveToOutput "share/glib-2.0" "$dev"
substituteInPlace "$dev/bin/gdbus-codegen" --replace "$out" "$dev"
sed -i "$dev/bin/glib-gettextize" -e "s|^gettext_dir=.*|gettext_dir=$dev/share/glib-2.0/gettext|"
''
# This file is *included* in gtk3 and would introduce runtime reference via __FILE__.
+ ''
sed '1i#line 1 "${name}/include/glib-2.0/gobject/gobjectnotifyqueue.c"' \
-i "$dev"/include/glib-2.0/gobject/gobjectnotifyqueue.c
'';

20
pkgs/development/libraries/gtkd/default.nix
View File

@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
--replace libpango-1.0.0.dylib ${pango.out}/lib/libpango-1.0.0.dylib \
--replace libpangocairo-1.0.0.dylib ${pango.out}/lib/libpangocairo-1.0.0.dylib
substituteInPlace generated/gtkd/gobject/c/functions.d \
--replace libgobject-2.0.so.0 ${glib}/lib/libgobject-2.0.so.0 \
--replace libgobject-2.0.0.dylib ${glib}/lib/libgobject-2.0.0.dylib
--replace libgobject-2.0.so.0 ${glib.out}/lib/libgobject-2.0.so.0 \
--replace libgobject-2.0.0.dylib ${glib.out}/lib/libgobject-2.0.0.dylib
substituteInPlace generated/gtkd/rsvg/c/functions.d \
--replace librsvg-2.so.2 ${librsvg}/lib/librsvg-2.so.2 \
--replace librsvg-2.2.dylib ${librsvg}/lib/librsvg-2.2.dylib
@ -63,15 +63,15 @@ stdenv.mkDerivation rec {
--replace libgtksourceview-3.0.so.1 ${gtksourceview}/lib/libgtksourceview-3.0.so.1 \
--replace libgtksourceview-3.0.1.dylib ${gtksourceview}/lib/libgtksourceview-3.0.1.dylib
substituteInPlace generated/gtkd/glib/c/functions.d \
--replace libglib-2.0.so.0 ${glib}/lib/libglib-2.0.so.0 \
--replace libgmodule-2.0.so.0 ${glib}/lib/libgmodule-2.0.so.0 \
--replace libgobject-2.0.so.0 ${glib}/lib/libgobject-2.0.so.0 \
--replace libglib-2.0.0.dylib ${glib}/lib/libglib-2.0.0.dylib \
--replace libgmodule-2.0.0.dylib ${glib}/lib/libgmodule-2.0.0.dylib \
--replace libgobject-2.0.0.dylib ${glib}/lib/libgobject-2.0.0.dylib
--replace libglib-2.0.so.0 ${glib.out}/lib/libglib-2.0.so.0 \
--replace libgmodule-2.0.so.0 ${glib.out}/lib/libgmodule-2.0.so.0 \
--replace libgobject-2.0.so.0 ${glib.out}/lib/libgobject-2.0.so.0 \
--replace libglib-2.0.0.dylib ${glib.out}/lib/libglib-2.0.0.dylib \
--replace libgmodule-2.0.0.dylib ${glib.out}/lib/libgmodule-2.0.0.dylib \
--replace libgobject-2.0.0.dylib ${glib.out}/lib/libgobject-2.0.0.dylib
substituteInPlace generated/gtkd/gio/c/functions.d \
--replace libgio-2.0.so.0 ${glib}/lib/libgio-2.0.so.0 \
--replace libgio-2.0.0.dylib ${glib}/lib/libgio-2.0.0.dylib
--replace libgio-2.0.so.0 ${glib.out}/lib/libgio-2.0.so.0 \
--replace libgio-2.0.0.dylib ${glib.out}/lib/libgio-2.0.0.dylib
substituteInPlace generated/gstreamer/gstreamer/c/functions.d \
--replace libgstreamer-1.0.so.0 ${gstreamer}/lib/libgstreamer-1.0.so.0 \
--replace libgstreamer-1.0.0.dylib ${gstreamer}/lib/libgstreamer-1.0.0.dylib