diff options
| author | Pascal Wittmann <mail@pascal-wittmann.de> | 2018-08-06 12:04:52 +0200 |
|---|---|---|
| committer | Pascal Wittmann <mail@pascal-wittmann.de> | 2018-08-06 12:04:52 +0200 |
| commit | f7be21f4c98ba84e1b3eb7c77ecaed2fb82cce44 (patch) | |
| tree | 5a7f8e0f97ec403b9aceb9276c8fb9e53bae9df5 /pkgs/applications/editors/atom/default.nix | |
| parent | 85afc926d8dfcbc079322594e803078d72a31f9f (diff) | |
| parent | 6820e2f0dd16104961d6fc7e8e38846807159c4e (diff) | |
| download | nixpkgs-f7be21f4c98ba84e1b3eb7c77ecaed2fb82cce44.tar nixpkgs-f7be21f4c98ba84e1b3eb7c77ecaed2fb82cce44.tar.gz nixpkgs-f7be21f4c98ba84e1b3eb7c77ecaed2fb82cce44.tar.bz2 nixpkgs-f7be21f4c98ba84e1b3eb7c77ecaed2fb82cce44.tar.lz nixpkgs-f7be21f4c98ba84e1b3eb7c77ecaed2fb82cce44.tar.xz nixpkgs-f7be21f4c98ba84e1b3eb7c77ecaed2fb82cce44.tar.zst nixpkgs-f7be21f4c98ba84e1b3eb7c77ecaed2fb82cce44.zip | |
Merge branch 'master' into add-missing-licenses
Conflicts:
pkgs/development/libraries/exiv2/default.nix
Set license to gpl2Plus
Diffstat (limited to 'pkgs/applications/editors/atom/default.nix')
| -rw-r--r-- | pkgs/applications/editors/atom/default.nix | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 83f0f1e8222..bc3f8baf510 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchurl, makeWrapper, gvfs, atomEnv}: +{ stdenv, pkgs, fetchurl, makeWrapper, wrapGAppsHook, gvfs, gtk3, atomEnv }: let common = pname: {version, sha256, beta ? null}: @@ -14,7 +14,19 @@ let inherit sha256; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system + ]; + + buildInputs = [ + gtk3 # Fix error: GLib-GIO-ERROR **: Settings schema 'org.gtk.Settings.FileChooser' is not installed + ]; + + preFixup = '' + gappsWrapperArgs+=( + --prefix "PATH" : "${gvfs}/bin" \ + ) + ''; buildCommand = '' mkdir -p $out/usr/ @@ -25,9 +37,6 @@ let rm -r $out/share/lintian rm -r $out/usr/ sed -i "s/${pname})/.${pname}-wrapped)/" $out/bin/${pname} - # sed -i "s/'${pname}'/'.${pname}-wrapped'/" $out/bin/${pname} - wrapProgram $out/bin/${pname} \ - --prefix "PATH" : "${gvfs}/bin" fixupPhase |