diff options
author | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2015-08-31 20:53:41 +0200 |
---|---|---|
committer | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2015-08-31 20:53:41 +0200 |
commit | d35d9910281e6a3f7fb58043a3e47a250cf70f7b (patch) | |
tree | 888380715e71d103c9abcaf95e4c79b2a82176af | |
parent | 11d1eeed7c365f741101977d424807a29040d094 (diff) | |
download | nixpkgs-d35d9910281e6a3f7fb58043a3e47a250cf70f7b.tar nixpkgs-d35d9910281e6a3f7fb58043a3e47a250cf70f7b.tar.gz nixpkgs-d35d9910281e6a3f7fb58043a3e47a250cf70f7b.tar.bz2 nixpkgs-d35d9910281e6a3f7fb58043a3e47a250cf70f7b.tar.lz nixpkgs-d35d9910281e6a3f7fb58043a3e47a250cf70f7b.tar.xz nixpkgs-d35d9910281e6a3f7fb58043a3e47a250cf70f7b.tar.zst nixpkgs-d35d9910281e6a3f7fb58043a3e47a250cf70f7b.zip |
phc-intel: 0.4.0-rev{17 -> 18} for Linux 4.2
Fix build failure: http://hydra.nixos.org/build/25314451/nixlog/1
-rw-r--r-- | pkgs/os-specific/linux/phc-intel/default.nix | 50 |
1 files changed, 28 insertions, 22 deletions
diff --git a/pkgs/os-specific/linux/phc-intel/default.nix b/pkgs/os-specific/linux/phc-intel/default.nix index 4c47047ff74..dd5a2741267 100644 --- a/pkgs/os-specific/linux/phc-intel/default.nix +++ b/pkgs/os-specific/linux/phc-intel/default.nix @@ -2,20 +2,41 @@ assert stdenv.isLinux; # Don't bother with older versions, though some would probably work: -assert stdenv.lib.versionAtLeast kernel.version "4.0"; +assert stdenv.lib.versionAtLeast kernel.version "4.2"; # Disable on grsecurity kernels, which break module building: assert !kernel.features ? grsecurity; -let version = "0.4.0-rev17"; in -stdenv.mkDerivation { +let + release = "0.4.0"; + revbump = "rev18"; # don't forget to change forum download id... + version = "${release}-${revbump}"; +in stdenv.mkDerivation { name = "linux-phc-intel-${version}-${kernel.version}"; src = fetchurl { - sha256 = "1fdfpghnsa5s98lisd2sn0vplrq0n54l0pkyyzkyb77z4fa6bs4p"; - url = "http://www.linux-phc.org/forum/download/file.php?id=166"; - name = "phc-intel-pack-rev17.tar.bz2"; + sha256 = "1480y75yid4nw7dhzm97yb10dykinzjz34abvavsrqpq7qclhv27"; + url = "http://www.linux-phc.org/forum/download/file.php?id=167"; + name = "phc-intel-pack-${revbump}.tar.bz2"; }; + buildInputs = [ which ]; + + makeFlags = with kernel; [ + "DESTDIR=$(out)" + "KERNELSRC=${dev}/lib/modules/${modDirVersion}/build" + ]; + + configurePhase = '' + make $makeFlags brave + ''; + + enableParallelBuilding = false; + + installPhase = '' + install -m 755 -d $out/lib/modules/${kernel.version}/extra/ + install -m 644 *.ko $out/lib/modules/${kernel.version}/extra/ + ''; + meta = with stdenv.lib; { inherit version; description = "Undervolting kernel driver for Intel processors"; @@ -28,22 +49,7 @@ stdenv.mkDerivation { homepage = http://www.linux-phc.org/; downloadPage = "http://www.linux-phc.org/forum/viewtopic.php?f=7&t=267"; license = licenses.gpl2; - platforms = with platforms; linux; + platforms = platforms.linux; maintainers = with maintainers; [ nckx ]; }; - - buildInputs = [ which ]; - - makeFlags = "KERNELSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build DESTDIR=$(out)"; - - configurePhase = '' - echo make $makeFlags brave - ''; - - enableParallelBuilding = false; - - installPhase = '' - install -m 755 -d $out/lib/modules/${kernel.version}/extra/ - install -m 644 *.ko $out/lib/modules/${kernel.version}/extra/ - ''; } |