diff options
author | Luca Bruno <lucabru@src.gnome.org> | 2015-03-01 12:52:10 +0100 |
---|---|---|
committer | Luca Bruno <lucabru@src.gnome.org> | 2015-03-01 12:54:13 +0100 |
commit | 68d23e2134c1a3600cecee5d2e350a33978d3778 (patch) | |
tree | b9d987aff4f256f43b4a49448d3f9e9d898fb9a5 | |
parent | ebf122c36ff1781cb1d6be8543c7eaabe434ff6c (diff) | |
parent | dbbff72154ab22de7f804bc66588bbc7c834ba5b (diff) |
Merge branch 'meld'. Closes #6595
-rw-r--r-- | pkgs/applications/misc/finalterm/default.nix | 5 | ||||
-rw-r--r-- | pkgs/applications/version-management/meld/default.nix | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/applications/misc/finalterm/default.nix b/pkgs/applications/misc/finalterm/default.nix index 3bf739bbec5ec..e4b0675aa945a 100644 --- a/pkgs/applications/misc/finalterm/default.nix +++ b/pkgs/applications/misc/finalterm/default.nix @@ -32,6 +32,11 @@ stdenv.mkDerivation { ) ''; + postInstall = '' + mkdir -p $out/share/gsettings-schemas/$name + mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name/ + ''; + postFixup = '' wrapProgram "$out/bin/finalterm" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 36dcb25621216..a892d7decc073 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -32,9 +32,13 @@ buildPythonPackage rec { --install-lib=$out/lib/${python27.libPrefix}/site-packages \ --prefix="$out" + mkdir -p $out/share/gsettings-schemas/$name + mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name/ + ''; + + preFixup = '' wrapProgram $out/bin/meld \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix LD_LIBRARY_PATH : "${gnome3.gtk3}/lib" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" ''; |