From 7ff166f50ff6b4a15fe7a4faeba6948c53537628 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 10 Jun 2021 19:00:51 +0000 Subject: 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. --- pkgs/development/libraries/libgpg-error/default.nix | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'pkgs/development/libraries/libgpg-error') 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" ]; -- cgit 1.4.1