diff options
author | Joachim Fasting <joachifm@fastmail.fm> | 2016-11-28 11:38:23 +0100 |
---|---|---|
committer | Joachim Fasting <joachifm@fastmail.fm> | 2016-11-28 11:41:12 +0100 |
commit | 5da1394a587a9123f07a55d2bf8d9966df907c10 (patch) | |
tree | 695819c2883356b0077f97dde84b244e26b5b516 /pkgs/os-specific/linux/gradm | |
parent | b90ed0cc80293e16a219193f4b2495be14fd563b (diff) |
Revert "gradm: fix using gradm while the RBAC system is active"
This reverts commit fdbf7dc8b38cd523804d342d2c153dfeb10cc83d. Unfortunately, while gradm now works when the RBAC system is enabled, gradm still fails when full system learning is enabled, so I probably need to try again later.
Diffstat (limited to 'pkgs/os-specific/linux/gradm')
-rw-r--r-- | pkgs/os-specific/linux/gradm/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/gradm/gradm_nix_store.patch | 31 |
2 files changed, 0 insertions, 33 deletions
diff --git a/pkgs/os-specific/linux/gradm/default.nix b/pkgs/os-specific/linux/gradm/default.nix index 2beb07094697d..7f64ed227719a 100644 --- a/pkgs/os-specific/linux/gradm/default.nix +++ b/pkgs/os-specific/linux/gradm/default.nix @@ -12,8 +12,6 @@ stdenv.mkDerivation rec { sha256 = "0y5565rhil5ciprwz7nx4s4ah7dsxx7zrkg42dbq0mcg8m316xrb"; }; - patches = [ ./gradm_nix_store.patch ]; - nativeBuildInputs = [ bison flex ]; buildInputs = [ pam ]; diff --git a/pkgs/os-specific/linux/gradm/gradm_nix_store.patch b/pkgs/os-specific/linux/gradm/gradm_nix_store.patch deleted file mode 100644 index c1b7047324b14..0000000000000 --- a/pkgs/os-specific/linux/gradm/gradm_nix_store.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -ruN a/gradm_adm.c b/gradm_adm.c ---- a/gradm_adm.c 2016-08-13 18:56:45.000000000 +0200 -+++ b/gradm_adm.c 2016-11-26 02:47:05.829718770 +0100 -@@ -166,6 +166,8 @@ - ADD_OBJ("/usr/libx32", "rx"); - ADD_OBJ("/lib64", "rx"); - ADD_OBJ("/usr/lib64", "rx"); -+ ADD_OBJ("/nix/store", "h"); -+ ADD_OBJ("/nix/store/*/lib", "rx"); - ADD_OBJ(gradm_name, "x"); - ADD_OBJ(grpam_path, "x"); - -@@ -286,6 +288,8 @@ - ADD_OBJ("/usr/lib32", "rx"); - ADD_OBJ("/lib64", "rx"); - ADD_OBJ("/usr/lib64", "rx"); -+ ADD_OBJ("/nix/store", "h"); -+ ADD_OBJ("/nix/store/*/lib", "rx"); - ADD_OBJ("/tmp", ""); - ADD_OBJ("/tmp/krb5cc_pam*", "rwcd"); - ADD_OBJ(grpam_path, "x"); -@@ -369,6 +373,9 @@ - ADD_OBJ("/lib", "rx"); - ADD_OBJ("/lib32", "rx"); - ADD_OBJ("/lib64", "rx"); -+ ADD_OBJ("/nix/store", "h"); -+ ADD_OBJ("/nix/store/*/bin", "rx"); -+ ADD_OBJ("/nix/store/*/lib", "rx"); - ADD_OBJ("/usr", "rx"); - ADD_OBJ("/proc", "r"); - ADD_OBJ("/boot", "h"); |