diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2019-02-22 17:49:58 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2019-02-22 17:49:58 +0100 |
commit | 821c0844d499658666901401f2ae088b85cc2e9a (patch) | |
tree | 7fa4ca8db08b3f03b5667928c6817000b7f3b785 /pkgs/tools/graphics | |
parent | c9d8f5235bd9201355a7817cab79d38a8bc6e731 (diff) | |
parent | 2adf954e846cc4f6e654c6814a7605cfe53bc003 (diff) | |
download | nixpkgs-821c0844d499658666901401f2ae088b85cc2e9a.tar nixpkgs-821c0844d499658666901401f2ae088b85cc2e9a.tar.gz nixpkgs-821c0844d499658666901401f2ae088b85cc2e9a.tar.bz2 nixpkgs-821c0844d499658666901401f2ae088b85cc2e9a.tar.lz nixpkgs-821c0844d499658666901401f2ae088b85cc2e9a.tar.xz nixpkgs-821c0844d499658666901401f2ae088b85cc2e9a.tar.zst nixpkgs-821c0844d499658666901401f2ae088b85cc2e9a.zip |
Merge branch 'staging' into staging-next
Diffstat (limited to 'pkgs/tools/graphics')
-rw-r--r-- | pkgs/tools/graphics/luxcorerender/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/graphics/luxcorerender/default.nix b/pkgs/tools/graphics/luxcorerender/default.nix index 85713a300ec..3115b1b7243 100644 --- a/pkgs/tools/graphics/luxcorerender/default.nix +++ b/pkgs/tools/graphics/luxcorerender/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { # needed for GSETTINGS_SCHEMAS_PATH gsettings-desktop-schemas glib gnome3.gtk # needed for XDG_ICON_DIRS - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme makeWrapper (stdenv.lib.getLib gnome3.dconf) ] ++ stdenv.lib.optionals withOpenCL [opencl-headers ocl-icd opencl-clhpp]; @@ -65,7 +65,7 @@ in stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/bin/luxcoreui" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_DATA_DIRS : '${gnome3.defaultIconTheme}/share' \ + --suffix XDG_DATA_DIRS : '${gnome3.adwaita-icon-theme}/share' \ --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" ''; |