Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1531fd7351f6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: aa3fa39e5cd8
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 6, 2018

  1. glib: fix pre phases 

    *Phases are strings, not arrays.
    @romildo @orivej
    romildo authored and orivej committed Jan 6, 2018
    Copy the full SHA
    d51897e View commit details

  2. Merge pull request #33394 from romildo/fix.glib 

    glib: preFixupPhases should be a string, and not an array
    @orivej
    orivej authored Jan 6, 2018
    Copy the full SHA
    aa3fa39 View commit details
Showing with 2 additions and 3 deletions.
  1. +2 −3 pkgs/development/libraries/glib/setup-hook.sh
5 changes: 2 additions & 3 deletions pkgs/development/libraries/glib/setup-hook.sh
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ addEnvHooks "$hostOffset" make_glib_find_gsettings_schemas
glibPreInstallPhase() {
installFlagsArray+=("gsettingsschemadir=${!outputLib}/share/gsettings-schemas/$name/glib-2.0/schemas/")
}
preInstallPhases+=(glibPreInstallPhase)
preInstallPhases+=" glibPreInstallPhase"

glibPreFixupPhase() {
# Move gschemas in case the install flag didn't help
@@ -22,5 +22,4 @@ glibPreFixupPhase() {

addToSearchPath GSETTINGS_SCHEMAS_PATH "${!outputLib}/share/gsettings-schemas/$name"
}
preFixupPhases+=(glibPreFixupPhase)

preFixupPhases+=" glibPreFixupPhase"