3 files changed, 17 insertions, 25 deletions
diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix
index de60c9ccf4f..d088fe5253c 100644
--- a/pkgs/os-specific/linux/nvidia-x11/settings.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix
@@ -1,6 +1,6 @@
 nvidia_x11: sha256:
 
-{ stdenv, lib, fetchurl, pkgconfig, m4, gtk2, gtk3, libXv, libvdpau
+{ stdenv, lib, fetchurl, pkgconfig, m4, jansson, gtk2, gtk3, libXv, libXrandr, libvdpau
 , withGtk2 ? false, withGtk3 ? true
 }:
 
@@ -15,8 +15,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig m4 ];
 
-  buildInputs = [ gtk2 gtk3 libXv libvdpau ];
+  buildInputs = [ jansson gtk2 gtk3 libXv libXrandr libvdpau nvidia_x11 ];
 
+  NIX_LDFLAGS = [ "-lvdpau" "-lXrandr" "-lXv" "-lnvidia-ml" ];
+
+  makeFlags = [ "NV_USE_BUNDLED_LIBJANSSON=0" ];
   installFlags = [ "PREFIX=$(out)" ];
 
   preBuild = ''
@@ -37,7 +40,7 @@ stdenv.mkDerivation rec {
   '';
 
   postFixup = ''
-    patchelf --set-rpath "$(patchelf --print-rpath $out/bin/nvidia-settings):$out/lib:${nvidia_x11}/lib" \
+    patchelf --set-rpath "$(patchelf --print-rpath $out/bin/nvidia-settings):$out/lib" \
       $out/bin/nvidia-settings
   '';
 
diff --git a/pkgs/os-specific/linux/tp_smapi/default.nix b/pkgs/os-specific/linux/tp_smapi/default.nix
index cb5c539a94e..765305d0fda 100644
--- a/pkgs/os-specific/linux/tp_smapi/default.nix
+++ b/pkgs/os-specific/linux/tp_smapi/default.nix
@@ -1,14 +1,16 @@
-{ stdenv, fetchurl, kernel, writeScript, coreutils, gnugrep, jq, curl
+{ stdenv, lib, fetchFromGitHub, kernel, writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts
 }:
 
 stdenv.mkDerivation rec {
   name = "tp_smapi-${version}-${kernel.version}";
-
   version = "0.42";
 
-  src = fetchurl {
-    url = "https://github.com/evgeni/tp_smapi/archive/tp-smapi/${version}.tar.gz";
-    sha256 = "cd28bf6ee21b2c27b88d947cb0bfcb19648c7daa5d350115403dbcad05849381";
+  src = fetchFromGitHub {
+    owner = "evgeni";
+    repo = "tp_smapi";
+    rev = "tp-smapi/${version}";
+    sha256 = "12lnig90lrmkmqwl386q7ssqs9p0jikqhwl2wsmcmii1gn92hzfy";
+    name = "tp-smapi-${version}";
   };
 
   hardeningDisable = [ "pic" ];
@@ -28,7 +30,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   passthru.updateScript = import ./update.nix {
-    inherit writeScript coreutils gnugrep jq curl;
+    inherit lib writeScript coreutils gnugrep jq curl common-updater-scripts;
   };
 
   meta = {
diff --git a/pkgs/os-specific/linux/tp_smapi/update.nix b/pkgs/os-specific/linux/tp_smapi/update.nix
index 0c97d18472c..94eb44b744c 100644
--- a/pkgs/os-specific/linux/tp_smapi/update.nix
+++ b/pkgs/os-specific/linux/tp_smapi/update.nix
@@ -1,23 +1,10 @@
-{ writeScript, coreutils, gnugrep, jq, curl
-}:
+{ lib, writeScript, coreutils, curl, gnugrep, jq, common-updater-scripts }:
 
 writeScript "update-tp_smapi" ''
-PATH=${coreutils}/bin:${gnugrep}/bin:${jq}/bin:${curl}/bin
+PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep jq ]}
 
-pushd pkgs/os-specific/linux/tp_smapi
-
-tmpfile=`mktemp`
 tags=`curl -s https://api.github.com/repos/evgeni/tp_smapi/tags`
 latest_tag=`echo $tags | jq -r '.[] | .name' | grep -oP "^tp-smapi/\K.*" | sort --version-sort | tail -1`
-sha256=`curl -sL "https://github.com/evgeni/tp_smapi/archive/tp-smapi/$latest_tag.tar.gz" | sha256sum | cut -d" " -f1`
-
-cat > update.json <<EOF
-{
-  "version": "$latest_tag",
-  "url": "https://github.com/evgeni/tp_smapi/archive/tp-smapi/$latest_tag.tar.gz",
-  "sha256": "$sha256"
-}
-EOF
 
-popd
+update-source-version linuxPackages.tp_smapi "$latest_tag"
 ''