commit f6b9e011c511c62763400b3f37f45c2a012fd9cd · pyrox.dev/nixpkgs

+13 -1

pkgs/development/lisp-modules/nix-cl.nix

···

       177
       177
        
               asdf = "${asdfFasl}/asdf.${faslExt}";

     

       178
       178
        
             };

     

       179
       179
        
       

     

       180
       180
       -
             preConfigure = ''

     

       180
       180
       +
             configurePhase = ''

     

       181
       181
       +
               runHook preConfigure

     

       182
       182
       +
       

     

       181
       183
        
               source ${./setup-hook.sh}

     

       182
       184
        
               buildAsdfPath

     

       185
       185
       +
       

     

       186
       186
       +
               runHook postConfigure

     

       183
       187
        
             '';

     

       184
       188
        
       

     

       185
       189
        
             buildPhase = optionalString (src != null) ''

     

       190
       190
       +
               runHook preBuild

     

       191
       191
       +
       

     

       186
       192
        
               export CL_SOURCE_REGISTRY=$CL_SOURCE_REGISTRY:$src//

     

       187
       193
        
               export ASDF_OUTPUT_TRANSLATIONS="$src:$(pwd):${storeDir}:${storeDir}"

     

       188
       194
        
               ${pkg}/bin/${program} ${toString flags} < $buildScript

     

       195
       195
       +
       

     

       196
       196
       +
               runHook postBuild

     

       189
       197
        
             '';

     

       190
       198
        
       

     

       191
       199
        
             # Copy compiled files to store

     
···

       200
       208
        
                   concatMapStringsSep "\\|" (replaceStrings ["." "+"] ["[.]" "[+]"]) systems;

     

       201
       209
        
               in

     

       202
       210
        
             ''

     

       211
       211
       +
               runHook preInstall

     

       212
       212
       +
       

     

       203
       213
        
               mkdir -pv $out

     

       204
       214
        
               cp -r * $out

     

       205
       215
        
       

     
···

       207
       217
        
               find $out -name "*.asd" \

     

       208
       218
        
               | grep -v "/\(${mkSystemsRegex systems}\)\.asd$" \

     

       209
       219
        
               | xargs rm -fv || true

     

       220
       220
       +
       

     

       221
       221
       +
               runHook postInstall

     

       210
       222
        
             '';

     

       211
       223
        
       

     

       212
       224
        
             dontPatchShebangs = true;

+15

pkgs/development/lisp-modules/packages.nix

···

       28
       28
        
             build = (build-asdf-system (args' // { version = args'.version + "-build"; }))

     

       29
       29
        
               .overrideAttrs(o: {

     

       30
       30
        
                 buildPhase = with builtins; ''

     

       31
       31
       +
                   runHook preBuild

     

       32
       32
       +
       

     

       31
       33
        
                   mkdir __fasls

     

       32
       34
        
                   export ASDF_OUTPUT_TRANSLATIONS="$(pwd):$(pwd)/__fasls:${storeDir}:${storeDir}"

     

       33
       35
        
                   export CL_SOURCE_REGISTRY=$CL_SOURCE_REGISTRY:$(pwd)//

     

       34
       36
        
                   ${o.pkg}/bin/${o.program} ${toString (o.flags or [])} < ${o.buildScript}

     

       37
       37
       +
       

     

       38
       38
       +
                   runHook postBuild

     

       35
       39
        
                 '';

     

       36
       40
        
                 installPhase = ''

     

       41
       41
       +
                   runHook preInstall

     

       42
       42
       +
       

     

       37
       43
        
                   mkdir -pv $out

     

       38
       44
        
                   rm -rf __fasls

     

       39
       45
        
                   cp -r * $out

     

       46
       46
       +
       

     

       47
       47
       +
                   runHook postInstall

     

       40
       48
        
                 '';

     

       41
       49
        
               });

     

       42
       50
        
           in build-asdf-system (args' // {

     

       43
       51
        
             # Patches are already applied in `build`

     

       44
       52
        
             patches = [];

     

       53
       53
       +
             postPatch = "";

     

       45
       54
        
             src = build;

     

       46
       55
        
           });

     

       47
       56
        
       

     
···

       151
       160
        
         cephes = build-with-compile-into-pwd {

     

       152
       161
        
           inherit (super.cephes) pname version src lispLibs;

     

       153
       162
        
           patches = [ ./patches/cephes-make.patch ];

     

       163
       163
       +
           postPatch = ''

     

       164
       164
       +
             find \( -name '*.dll' -o -name '*.dylib' -o -name '*.so' \) -delete

     

       165
       165
       +
           '';

     

       154
       166
        
           postConfigure = ''

     

       155
       167
        
             substituteAllInPlace cephes.asd

     

       168
       168
       +
           '';

     

       169
       169
       +
           postInstall = ''

     

       170
       170
       +
             find $out -name '*.o' -delete

     

       156
       171
        
           '';

     

       157
       172
        
         };

     

       158
       173

+16 -17

pkgs/development/lisp-modules/patches/cephes-make.patch

···

       1
       1
        
       --- a/cephes.asd

     

       2
       2
        
       +++ b/cephes.asd

     

       3
       3
       -
       @@ -5,7 +5,7 @@

     

       4
       4
       -
        (defclass makefile (source-file) ((type :initform "m")))

     

       5
       5
       -
        (defmethod perform ((o load-op) (c makefile)) t)

     

       6
       6
       -
        (defmethod perform ((o compile-op) (c makefile))

     

       7
       7
       -
       -  (let* ((lib-dir (system-relative-pathname "cephes" "scipy-cephes"))

     

       8
       8
       -
       +  (let* ((lib-dir #P"@out@/scipy-cephes")

     

       9
       9
       -
                 (lib (make-pathname :directory `(:relative ,(namestring lib-dir))

     

       10
       10
       -
                                     :name "libmd"

     

       11
       11
       -
                                     :type #+darwin "dylib" #+(and unix (not darwin)) "so" #+(or windows win32) "dll"))

     

       12
       12
       -
       @@ -14,7 +14,7 @@

     

       13
       13
       -
        	(format *error-output* "Library ~S exists, skipping build" lib)

     

       14
       14
       -
        	(format *error-output* "Building ~S~%" lib))

     

       15
       15
       -
            (unless built

     

       16
       16
       -
       -      (chdir (native-namestring lib-dir))

     

       17
       17
       -
       +      (chdir "scipy-cephes")

     

       18
       18
       -
              (run-program "make" :output t))))

     

       3
       3
       +
       @@ -16,7 +16,7 @@

     

       4
       4
       +
          (defclass makefile (source-file) ((type :initform "m")))

     

       5
       5
       +
          (defmethod perform ((o load-op) (c makefile)) t)

     

       6
       6
       +
          (defmethod perform ((o compile-op) (c makefile))

     

       7
       7
       +
       -    (let* ((lib-dir (system-relative-pathname "cephes" "scipy-cephes/"))

     

       8
       8
       +
       +    (let* ((lib-dir #P"@out@/scipy-cephes/")

     

       9
       9
       +
                   (lib (make-pathname :directory (pathname-directory lib-dir)

     

       10
       10
       +
                                       :name #+(or (and unix (not darwin)) windows win32) "libmd"

     

       11
       11
       +
        			       #+(and darwin arm64) "libmd-arm64"

     

       12
       12
       +
       @@ -30,7 +30,7 @@

     

       13
       13
       +
        	  (format *error-output* "Library ~S exists, skipping build" lib)

     

       14
       14
       +
        	  (format *error-output* "Building ~S~%" lib))

     

       15
       15
       +
              (unless built

     

       16
       16
       +
       -	(chdir (native-namestring lib-dir))

     

       17
       17
       +
       +	(chdir "scipy-cephes")

     

       18
       18
       +
        	(run-program "make" :output t)))))

     

       19
       19
        
        

     

       20
       20
        
        (defsystem "cephes"

     

       21
       21
        
       

     

       22
       22
       -
       Diff finished.  Thu Mar 28 08:13:30 2024