diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
commit | 99fcaeccb89621dd492203ce1f2d551c06f228ed (patch) | |
tree | 41cb730ae07383004789779b0f6e11cb3f4642a3 /nixpkgs/pkgs/development/libraries/sope | |
parent | 59c5f5ac8682acc13bb22bc29c7cf02f7d75f01f (diff) | |
parent | 75a5ebf473cd60148ba9aec0d219f72e5cf52519 (diff) | |
download | nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.gz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.bz2 nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.lz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.xz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.zst nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/config/console.nix nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix nixpkgs/pkgs/applications/networking/irc/weechat/default.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/interpreters/python/default.nix nixpkgs/pkgs/development/node-packages/overrides.nix nixpkgs/pkgs/development/tools/b4/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix nixpkgs/pkgs/servers/mail/public-inbox/default.nix nixpkgs/pkgs/tools/security/pinentry/default.nix nixpkgs/pkgs/tools/text/unoconv/default.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/sope')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/sope/default.nix | 63 |
1 files changed, 40 insertions, 23 deletions
diff --git a/nixpkgs/pkgs/development/libraries/sope/default.nix b/nixpkgs/pkgs/development/libraries/sope/default.nix index 83442035d7b4..0b61047377f3 100644 --- a/nixpkgs/pkgs/development/libraries/sope/default.nix +++ b/nixpkgs/pkgs/development/libraries/sope/default.nix @@ -1,46 +1,63 @@ -{ gnustep, lib, fetchFromGitHub , libxml2, openssl +{ gnustep, lib, fetchFromGitHub, fetchpatch, libxml2, openssl , openldap, mariadb, libmysqlclient, postgresql }: -with lib; gnustep.stdenv.mkDerivation rec { pname = "sope"; - version = "5.7.0"; + version = "5.8.0"; src = fetchFromGitHub { owner = "inverse-inc"; repo = pname; rev = "SOPE-${version}"; - sha256 = "sha256-mS685NOB6IN3a5tE3yr+VUq55Ouc5af9aJ2wTfGsAlo="; + hash = "sha256-sXIpKdJ5930+W+FsxQ8DZOq/49XWMM1zV8dIzbQdcbc="; }; + patches = [ + (fetchpatch { + name = "sope-no-unnecessary-vars.patch"; + url = "https://github.com/Alinto/sope/commit/0751a2f11961fd7de4e2728b6e34e9ba4ba5887e.patch"; + hash = "sha256-1txj8Qehg2N7ZsiYQA2FXI4peQAE3HUwDYkJEP9WnEk="; + }) + (fetchpatch { + name = "sope-fix-wformat.patch"; + url = "https://github.com/Alinto/sope/commit/6adfadd5dd2da4041657ad071892f2c9b1704d22.patch"; + hash = "sha256-zCbvVdbeBeNo3/cDVdYbyUUC2z8D6Q5ga0plUoMqr98="; + }) + ]; + hardeningDisable = [ "format" ]; nativeBuildInputs = [ gnustep.make ]; - buildInputs = flatten ([ gnustep.base libxml2 openssl ] - ++ optional (openldap != null) openldap - ++ optionals (mariadb != null) [ libmysqlclient mariadb ] - ++ optional (postgresql != null) postgresql); - - postPatch = '' - # Exclude NIX_ variables - sed -i 's/grep GNUSTEP_/grep ^GNUSTEP_/g' configure - ''; + buildInputs = [ gnustep.base libxml2 openssl ] + ++ lib.optional (openldap != null) openldap + ++ lib.optionals (mariadb != null) [ libmysqlclient mariadb ] + ++ lib.optional (postgresql != null) postgresql; + # Configure directories where files are installed to. Everything is automatically + # put into $out (thanks GNUstep) apart from the makefiles location which is where + # makefiles are read from during build but also where the SOPE makefiles are + # installed to in the install phase. We move them over after the installation. preConfigure = '' - export DESTDIR="$out" + mkdir -p /build/Makefiles + ln -s ${gnustep.make}/share/GNUstep/Makefiles/* /build/Makefiles + cat <<EOF > /build/GNUstep.conf + GNUSTEP_MAKEFILES=/build/Makefiles + EOF ''; configureFlags = [ "--prefix=" "--disable-debug" "--enable-xml" "--with-ssl=ssl" ] - ++ optional (openldap != null) "--enable-openldap" - ++ optional (mariadb != null) "--enable-mysql" - ++ optional (postgresql != null) "--enable-postgresql"; - - # Yes, this is ugly. - preFixup = '' - cp -rlPa $out/nix/store/*/* $out - rm -rf $out/nix/store + ++ lib.optional (openldap != null) "--enable-openldap" + ++ lib.optional (mariadb != null) "--enable-mysql" + ++ lib.optional (postgresql != null) "--enable-postgresql"; + + env.GNUSTEP_CONFIG_FILE = "/build/GNUstep.conf"; + + # Move over the makefiles (see comment over preConfigure) + postInstall = '' + mkdir -p $out/share/GNUstep/Makefiles + find /build/Makefiles -mindepth 1 -maxdepth 1 -not -type l -exec cp -r '{}' $out/share/GNUstep/Makefiles \; ''; - meta = { + meta = with lib; { description = "An extensive set of frameworks which form a complete Web application server environment"; license = licenses.publicDomain; homepage = "https://github.com/inverse-inc/sope"; |