From 9219580c823e8aa724b7426cddd7222d78856bf9 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 19 Sep 2018 14:04:48 -0500 Subject: i7z: simplify a bit --- pkgs/os-specific/linux/i7z/default.nix | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) (limited to 'pkgs/os-specific/linux/i7z') diff --git a/pkgs/os-specific/linux/i7z/default.nix b/pkgs/os-specific/linux/i7z/default.nix index 3bf9fbd74d3..c6e06bf8527 100644 --- a/pkgs/os-specific/linux/i7z/default.nix +++ b/pkgs/os-specific/linux/i7z/default.nix @@ -16,39 +16,24 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildPhase = '' - runHook preBuild - - make - ${lib.optionalString withGui '' + postBuild = lib.optionalString withGui '' cd GUI qmake make clean make cd .. - ''} - - runHook postBuild ''; - installPhase = '' - runHook preInstall - - mkdir -p $out/{bin,sbin} - make install prefix=$out - ${lib.optionalString withGui '' - install -Dm755 GUI/i7z_GUI $out/bin/i7z-gui - ''} - mv $out/sbin/* $out/bin/ - rmdir $out/sbin + makeFlags = [ "prefix=${placeholder "out"}" ]; - runHook postInstall + postInstall = lib.optionalString withGui '' + install -Dm755 GUI/i7z_GUI $out/bin/i7z-gui ''; meta = with lib; { description = "A better i7 (and now i3, i5) reporting tool for Linux"; - homepage = https://github.com/ajaiantilal/i7z; - repositories.git = https://github.com/ajaiantilal/i7z.git; + homepage = https://github.com/DimitryAndric/i7z; + repositories.git = https://github.com/DimitryAndric/i7z.git; license = licenses.gpl2; maintainers = with maintainers; [ bluescreen303 ]; # broken on ARM -- cgit 1.4.1