Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 785e45ac0620
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 50d6617e87f3
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 23, 2017

  1. gkrellm: 2.3.5 -> 2.3.10

    ndowens committed Mar 23, 2017
    Copy the full SHA
    5fbdb79 View commit details

  2. gkrellm: fix homepage

    @vcunat
    vcunat committed Mar 23, 2017
    Copy the full SHA
    817d8a6 View commit details

  3. Merge #24232: gkrellm: 2.3.5 -> 2.3.10

    @vcunat
    vcunat committed Mar 23, 2017
    Copy the full SHA
    50d6617 View commit details
Showing with 16 additions and 14 deletions.
  1. +16 −14 pkgs/applications/misc/gkrellm/default.nix
30 changes: 16 additions & 14 deletions pkgs/applications/misc/gkrellm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
{ fetchurl, stdenv, gettext, pkgconfig, glib, gtk2, libX11, libSM, libICE
, IOKit ? null }:

with stdenv.lib;

stdenv.mkDerivation rec {
name = "gkrellm-2.3.5";
name = "gkrellm-2.3.10";

src = fetchurl {
url = "http://members.dslextreme.com/users/billw/gkrellm/${name}.tar.bz2";
sha256 = "12rc6zaa7kb60b9744lbrlfkxxfniprm6x0mispv63h4kh75navh";
url = "http://gkrellm.srcbox.net/releases/${name}.tar.bz2";
sha256 = "0rnpzjr0ys0ypm078y63q4aplcgdr5nshjzhmz330n6dmnxci7lb";
};

buildInputs = [gettext pkgconfig glib gtk2 libX11 libSM libICE]
++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [gettext glib gtk2 libX11 libSM libICE]
++ optionals stdenv.isDarwin [ IOKit ];

hardeningDisable = [ "format" ];

@@ -22,23 +26,21 @@ stdenv.mkDerivation rec {
sed -i "$i" -e "s|/usr/X11R6|${libX11.dev}|g ; s|-lICE|-lX11 -lICE|g"
done '';

buildPhase = ''
make PREFIX="$out" '';
installPhase = ''
make install PREFIX="$out" '';
installPhase = ''
make DESTDIR=$out install
'';

meta = {
meta = {
description = "Themeable process stack of system monitors";
longDescription =
'' GKrellM is a single process stack of system monitors which supports
applying themes to match its appearance to your window manager, Gtk,
or any other theme.
'';

homepage = http://members.dslextreme.com/users/billw/gkrellm/gkrellm.html;
license = stdenv.lib.licenses.gpl3Plus;

homepage = http://gkrellm.srcbox.net;
license = licenses.gpl3Plus;
maintainers = [ ];
platforms = stdenv.lib.platforms.unix;
platforms = platforms.unix;
};
}