From 82c316e952e85c377a777aaf509004e54408516a Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 22 Sep 2019 15:58:42 +0200 Subject: [PATCH 1/2] radeon-profile: use Qt mkDerivation --- pkgs/tools/misc/radeon-profile/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/radeon-profile/default.nix b/pkgs/tools/misc/radeon-profile/default.nix index 613ad263ed3..e687b30e834 100644 --- a/pkgs/tools/misc/radeon-profile/default.nix +++ b/pkgs/tools/misc/radeon-profile/default.nix @@ -1,6 +1,8 @@ -{ stdenv, fetchFromGitHub, qtbase, qtcharts, qmake, libXrandr, libdrm }: +{ lib, mkDerivation, fetchFromGitHub +, qtbase, qtcharts, qmake, libXrandr, libdrm +}: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "radeon-profile"; version = "20170714"; @@ -20,7 +22,7 @@ stdenv.mkDerivation rec { cp ./radeon-profile $out/bin/radeon-profile ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Application to read current clocks of AMD Radeon cards"; homepage = https://github.com/marazmista/radeon-profile; license = licenses.gpl2Plus; From f7e046831cfc2192f393a3bf3778d009362dd4f0 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 22 Sep 2019 16:11:30 +0200 Subject: [PATCH 2/2] radeon-profile: 20170714 -> 20190903 --- pkgs/tools/misc/radeon-profile/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/radeon-profile/default.nix b/pkgs/tools/misc/radeon-profile/default.nix index e687b30e834..90498767c99 100644 --- a/pkgs/tools/misc/radeon-profile/default.nix +++ b/pkgs/tools/misc/radeon-profile/default.nix @@ -5,7 +5,7 @@ mkDerivation rec { pname = "radeon-profile"; - version = "20170714"; + version = "20190903"; nativeBuildInputs = [ qmake ]; buildInputs = [ qtbase qtcharts libXrandr libdrm ]; @@ -14,12 +14,12 @@ mkDerivation rec { owner = "marazmista"; repo = "radeon-profile"; rev = version; - sha256 = "08fv824iq00zbl9xk9zsfs8gkk8rsy6jlxbmszrjfx7ji28hansd"; + sha256 = "0ax5417q03xjwi3pn7yyjdb90ssaygdprfgb1pz9nkyk6773ckx5"; }) + "/radeon-profile"; - postInstall = '' - mkdir -p $out/bin - cp ./radeon-profile $out/bin/radeon-profile + preConfigure = '' + substituteInPlace radeon-profile.pro \ + --replace "/usr/" "$out/" ''; meta = with lib; {