commit 47ea8c097c08ee19f8622eae4e9e3acdc99fce3e · pyrox.dev/nixpkgs

+30 -14

pkgs/build-support/build-fhs-userenv/default.nix

···

       1
       1
       -
       { writeText, writeScriptBin, stdenv, ruby } : { env, runScript } :

     

       1
       1
       +
       { runCommand, writeText, writeScriptBin, stdenv, ruby } : { env, runScript ? "bash" } :

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         name = env.pname;

     
···

       9
       9
        
           ${builtins.readFile ./chroot-user.rb}

     

       10
       10
        
         '';

     

       11
       11
        
       

     

       12
       12
       -
         init = writeText "init" ''

     

       13
       13
       -
                  # Make /tmp directory

     

       14
       14
       -
                  mkdir -m 1777 /tmp

     

       12
       12
       +
         init = run: writeText "${name}-init" ''

     

       13
       13
       +
           # Make /tmp directory

     

       14
       14
       +
           mkdir -m 1777 /tmp

     

       15
       15
        
       

     

       16
       16
       -
                  # Expose sockets in /tmp

     

       17
       17
       -
                  for i in /host-tmp/.*-unix; do

     

       18
       18
       -
                    ln -s "$i" "/tmp/$(basename "$i")"

     

       19
       19
       -
                  done

     

       16
       16
       +
           # Expose sockets in /tmp

     

       17
       17
       +
           for i in /host-tmp/.*-unix; do

     

       18
       18
       +
             ln -s "$i" "/tmp/$(basename "$i")"

     

       19
       19
       +
           done

     

       20
       20
        
       

     

       21
       21
       -
                  [ -d "$1" ] && [ -r "$1" ] && cd "$1"

     

       22
       22
       -
                  shift

     

       23
       23
       -
                  exec "${runScript}" "$@"

     

       24
       24
       -
                '';

     

       21
       21
       +
           [ -d "$1" ] && [ -r "$1" ] && cd "$1"

     

       22
       22
       +
           shift

     

       23
       23
       +
           exec ${run} "$@"

     

       24
       24
       +
         '';

     

       25
       25
        
       

     

       26
       26
       -
       in writeScriptBin name ''

     

       26
       26
       +
       in runCommand name {

     

       27
       27
       +
         passthru.env =

     

       28
       28
       +
           runCommand "${name}-shell-env" {

     

       29
       29
       +
             shellHook = ''

     

       30
       30
       +
               exec ${chroot-user}/bin/chroot-user ${env} bash -l ${init "bash"} "$(pwd)"

     

       31
       31
       +
             '';

     

       32
       32
       +
           } ''

     

       33
       33
       +
             echo >&2 ""

     

       34
       34
       +
             echo >&2 "*** User chroot 'env' attributes are intended for interactive nix-shell sessions, not for building! ***"

     

       35
       35
       +
             echo >&2 ""

     

       36
       36
       +
             exit 1

     

       37
       37
       +
           '';

     

       38
       38
       +
       } ''

     

       39
       39
       +
         mkdir -p $out/bin

     

       40
       40
       +
         cat <<EOF >$out/bin/${name}

     

       27
       41
        
         #! ${stdenv.shell}

     

       28
       28
       -
         exec ${chroot-user}/bin/chroot-user ${env} bash -l ${init} "$(pwd)" "$@"

     

       42
       42
       +
         exec ${chroot-user}/bin/chroot-user ${env} bash -l ${init runScript} "\$(pwd)" "\$@"

     

       43
       43
       +
         EOF

     

       44
       44
       +
         chmod +x $out/bin/${name}

     

       29
       45
        
       ''

+1 -1

pkgs/top-level/all-packages.nix

···

       296
       296
        
       

     

       297
       297
        
         buildFHSUserEnv = args: userFHSEnv {

     

       298
       298
        
           env = buildFHSEnv (removeAttrs args [ "runScript" ]);

     

       299
       299
       -
           runScript = args.runScript;

     

       299
       299
       +
           runScript = args.runScript or "bash";

     

       300
       300
        
         };

     

       301
       301
        
       

     

       302
       302
        
         buildMaven = callPackage ../build-support/build-maven.nix {};