alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

libgpgerror: clean up

Browse source 
The missing gen-lock-obj.sh was resolved a long time ago.

Change the Git URL to the official location while I'm doing
libgpgerror things.
This commit is contained in:
Alyssa Ross 2021-06-10 19:00:51 +00:00
parent 9ccd2aa4bb
commit 7ff166f50f
2 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/development/libraries/libgpg-error/default.nix
View file

@ -34,16 +34,6 @@ in stdenv.mkDerivation (rec {
'' + lib.optionalString (stdenv.hostPlatform.isAarch32 && stdenv.hostPlatform.isMusl) ''
ln -s src/syscfg/lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.arm-unknown-linux-musleabihf.h
ln -s src/syscfg/lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-musleabihf.h
''
# This file was accidentally excluded from the sdist until
# 013720333c6ec1d38791689bc49ba039d98e16b3, post release.
# TODO make unconditional next mass rebuild
+ lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
cp ${fetchurl {
url = "https://raw.githubusercontent.com/gpg/libgpg-error/50e62b36ea01ed25d12c443088b85d4f41a2b3e1/src/gen-lock-obj.sh";
sha256 = "10cslipa6npalj869asaamj0w941dhmx0yjafpyyh69ypsg2m2c3";
}} ./src/gen-lock-obj.sh
chmod +x ./src/gen-lock-obj.sh
'';
outputs = [ "out" "dev" "info" ];

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

@ -16305,7 +16305,7 @@ in
libgpgerror = callPackage ../development/libraries/libgpg-error { };
# https://github.com/gpg/libgpg-error/blob/70058cd9f944d620764e57c838209afae8a58c78/README#L118-L140
# https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=blob;f=README;h=fd6e1a83f55696c1f7a08f6dfca08b2d6b7617ec;hb=70058cd9f944d620764e57c838209afae8a58c78#l118
libgpgerror-gen-posix-lock-obj = libgpgerror.override {
genPosixLockObjOnly = true;
};