From 5c6e1efa41be59acc7c36cecf610aa666eff986b Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Mon, 24 Oct 2005 16:07:50 +0000
Subject: [PATCH] add pam (but first test it on NixOS too)

svn path=/nixpkgs/trunk/; revision=4124
---
 pkgs/os-specific/linux/pam/default.nix |  9 +++++++++
 pkgs/system/all-packages-generic.nix   | 10 +++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/os-specific/linux/pam/default.nix

diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix
new file mode 100644
index 00000000000..60b5478c238
--- /dev/null
+++ b/pkgs/os-specific/linux/pam/default.nix
@@ -0,0 +1,9 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "pam-0.80";
+  src = fetchurl {
+    url = http://www.nl.kernel.org/pub/linux/libs/pam/pre/library/Linux-PAM-0.80.tar.bz2;
+    md5 = "ccff87fe639efdfc22b1ba4a0f08ec57";
+  };
+}
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index aaaaad40bfc..7d90b933b40 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -1283,6 +1283,10 @@ rec {
     inherit stdenv mingetty shadowutils;
   };
 
+  pam = (import ../os-specific/linux/pam) {
+    inherit stdenv fetchurl;
+  };
+
   #nfsUtils = (import ../os-specific/linux/nfs-utils) {
   #  inherit fetchurl stdenv;
   #};
@@ -1377,9 +1381,9 @@ rec {
 
   ### APPLICATIONS
 
-  #openoffice = (import ../applications/office/openoffice) {
-  #  inherit fetchurl stdenv tcsh;
-  #};
+  openoffice = (import ../applications/office/openoffice) {
+    inherit fetchurl stdenv tcsh cups;
+  };
 
   cvs = (import ../applications/version-management/cvs) {
     inherit fetchurl stdenv vim;