From f6eedf08674769a0bf12ec0ce8e3e7d6a8dc3c1b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 19 Feb 2017 19:44:53 +0300 Subject: nvidia-x11.settings: add librsvg for gtk3 --- pkgs/os-specific/linux/nvidia-x11/settings.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'pkgs/os-specific/linux/nvidia-x11/settings.nix') diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix index d088fe5253c..abf208cff93 100644 --- a/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -1,6 +1,7 @@ nvidia_x11: sha256: { stdenv, lib, fetchurl, pkgconfig, m4, jansson, gtk2, gtk3, libXv, libXrandr, libvdpau +, librsvg, wrapGAppsHook , withGtk2 ? false, withGtk3 ? true }: @@ -15,7 +16,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig m4 ]; - buildInputs = [ jansson gtk2 gtk3 libXv libXrandr libvdpau nvidia_x11 ]; + buildInputs = [ jansson libXv libXrandr libvdpau nvidia_x11 gtk2 ] + ++ lib.optionals withGtk3 [ gtk3 librsvg wrapGAppsHook ]; NIX_LDFLAGS = [ "-lvdpau" "-lXrandr" "-lXv" "-lnvidia-ml" ]; @@ -39,9 +41,11 @@ stdenv.mkDerivation rec { ''} ''; + binaryName = if withGtk3 then ".nvidia-settings-wrapped" else "nvidia-settings"; + postFixup = '' - patchelf --set-rpath "$(patchelf --print-rpath $out/bin/nvidia-settings):$out/lib" \ - $out/bin/nvidia-settings + patchelf --set-rpath "$(patchelf --print-rpath $out/bin/$binaryName):$out/lib" \ + $out/bin/$binaryName ''; meta = with stdenv.lib; { -- cgit 1.4.1