diff --git a/pkgs/build-support/builder-defs/template-composing-builder.nix b/pkgs/build-support/builder-defs/template-composing-builder.nix index 988efbfadd27..979df800008e 100644 --- a/pkgs/build-support/builder-defs/template-composing-builder.nix +++ b/pkgs/build-support/builder-defs/template-composing-builder.nix @@ -19,5 +19,8 @@ rec { name = "${abort "Specify name"}-" + version; meta = { description = "${abort "Specify description"}"; + maintainers = [ + a.lib.maintainers.(abort "Specify maintainer") + ]; }; } diff --git a/pkgs/tools/system/suid-chroot/default.nix b/pkgs/tools/system/suid-chroot/default.nix new file mode 100644 index 000000000000..3b19c711410c --- /dev/null +++ b/pkgs/tools/system/suid-chroot/default.nix @@ -0,0 +1,34 @@ +a : +let + fetchurl = a.fetchurl; + + version = a.lib.attrByPath ["version"] "1.0.1" a; + buildInputs = with a; [ + + ]; +in +rec { + src = fetchurl { + url = "http://myweb.tiscali.co.uk/scottrix/linux/download/suid-chroot-${version}.tar.bz2"; + sha256 = "15gs09md4lyym47ipzffm1ws8jkg028x0cgwxxs9qkdqbl5zb777"; + }; + + inherit buildInputs; + configureFlags = []; + + /* doConfigure should be removed if not needed */ + phaseNames = ["replacePaths" "doMakeInstall"]; + + installFlags = "PREFIX=$out"; + + replacePaths = a.fullDepEntry ('' + sed -e "s@/usr/@$out/@g" -i Makefile + '') ["minInit" "doUnpack"]; + + name = "suid-chroot-" + version; + meta = { + description = "Setuid-safe wrapper for chroot"; + maintainers = [ + ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ec622db32ec..cb7e84ccb2f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1321,6 +1321,9 @@ let inherit fetchurl stdenv coreutils pam groff; }; + suidChroot = builderDefsPackage (import ../tools/system/suid-chroot) { + }; + superkaramba = import ../desktops/superkaramba { inherit stdenv fetchurl kdebase kdelibs zlib libjpeg perl qt3 python libpng freetype expat;