diff options
| author | Luca Bruno <lucabru@src.gnome.org> | 2014-04-05 15:51:42 +0200 |
|---|---|---|
| committer | Luca Bruno <lucabru@src.gnome.org> | 2014-04-06 11:02:21 +0200 |
| commit | 35ccaa2e52c8d8c09118c72c8ed5c167a394dcfa (patch) | |
| tree | ad05c2096039b9f050f821722a28173b64819949 /pkgs/applications/graphics/shotwell | |
| parent | 85b1ede2bfa8c8e7cf946a7372d3b05f15e7735a (diff) | |
| download | nixpkgs-35ccaa2e52c8d8c09118c72c8ed5c167a394dcfa.tar nixpkgs-35ccaa2e52c8d8c09118c72c8ed5c167a394dcfa.tar.gz nixpkgs-35ccaa2e52c8d8c09118c72c8ed5c167a394dcfa.tar.bz2 nixpkgs-35ccaa2e52c8d8c09118c72c8ed5c167a394dcfa.tar.lz nixpkgs-35ccaa2e52c8d8c09118c72c8ed5c167a394dcfa.tar.xz nixpkgs-35ccaa2e52c8d8c09118c72c8ed5c167a394dcfa.tar.zst nixpkgs-35ccaa2e52c8d8c09118c72c8ed5c167a394dcfa.zip | |
Fix gsettings schemas usage for several packages due to #1901
Also add icons to epiphany
Diffstat (limited to 'pkgs/applications/graphics/shotwell')
| -rw-r--r-- | pkgs/applications/graphics/shotwell/default.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 2a3ed77609f..1953f951d16 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -33,11 +33,17 @@ in stdenv.mkDerivation rec { preConfigure = '' patchShebangs . ''; - + postInstall = '' + mkdir -p $out/share/gsettings-schemas/$name + mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name/ + ''; + + preFixup = '' wrapProgram "$out/bin/shotwell" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gsettings_desktop_schemas}/share:${gtk3}/share:$out/share" + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + rm $out/share/icons/hicolor/icon-theme.cache ''; |