diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-02-18 01:12:31 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-02-18 01:12:31 +0000 |
| commit | 50053cda79099c9a0b2a7803aef61f730a54848f (patch) | |
| tree | 6413bbed5cbdd3f58d26d54cbf1b37d54a8c3a22 /nixpkgs/pkgs/development/libraries/glib | |
| parent | 7fbd32a525182f2089e1098723219a1a4ef264bb (diff) | |
| parent | 36f316007494c388df1fec434c1e658542e3c3cc (diff) | |
| download | nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar.gz nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar.bz2 nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar.lz nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar.xz nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar.zst nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.zip | |
Merge commit '36f316007494c388df1fec434c1e658542e3c3cc'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/glib')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/glib/default.nix | 5 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/glib/setup-hook.sh | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/libraries/glib/default.nix b/nixpkgs/pkgs/development/libraries/glib/default.nix index 024ccf2a4537..62963283f937 100644 --- a/nixpkgs/pkgs/development/libraries/glib/default.nix +++ b/nixpkgs/pkgs/development/libraries/glib/default.nix @@ -72,6 +72,11 @@ stdenv.mkDerivation rec { url = https://gitlab.gnome.org/GNOME/glib/commit/85c4031696add9797e2334ced20678edcd96c869.patch; sha256 = "1hmyvhx89wip2a26gk1rvd87k0pjfia51s0ysybjyzf5f1pzw877"; }) + # https://gitlab.gnome.org/GNOME/glib/issues/1645 + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/glib/commit/e695ca9f310c393d8f39694f77471dbcb06daa9e.diff; + sha256 = "1jkb2bdnni0xdyn86xrx9z0fdwxrm7y08lagz8x5x01wglkwa26w"; + }) ]; outputs = [ "bin" "out" "dev" "devdoc" ]; diff --git a/nixpkgs/pkgs/development/libraries/glib/setup-hook.sh b/nixpkgs/pkgs/development/libraries/glib/setup-hook.sh index 5275529991f7..a1cb1f40c58a 100644 --- a/nixpkgs/pkgs/development/libraries/glib/setup-hook.sh +++ b/nixpkgs/pkgs/development/libraries/glib/setup-hook.sh @@ -15,9 +15,9 @@ preInstallPhases+=" glibPreInstallPhase" glibPreFixupPhase() { # Move gschemas in case the install flag didn't help - if [ -d "${!outputLib}/share/glib-2.0/schemas" ]; then + if [ -d "$prefix/share/glib-2.0/schemas" ]; then mkdir -p "${!outputLib}/share/gsettings-schemas/$name/glib-2.0" - mv "${!outputLib}/share/glib-2.0/schemas" "${!outputLib}/share/gsettings-schemas/$name/glib-2.0/" + mv "$prefix/share/glib-2.0/schemas" "${!outputLib}/share/gsettings-schemas/$name/glib-2.0/" fi addToSearchPath GSETTINGS_SCHEMAS_PATH "${!outputLib}/share/gsettings-schemas/$name" |