Unverified Commit f29a72fb authored by kirillrdy's avatar kirillrdy Committed by GitHub
Browse files

Merge pull request #310473 from Sigmanificient/ustr-adopt 

ustr: adopt, use fetchgit instead of fetchurl, migrate to by-name
parents 53717915 31bfe498

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

+52 −0
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl }:

{

  lib,

  stdenv,

  fetchgit,

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "ustr";

  version = "1.0.4";



  src = fetchurl {

    url = "http://www.and.org/ustr/${version}/${pname}-${version}.tar.bz2";

    sha256 = "1i623ygdj7rkizj7985q9d6vj5amwg686aqb5j3ixpkqkyp6xbrx";

  src = fetchgit {

    url = "http://www.and.org/ustr/ustr.git";

    rev = "v${finalAttrs.version}";

    hash = "sha256-pQrQy+S9fVFl8Mop4QmwEAXGiBSheQE4HgAZ4srFz64=";

  };



  # Fixes bogus warnings that failed libsemanage
@@ -17,16 +22,20 @@ stdenv.mkDerivation rec { 


  # Fix detection of stdint.h

  postPatch = ''

    sed -i 's,\(have_stdint_h\)=0,\1=1,g' Makefile

    sed -i 's,\(USTR_CONF_HAVE_STDINT_H\) 0,\1 1,g' ustr-import.in

  '';

    substituteInPlace Makefile \

      --replace-fail "have_stdint_h=0" "have_stdint_h=1"



  preBuild = ''

    makeFlagsArray+=("prefix=$out")

    makeFlagsArray+=("LDCONFIG=echo")

    makeFlagsArray+=("HIDE=")

    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"

  '';



  makeFlags = [

    "prefix=${placeholder "out"}"

    "LDCONFIG=echo"

    "HIDE="

  ];



  # Remove debug libraries

  postInstall = ''

    find $out/lib -name \*debug\* -delete
@@ -37,7 +46,7 @@ stdenv.mkDerivation rec { 
    description = "Micro String API for C language";

    mainProgram = "ustr-import";

    license = licenses.bsd2;

    maintainers = [ ];

    maintainers = with lib.maintainers; [ sigmanificient ];

    platforms = platforms.linux;

  };

}
 
})

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -24786,8 +24786,6 @@ with pkgs; 














  unixODBCDrivers = recurseIntoAttrs (callPackages ../development/libraries/unixODBCDrivers { });



























  ustr = callPackage ../development/libraries/ustr { };



























  usrsctp = callPackage ../development/libraries/usrsctp { };





























  usbredir = callPackage ../development/libraries/usbredir { };