diff options
author | Vladimír Čunát <v@cunat.cz> | 2019-08-24 08:19:05 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2019-08-24 08:55:37 +0200 |
commit | 2e6bf42a2207d5ecfe6e67de2def6e004a0eb1f1 (patch) | |
tree | 36de0660dc2c9f3731bd8b60ec852ca0c452efce /pkgs/desktops/xfce4-14/mkXfceDerivation.nix | |
parent | 84a91208a948be5eca97ea182c4256d9d6ecf171 (diff) | |
parent | 8943fb5f24b9e1aa1d577be4e214d166643269fd (diff) |
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to name -> pname+version. Fortunately, almost everything was auto-resolved by kdiff3, and for now I just fixed up a couple evaluation problems, as verified by the tarball job. There might be some fallback to these conflicts, but I believe it should be minimal. Hydra nixpkgs: ?compare=1538299
Diffstat (limited to 'pkgs/desktops/xfce4-14/mkXfceDerivation.nix')
-rw-r--r-- | pkgs/desktops/xfce4-14/mkXfceDerivation.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/desktops/xfce4-14/mkXfceDerivation.nix b/pkgs/desktops/xfce4-14/mkXfceDerivation.nix index da7179c464625..cf4b5eb3cdc6c 100644 --- a/pkgs/desktops/xfce4-14/mkXfceDerivation.nix +++ b/pkgs/desktops/xfce4-14/mkXfceDerivation.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pkgconfig, xfce4-dev-tools, hicolor-icon-theme }: +{ stdenv, fetchgit, pkgconfig, xfce4-dev-tools, hicolor-icon-theme, wrapGAppsHook }: { category, pname, version, rev ? "${pname}-${version}", sha256, ... } @ args: @@ -15,7 +15,7 @@ let template = rec { name = "${pname}-${version}"; - nativeBuildInputs = [ pkgconfig xfce4-dev-tools ]; + nativeBuildInputs = [ pkgconfig xfce4-dev-tools wrapGAppsHook ]; buildInputs = [ hicolor-icon-theme ]; configureFlags = [ "--enable-maintainer-mode" ]; |