cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

ustr: migrate to by-name

Browse source
This commit is contained in:
Sigmanificient 2024-05-10 04:05:39 +02:00
parent 413c50ac7b
commit 31bfe498e7
3 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
pkgs/development/libraries/ustr/default.nix → pkgs/by-name/us/ustr/package.nix
View file

@ -1,4 +1,8 @@
{ lib, stdenv, fetchgit }: {
lib,
stdenv,
fetchgit,
}:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "ustr"; pname = "ustr";
@ -18,15 +22,19 @@ stdenv.mkDerivation (finalAttrs: {
# Fix detection of stdint.h # Fix detection of stdint.h
postPatch = '' postPatch = ''
sed -i 's,\(have_stdint_h\)=0,\1=1,g' Makefile substituteInPlace Makefile \
sed -i 's,\(USTR_CONF_HAVE_STDINT_H\) 0,\1 1,g' ustr-import.in --replace-fail "have_stdint_h=0" "have_stdint_h=1"
cat ustr-import.in | grep USTR_CONF
substituteInPlace ustr-import.in \
--replace-fail "USTR_CONF_HAVE_STDINT_H 0" "USTR_CONF_HAVE_STDINT_H 1"
''; '';
preBuild = '' makeFlags = [
makeFlagsArray+=("prefix=$out") "prefix=${placeholder "out"}"
makeFlagsArray+=("LDCONFIG=echo") "LDCONFIG=echo"
makeFlagsArray+=("HIDE=") "HIDE="
''; ];
# Remove debug libraries # Remove debug libraries
postInstall = '' postInstall = ''

0
pkgs/development/libraries/ustr/va_args.patch → pkgs/by-name/us/ustr/va_args.patch
View file

2
pkgs/top-level/all-packages.nix
View file

@ -24804,8 +24804,6 @@ with pkgs;
unixODBCDrivers = recurseIntoAttrs (callPackages ../development/libraries/unixODBCDrivers { }); unixODBCDrivers = recurseIntoAttrs (callPackages ../development/libraries/unixODBCDrivers { });
ustr = callPackage ../development/libraries/ustr { };
usrsctp = callPackage ../development/libraries/usrsctp { }; usrsctp = callPackage ../development/libraries/usrsctp { };
usbredir = callPackage ../development/libraries/usbredir { }; usbredir = callPackage ../development/libraries/usbredir { };