commit ab0a0c004e1076315c8ed910437e6cf9c2f087ff · pyrox.dev/nixpkgs

+4 -5

lib/strings.nix

···

       88
       88
        
         makeSearchPath = subDir: packages:

     

       89
       89
        
           concatStringsSep ":" (map (path: path + "/" + subDir) packages);

     

       90
       90
        
       

     

       91
       91
       -
         /* Construct a Unix-style search path, given trying outputs in order.

     

       91
       91
       +
         /* Construct a Unix-style search path, using given package output.

     

       92
       92
        
            If no output is found, fallback to `.out` and then to the default.

     

       93
       93
        
       

     

       94
       94
        
            Example:

     

       95
       95
       -
              makeSearchPathOutputs "bin" ["bin"] [ pkgs.openssl pkgs.zlib ]

     

       96
       96
       -
              => "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r-bin/bin:/nix/store/wwh7mhwh269sfjkm6k5665b5kgp7jrk2-zlib-1.2.8/bin"

     

       95
       95
       +
              makeSearchPathOutput "dev" "bin" [ pkgs.openssl pkgs.zlib ]

     

       96
       96
       +
              => "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r-dev/bin:/nix/store/wwh7mhwh269sfjkm6k5665b5kgp7jrk2-zlib-1.2.8/bin"

     

       97
       97
        
         */

     

       98
       98
       -
         makeSearchPathOutputs = subDir: outputs: pkgs:

     

       99
       99
       -
           makeSearchPath subDir (map (pkg: if pkg.outputUnspecified or false then lib.tryAttrs (outputs ++ ["out"]) pkg else pkg) pkgs);

     

       98
       98
       +
         makeSearchPathOutput = output: subDir: pkgs: makeSearchPath subDir (map (lib.getOutput output) pkgs);

     

       100
       99
        
       

     

       101
       100
        
         /* Construct a library search path (such as RPATH) containing the

     

       102
       101
        
            libraries for a set of packages

+1 -1

nixos/modules/services/web-servers/apache-httpd/trac.nix

···

       96
       96
        
         globalEnvVars = singleton

     

       97
       97
        
           { name = "PYTHONPATH";

     

       98
       98
        
             value =

     

       99
       99
       -
               makeSearchPathOutputs "lib/${pkgs.python.libPrefix}/site-packages" ["lib"]

     

       99
       99
       +
               makeSearchPathOutput "lib" "lib/${pkgs.python.libPrefix}/site-packages"

     

       100
       100
        
                 [ pkgs.mod_python

     

       101
       101
        
                   pkgs.pythonPackages.trac

     

       102
       102
        
                   pkgs.setuptools

+1 -1

nixos/modules/services/x11/desktop-managers/enlightenment.nix

···

       7
       7
        
         e = pkgs.enlightenment;

     

       8
       8
        
         xcfg = config.services.xserver;

     

       9
       9
        
         cfg = xcfg.desktopManager.enlightenment;

     

       10
       10
       -
         GST_PLUGIN_PATH = lib.makeSearchPathOutputs "lib/gstreamer-1.0" ["lib"] [

     

       10
       10
       +
         GST_PLUGIN_PATH = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" [

     

       11
       11
        
           pkgs.gst_all_1.gst-plugins-base

     

       12
       12
        
           pkgs.gst_all_1.gst-plugins-good

     

       13
       13
        
           pkgs.gst_all_1.gst-plugins-bad

+1 -1

nixos/modules/system/boot/loader/grub/grub.nix

···

       58
       58
        
             path = (makeBinPath ([

     

       59
       59
        
               pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils pkgs.btrfs-progs

     

       60
       60
        
               pkgs.utillinux ] ++ (if cfg.efiSupport && (cfg.version == 2) then [pkgs.efibootmgr ] else [])

     

       61
       61
       -
             )) + ":" + (makeSearchPathOutputs "sbin" ["bin"] [

     

       61
       61
       +
             )) + ":" + (makeSearchPathOutput "bin" "sbin" [

     

       62
       62
        
               pkgs.mdadm pkgs.utillinux

     

       63
       63
        
             ]);

     

       64
       64
        
           });

+1 -1

nixos/modules/system/boot/systemd-unit-options.nix

···

       193
       193
        
       

     

       194
       194
        
           path = mkOption {

     

       195
       195
        
             default = [];

     

       196
       196
       -
             apply = ps: "${makeBinPath ps}:${makeSearchPathOutputs "sbin" ["bin"] ps}";

     

       196
       196
       +
             apply = ps: "${makeBinPath ps}:${makeSearchPathOutput "bin" "sbin" ps}";

     

       197
       197
        
             description = ''

     

       198
       198
        
               Packages added to the service's <envar>PATH</envar>

     

       199
       199
        
               environment variable.  Both the <filename>bin</filename>

+1 -1

pkgs/applications/misc/guake/default.nix

···

       16
       16
        
       with lib;

     

       17
       17
        
       

     

       18
       18
        
       let inputs = [ dbus gtk2 gconf python2 libutempter vte keybinder gnome3.gnome_common ];

     

       19
       19
       -
           pyPath = makeSearchPathOutputs python2.sitePackages ["lib"] (attrVals [ "dbus" "notify" "pyGtkGlade" "pyxdg" ] python2Packages ++ [ gnome2.gnome_python ]);

     

       19
       19
       +
           pyPath = makeSearchPathOutput "lib" python2.sitePackages (attrVals [ "dbus" "notify" "pyGtkGlade" "pyxdg" ] python2Packages ++ [ gnome2.gnome_python ]);

     

       20
       20
        
        in stdenv.mkDerivation rec {

     

       21
       21
        
         name = "guake-${version}";

     

       22
       22
        
         version = "0.8.3";

+1 -1

pkgs/applications/misc/roxterm/default.nix

···

       29
       29
        
                                "-I${dbus_libs.lib}/lib/dbus-1.0/include" ];

     

       30
       30
        
       

     

       31
       31
        
         # Fix up python path so the lockfile library is on it.

     

       32
       32
       -
         PYTHONPATH = stdenv.lib.makeSearchPathOutputs pythonFull.sitePackages ["lib"] [

     

       32
       32
       +
         PYTHONPATH = stdenv.lib.makeSearchPathOutput "lib" pythonFull.sitePackages [

     

       33
       33
        
           pythonPackages.curses pythonPackages.lockfile

     

       34
       34
        
         ];

     

       35
       35

+1 -1

pkgs/applications/networking/browsers/chromium/plugins.nix

···

       65
       65
        
       

     

       66
       66
        
           patchPhase = let

     

       67
       67
        
             rpaths = [ stdenv.cc.cc ];

     

       68
       68
       -
             mkrpath = p: "${makeSearchPathOutputs "lib64" ["lib"] p}:${makeLibraryPath p}";

     

       68
       68
       +
             mkrpath = p: "${makeSearchPathOutput "lib" "lib64" p}:${makeLibraryPath p}";

     

       69
       69
        
           in ''

     

       70
       70
        
             for sofile in PepperFlash/libpepflashplayer.so \

     

       71
       71
        
                           libwidevinecdm.so libwidevinecdmadapter.so; do

+1 -1

pkgs/applications/networking/browsers/firefox-bin/default.nix

···

       105
       105
        
             libheimdal

     

       106
       106
        
             libpulseaudio

     

       107
       107
        
             systemd

     

       108
       108
       -
           ] + ":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] [

     

       108
       108
       +
           ] + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [

     

       109
       109
        
             stdenv.cc.cc

     

       110
       110
        
           ];

     

       111
       111

+1 -1

pkgs/applications/networking/browsers/google-chrome/default.nix

···

       65
       65
        
           tar xf data.tar.xz

     

       66
       66
        
         '';

     

       67
       67
        
       

     

       68
       68
       -
         rpath = makeLibraryPath deps + ":" + makeSearchPathOutputs "lib64" ["lib"] deps;

     

       68
       68
       +
         rpath = makeLibraryPath deps + ":" + makeSearchPathOutput "lib" "lib64" deps;

     

       69
       69
        
         binpath = makeBinPath deps;

     

       70
       70
        
       

     

       71
       71
        
         installPhase = ''

+1 -1

pkgs/applications/networking/browsers/opera/default.nix

···

       46
       46
        
       

     

       47
       47
        
         libPath = stdenv.lib.makeLibraryPath buildInputs

     

       48
       48
        
           + stdenv.lib.optionalString (stdenv.system == "x86_64-linux")

     

       49
       49
       -
             (":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] buildInputs);

     

       49
       49
       +
             (":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs);

     

       50
       50
        
       

     

       51
       51
        
         preFixup =

     

       52
       52
        
           ''

+1 -1

pkgs/applications/networking/browsers/vivaldi/default.nix

···

       46
       46
        
       

     

       47
       47
        
         libPath = stdenv.lib.makeLibraryPath buildInputs

     

       48
       48
        
           + stdenv.lib.optionalString (stdenv.system == "x86_64-linux")

     

       49
       49
       -
             (":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] buildInputs);

     

       49
       49
       +
             (":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs);

     

       50
       50
        
       

     

       51
       51
        
         buildPhase = ''

     

       52
       52
        
           echo "Patching Vivaldi binaries"

+1 -1

pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix

···

       105
       105
        
             nspr

     

       106
       106
        
             nss

     

       107
       107
        
             pango

     

       108
       108
       -
           ] + ":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] [

     

       108
       108
       +
           ] + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [

     

       109
       109
        
             stdenv.cc.cc

     

       110
       110
        
           ];

     

       111
       111

+1 -1

pkgs/applications/science/math/mathematica/9.nix

···

       63
       63
        
       

     

       64
       64
        
         ldpath = stdenv.lib.makeLibraryPath buildInputs

     

       65
       65
        
           + stdenv.lib.optionalString (stdenv.system == "x86_64-linux")

     

       66
       66
       -
             (":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] buildInputs);

     

       66
       66
       +
             (":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs);

     

       67
       67
        
       

     

       68
       68
        
         phases = "unpackPhase installPhase fixupPhase";

     

       69
       69

+1 -1

pkgs/applications/science/math/mathematica/default.nix

···

       73
       73
        
       

     

       74
       74
        
         ldpath = stdenv.lib.makeLibraryPath buildInputs

     

       75
       75
        
           + stdenv.lib.optionalString (stdenv.system == "x86_64-linux")

     

       76
       76
       -
             (":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] buildInputs);

     

       76
       76
       +
             (":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs);

     

       77
       77
        
       

     

       78
       78
        
         phases = "unpackPhase installPhase fixupPhase";

     

       79
       79

+1 -1

pkgs/applications/version-management/reposurgeon/default.nix

···

       51
       51
        
               [ out git bazaar cvs darcs fossil mercurial

     

       52
       52
        
                 monotone rcs src subversion cvs_fast_export ]

     

       53
       53
        
             );

     

       54
       54
       -
             pythonpath = makeSearchPathOutputs python27.sitePackages ["lib"] (

     

       54
       54
       +
             pythonpath = makeSearchPathOutput "lib" python27.sitePackages (

     

       55
       55
        
               filter (x: x != null)

     

       56
       56
        
               [ python27Packages.readline or null python27Packages.hglib or null ]

     

       57
       57
        
             );

+1 -1

pkgs/games/ue4demos/default.nix

···

       12
       12
        
       

     

       13
       13
        
             rtdeps = stdenv.lib.makeLibraryPath

     

       14
       14
        
               [ xorg.libXxf86vm xorg.libXext openal ]

     

       15
       15
       -
               + ":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] [ stdenv.cc.cc ];

     

       15
       15
       +
               + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc ];

     

       16
       16
        
       

     

       17
       17
        
             buildCommand =

     

       18
       18
        
             ''

+1 -1

pkgs/os-specific/linux/pm-utils/default.nix

···

       6
       6
        
         binPath = stdenv.lib.makeBinPath

     

       7
       7
        
           [ coreutils gnugrep utillinux kmod procps kbd dbus_tools ];

     

       8
       8
        
       

     

       9
       9
       -
         sbinPath = stdenv.lib.makeSearchPathOutputs "sbin" ["bin"]

     

       9
       9
       +
         sbinPath = stdenv.lib.makeSearchPathOutput "bin" "sbin"

     

       10
       10
        
           [ procps ];

     

       11
       11
        
       

     

       12
       12
        
       in