Merge branch 'nitrogen' of github.com:/auntieNeo/nixpkgs into nitrogen

Conflicts: pkgs/tools/X11/nitrogen/default.nix
2014-06-13 11:41:40 -06:00
parent c55be95e6e 8af05e82a0
commit c977673bb5
3 changed files with 14 additions and 1 deletions
@@ -7,7 +7,6 @@ stdenv.mkDerivation rec {
    url = "http://projects.l3ib.org/nitrogen/files/nitrogen-1.5.2.tar.gz";
    sha256 = "60a2437ce6a6c0ba44505fc8066c1973140d4bb48e1e5649f525c7b0b8bf9fd2";
  };
-
  buildInputs = [ glib gtk2 gtkmm pkgconfig ];

  NIX_LDFLAGS = "-lX11";