diff --git a/nix/.SRCINFO b/nix/.SRCINFO deleted file mode 100644 index 9cdb871..0000000 --- a/nix/.SRCINFO +++ /dev/null @@ -1,27 +0,0 @@ -pkgbase = nix - pkgdesc = A purely functional package manager - pkgver = 2.3.14 - pkgrel = 1 - url = https://nixos.org/nix - install = nix.install - arch = i686 - arch = x86_64 - arch = armv7h - license = LGPL - makedepends = bzip2 - makedepends = openssl - depends = gc - depends = libsodium - depends = boost - depends = brotli - depends = editline - optdepends = archlinux-nix: tools to help with setup of Nix - source = https://nixos.org/releases/nix/nix-2.3.14/nix-2.3.14.tar.xz - source = https://nixos.org/releases/nix/nix-2.3.14/nix-2.3.14.tar.xz.asc - source = ldflags.patch - validpgpkeys = B541D55301270E0BCF15CA5D8170B4726D7198DE - sha256sums = 713a0c9d9537f94a637a28979c6ddc973f739fc5e4f936c1ed46ea98b32b9459 - sha256sums = SKIP - sha256sums = 42350237d98785b30b0ee099405f2f1f7412f8a816162c22bd232ed3dbbe0305 - -pkgname = nix diff --git a/nix/PKGBUILD b/nix/PKGBUILD deleted file mode 100644 index c99e5b0..0000000 --- a/nix/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# Maintainer: Alastair Pharo -# Co-Maintainer: Bert Peters -# Contributor: Felix Morgner -# Contributor: Vlad M. -# Contributor: Mario Rodas -# Contributor: Oozyslug -# Contributor: koral -# Contributor: Anders Bennehag - -pkgname=nix -pkgver=2.3.14 -pkgrel=1 -pkgdesc="A purely functional package manager" -arch=('i686' 'x86_64' 'armv7h') -url="https://nixos.org/nix" -license=('LGPL') -depends=('gc' 'libsodium' 'boost' 'brotli' 'editline') -optdepends=('archlinux-nix: tools to help with setup of Nix') -makedepends=('bzip2' 'openssl') -install=nix.install -validpgpkeys=('B541D55301270E0BCF15CA5D8170B4726D7198DE') -source=("https://nixos.org/releases/nix/nix-$pkgver/nix-$pkgver.tar.xz"{,.asc} - 'ldflags.patch') -sha256sums=('713a0c9d9537f94a637a28979c6ddc973f739fc5e4f936c1ed46ea98b32b9459' - 'SKIP' - '42350237d98785b30b0ee099405f2f1f7412f8a816162c22bd232ed3dbbe0305') - -prepare() { - cd "$pkgname-$pkgver" - patch --forward --strip=1 --input="${srcdir}/ldflags.patch" -} - -build () { - cd "$pkgname-$pkgver" - CXXFLAGS='-D_GLIBCXX_USE_CXX11_ABI=0' ./configure --prefix=/usr \ - --libexecdir="/usr/lib/$pkgname" \ - --sysconfdir=/etc \ - --enable-gc - make -} - -package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} diff --git a/nix/ldflags.patch b/nix/ldflags.patch deleted file mode 100644 index 1a2c4e1..0000000 --- a/nix/ldflags.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/mk/libraries.mk b/mk/libraries.mk -index 307e29b9d05..25cb1b81da6 100644 ---- a/mk/libraries.mk -+++ b/mk/libraries.mk -@@ -96,7 +96,9 @@ define build-library - ifneq ($(OS), Darwin) - $(1)_LDFLAGS_USE += -Wl,-rpath,$$(abspath $$(_d)) - endif -- $(1)_LDFLAGS_USE += -L$$(_d) -l$$(patsubst lib%,%,$$(strip $$($(1)_NAME))) -+ # -L and -l might conflict with previously-installed libraries. Instead -+ # pass the file directly to the linker. -+ $(1)_LDFLAGS_USE += -Wl,$$(_d)/$$($(1)_NAME).$(SO_EXT) - - $(1)_INSTALL_PATH := $(DESTDIR)$$($(1)_INSTALL_DIR)/$$($(1)_NAME).$(SO_EXT) - -@@ -107,7 +109,7 @@ define build-library - $$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) | $(DESTDIR)$$($(1)_INSTALL_DIR)/ - $$(trace-ld) $(CXX) -o $$@ -shared $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED)) - -- $(1)_LDFLAGS_USE_INSTALLED += -L$$(DESTDIR)$$($(1)_INSTALL_DIR) -l$$(patsubst lib%,%,$$(strip $$($(1)_NAME))) -+ $(1)_LDFLAGS_USE_INSTALLED += -Wl,$$(DESTDIR)$$($(1)_INSTALL_DIR)/$$($(1)_NAME).$(SO_EXT) - ifneq ($(OS), Darwin) - ifeq ($(SET_RPATH_TO_LIBS), 1) - $(1)_LDFLAGS_USE_INSTALLED += -Wl,-rpath,$$($(1)_INSTALL_DIR) diff --git a/nix/nix.install b/nix/nix.install deleted file mode 100644 index e07213e..0000000 --- a/nix/nix.install +++ /dev/null @@ -1,32 +0,0 @@ -install_info() { - echo "Nix is installed but no configuration has been done to make it work." - echo "You may wish to install the archlinux-nix package from AUR to help set" - echo "things up." - echo - echo "For more information on how to use nix, check out Part III of the Nix Manual:" - echo - echo " https://nixos.org/nix/manual/#chap-package-management" - echo -} - -remove_info() { - echo "You may wish to do some clean up:" - echo - echo "1. delete /nix folder" - echo " # rm -r /nix" - echo - echo "2. delete the config dir" - echo " # rm -r /etc/nix" - echo - echo "3. you may also want to delete nix-related files from users' home dirs" - echo " # rm -r /root/.nix-* /home/*/.nix-*" - echo -} - -post_install() { - install_info -} - -post_remove() { - remove_info -}