Loading pkgs/by-name/li/libcpucycles/environment-variable-tools.patch +12 −15 Original line number Diff line number Diff line Loading @@ -2,31 +2,27 @@ diff --git a/configure b/configure index 87d5c14..5e2a1a4 100755 --- a/configure +++ b/configure @@ -112,21 +112,26 @@ def compilerversion(c): @@ -120,21 +120,25 @@ def compilerversion(c): except: pass -firstcompiler = None - +if c := os.getenv("CC"): + firstcompiler = c + print('using default compiler %s' % c) +else: + firstcompiler = None -with open('compilers/default') as f: - for c in f.readlines(): - c = c.strip() - cv = compilerversion(c) - if cv == None: - print('skipping default compiler %s' % c) - log('skipping default compiler %s' % c) - continue - print('using default compiler %s' % c) - log('using default compiler %s' % c) - firstcompiler = c - break - -if firstcompiler is None: - raise ValueError('did not find a working compiler') +if c := os.getenv("CC"): + firstcompiler = c + print('using default compiler %s' % c) +else: + firstcompiler = None + + with open('compilers/default') as f: + for c in f.readlines(): + c = c.strip() Loading @@ -37,10 +33,11 @@ index 87d5c14..5e2a1a4 100755 + print('using default compiler %s' % c) + firstcompiler = c + break + -if firstcompiler is None: - raise ValueError('did not find a working compiler') + if firstcompiler is None: + raise ValueError('did not find a working compiler') + with open('build/%s/scripts/compiledefault' % host,'w') as f: f.write('#!/bin/sh\n') Loading pkgs/by-name/li/libcpucycles/package.nix +2 −2 Original line number Diff line number Diff line Loading @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "libcpucycles"; version = "20250925"; version = "20260105"; src = fetchzip { url = "https://cpucycles.cr.yp.to/libcpucycles-${finalAttrs.version}.tar.gz"; hash = "sha256-hYHNTuohYztLJJonm9wAkx/wlINWfgX8eL2m31xBuwM="; hash = "sha256-hWmMLBadM/E/kF8D/cTjU+G0f2HTkZQlKoIWsgzAFj0="; }; patches = [ ./environment-variable-tools.patch ]; Loading Loading
pkgs/by-name/li/libcpucycles/environment-variable-tools.patch +12 −15 Original line number Diff line number Diff line Loading @@ -2,31 +2,27 @@ diff --git a/configure b/configure index 87d5c14..5e2a1a4 100755 --- a/configure +++ b/configure @@ -112,21 +112,26 @@ def compilerversion(c): @@ -120,21 +120,25 @@ def compilerversion(c): except: pass -firstcompiler = None - +if c := os.getenv("CC"): + firstcompiler = c + print('using default compiler %s' % c) +else: + firstcompiler = None -with open('compilers/default') as f: - for c in f.readlines(): - c = c.strip() - cv = compilerversion(c) - if cv == None: - print('skipping default compiler %s' % c) - log('skipping default compiler %s' % c) - continue - print('using default compiler %s' % c) - log('using default compiler %s' % c) - firstcompiler = c - break - -if firstcompiler is None: - raise ValueError('did not find a working compiler') +if c := os.getenv("CC"): + firstcompiler = c + print('using default compiler %s' % c) +else: + firstcompiler = None + + with open('compilers/default') as f: + for c in f.readlines(): + c = c.strip() Loading @@ -37,10 +33,11 @@ index 87d5c14..5e2a1a4 100755 + print('using default compiler %s' % c) + firstcompiler = c + break + -if firstcompiler is None: - raise ValueError('did not find a working compiler') + if firstcompiler is None: + raise ValueError('did not find a working compiler') + with open('build/%s/scripts/compiledefault' % host,'w') as f: f.write('#!/bin/sh\n') Loading
pkgs/by-name/li/libcpucycles/package.nix +2 −2 Original line number Diff line number Diff line Loading @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "libcpucycles"; version = "20250925"; version = "20260105"; src = fetchzip { url = "https://cpucycles.cr.yp.to/libcpucycles-${finalAttrs.version}.tar.gz"; hash = "sha256-hYHNTuohYztLJJonm9wAkx/wlINWfgX8eL2m31xBuwM="; hash = "sha256-hWmMLBadM/E/kF8D/cTjU+G0f2HTkZQlKoIWsgzAFj0="; }; patches = [ ./environment-variable-tools.patch ]; Loading