diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-06-10 19:00:51 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-06-17 13:31:53 +0000 |
| commit | 7ff166f50ff6b4a15fe7a4faeba6948c53537628 (patch) | |
| tree | 351c5bc331d49ebf958dac3b2be66a9f6ee7cc6c | |
| parent | 9ccd2aa4bbf8b0c08ac75b8606b033f50d28c1a0 (diff) | |
libgpgerror: clean up
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.
| -rw-r--r-- | pkgs/development/libraries/libgpg-error/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 1 insertions, 11 deletions
diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index da53a9916d05c..1f6fd4835afa5 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -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" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2cb0404e139e3..23ac18a9e9cc8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; }; |