Browse Source

fix fedora

zplugins_osx
Alexandros Theodotou 2 years ago
parent
commit
87aa8a91f8
Signed by: alex
GPG Key ID: 022EAE42313D70F3
  1. 7
      meson.build
  2. 53
      nixos/meson.build
  3. 2
      rpm/zrythm.spec.in
  4. 24
      scripts/make_nixos_pkg.sh.in
  5. 8
      scripts/make_rpm_pkg.sh.in
  6. 6
      scripts/meson.build

7
meson.build

@ -160,10 +160,17 @@ is_arch = distro.contains ('arch') @@ -160,10 +160,17 @@ is_arch = distro.contains ('arch')
if is_arch
subdir ('arch')
endif
is_debian = distro.contains ('debian') or distro.contains ('ubuntu')
if is_debian
subdir ('debian')
endif
is_nixos = distro.contains ('nixos')
if is_nixos
subdir ('nixos')
endif
is_rpm = distro.contains ('fedora')
if is_rpm
subdir ('rpm')

53
nixos/meson.build

@ -0,0 +1,53 @@ @@ -0,0 +1,53 @@
# Copyright (C) 2020 Alexandros Theodotou <alex at zrythm dot org>
#
# This file is part of Zrythm
#
# Zrythm is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# Zrythm is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with Zrythm. If not, see <https://www.gnu.org/licenses/>.
nixos_conf = configuration_data ()
nixos_conf.merge_from (global_conf)
nixos_conf.set (
'BUILT_ZPLUGINS_DIR', zplugins_installation.full_path ())
pkgbuild = configure_file (
output: 'PKGBUILD',
input: 'PKGBUILD.in',
configuration: nixos_conf,
)
nixos_pkg_filename = run_command (
get_pkg_filename, 'ARCH', dash_trial).stdout ().strip ()
nixos_pkg = custom_target (
'nixos-pkg',
output: nixos_pkg_filename,
input: [
pkgbuild, zrythm_src_tarball,
],
command: [
make_nixos_pkg, '@OUTPUT@', '@INPUT0@', '@INPUT1@',
zrythm_src_tarball_filename, nixos_pkg_filename,
],
depends: [
carla_installation,
lsp_dsp_lib_installation,
zplugins_installation,
],
install: true,
install_dir: get_option ('prefix'),
)
run_target (
'nixos',
command: [ 'echo', 'done' ],
depends: nixos_pkg)

2
rpm/zrythm.spec.in

@ -93,7 +93,7 @@ ninja -C build @@ -93,7 +93,7 @@ ninja -C build
%install
DESTDIR="%{buildroot}/" ninja -C build install
mkdir -p "%{buildroot}/usr/lib/zrythm/lib"
mkdir -p "%{buildroot}/usr/lib/zrythm/lib/lv2"
rm -rf "%{buildroot}/usr/lib64/libcm_reproc.a"
cp -RLv @TEMP_CARLA_PREFIX@/@LIBDIR@/carla \
%{buildroot}/usr/lib/zrythm/lib/

24
scripts/make_nixos_pkg.sh.in

@ -0,0 +1,24 @@ @@ -0,0 +1,24 @@
#!@BASH@
set -e
out_pkg="$1"
pkgbuild=$2
zrythm_src_tarball="$3"
zrythm_src_tarball_filename="$4"
tempdir=`mktemp -d`
cp $pkgbuild $tempdir/
cp $zrythm_src_tarball $tempdir/
# build manuals
pushd $tempdir
makepkg -f
popd $tempdir
ls $tempdir
exit 1
#rm -rf $tempdir

8
scripts/make_rpm_pkg.sh.in

@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
#!@BASH@
set -e
set -xe
out_pkg="$1"
specfile=$2
zrythm_src_tarball="$3"
rpmbuild_root=`mktemp -d`
rpmbuild_root=`echo $HOME`/rpmbuild
inner_dir="@ZRYTHM_INNER_DIR_NAME@"
# prepare dirs
@ -21,9 +21,9 @@ popd @@ -21,9 +21,9 @@ popd
cp $specfile $rpmbuild_root/SPECS/zrythm.spec
cp $zrythm_src_tarball $rpmbuild_root/SOURCES/
rpmbuild -ba $rpmbuild_root/SPECS/zrythm.spec
rpmbuild -bb $rpmbuild_root/SPECS/zrythm.spec
cp $rpmbuild_root/RPMS/x86_64/zrythm-@ZRYTHM_PKG_VERSION@-1.fc@.x86_64.rpm \
cp $rpmbuild_root/RPMS/x86_64/zrythm-@ZRYTHM_PKG_VERSION@-1.fc*.x86_64.rpm \
"$out_pkg"
#rm -rf $rpmbuild_root

6
scripts/meson.build

@ -45,6 +45,12 @@ make_arch_pkg = configure_file ( @@ -45,6 +45,12 @@ make_arch_pkg = configure_file (
configuration: scripts_conf,
)
make_nixos_pkg = configure_file (
output: 'make_nixos_pkg.sh',
input: 'make_nixos_pkg.sh.in',
configuration: scripts_conf,
)
make_user_manual = configure_file (
output: 'make_user_manual.sh',
input: 'make_user_manual.sh.in',

Loading…
Cancel
Save