commit 3b883d3cdf8942c56e5f232973b50fc1c9e941aa · pyrox.dev/nixpkgs

+1 -1

lib/default.nix

···

       97
       97
        
           inherit (self.strings) concatStrings concatMapStrings concatImapStrings

     

       98
       98
        
             intersperse concatStringsSep concatMapStringsSep

     

       99
       99
        
             concatImapStringsSep concatLines makeSearchPath makeSearchPathOutput

     

       100
       100
       -
             makeLibraryPath makeBinPath optionalString

     

       100
       100
       +
             makeLibraryPath makeIncludePath makeBinPath optionalString

     

       101
       101
        
             hasInfix hasPrefix hasSuffix stringToCharacters stringAsChars escape

     

       102
       102
        
             escapeShellArg escapeShellArgs

     

       103
       103
        
             isStorePath isStringLike

+12

lib/strings.nix

···

       206
       206
        
         */

     

       207
       207
        
         makeLibraryPath = makeSearchPathOutput "lib" "lib";

     

       208
       208
        
       

     

       209
       209
       +
         /* Construct an include search path (such as C_INCLUDE_PATH) containing the

     

       210
       210
       +
            header files for a set of packages or paths.

     

       211
       211
       +
       

     

       212
       212
       +
            Example:

     

       213
       213
       +
              makeIncludePath [ "/usr" "/usr/local" ]

     

       214
       214
       +
              => "/usr/include:/usr/local/include"

     

       215
       215
       +
              pkgs = import <nixpkgs> { }

     

       216
       216
       +
              makeIncludePath [ pkgs.openssl pkgs.zlib ]

     

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

     

       218
       218
       +
         */

     

       219
       219
       +
         makeIncludePath = makeSearchPathOutput "dev" "include";

     

       220
       220
       +
       

     

       209
       221
        
         /* Construct a binary search path (such as $PATH) containing the

     

       210
       222
        
            binaries for a set of packages.

     

       211
       223

+30

lib/tests/misc.nix

···

       64
       64
        
           lists

     

       65
       65
        
           listToAttrs

     

       66
       66
        
           makeExtensible

     

       67
       67
       +
           makeIncludePath

     

       67
       68
        
           makeOverridable

     

       68
       69
        
           mapAttrs

     

       69
       70
        
           matchAttrs

     
···

       294
       295
        
         testConcatLines = {

     

       295
       296
        
           expr = concatLines ["a" "b" "c"];

     

       296
       297
        
           expected = "a\nb\nc\n";

     

       298
       298
       +
         };

     

       299
       299
       +
       

     

       300
       300
       +
         testMakeIncludePathWithPkgs = {

     

       301
       301
       +
           expr = (makeIncludePath [

     

       302
       302
       +
             # makeIncludePath preferably selects the "dev" output

     

       303
       303
       +
             { dev.outPath = "/dev"; out.outPath = "/out"; outPath = "/default"; }

     

       304
       304
       +
             # "out" is used if "dev" is not found

     

       305
       305
       +
             { out.outPath = "/out"; outPath = "/default"; }

     

       306
       306
       +
             # And it returns the derivation directly if there's no "out" either

     

       307
       307
       +
             { outPath = "/default"; }

     

       308
       308
       +
             # Same if the output is specified explicitly, even if there's a "dev"

     

       309
       309
       +
             { dev.outPath = "/dev"; outPath = "/default"; outputSpecified = true; }

     

       310
       310
       +
           ]);

     

       311
       311
       +
           expected = "/dev/include:/out/include:/default/include:/default/include";

     

       312
       312
       +
         };

     

       313
       313
       +
       

     

       314
       314
       +
         testMakeIncludePathWithEmptyList = {

     

       315
       315
       +
           expr = (makeIncludePath [ ]);

     

       316
       316
       +
           expected = "";

     

       317
       317
       +
         };

     

       318
       318
       +
       

     

       319
       319
       +
         testMakeIncludePathWithOneString = {

     

       320
       320
       +
           expr = (makeIncludePath [ "/usr" ]);

     

       321
       321
       +
           expected = "/usr/include";

     

       322
       322
       +
         };

     

       323
       323
       +
       

     

       324
       324
       +
         testMakeIncludePathWithManyString = {

     

       325
       325
       +
           expr = (makeIncludePath [ "/usr" "/usr/local" ]);

     

       326
       326
       +
           expected = "/usr/include:/usr/local/include";

     

       297
       327
        
         };

     

       298
       328
        
       

     

       299
       329
        
         testReplicateString = {