commit fcbacedbf22cc3d195f924fd66de8febff5692b5 · pyrox.dev/nixpkgs

+2 -5

pkgs/by-name/gn/gnustep-back/package.nix

··· 5 cairo, 6 fontconfig, 7 freetype, 8 - gnustep-base, 9 gnustep-gui, 10 - gnustep-make, 11 libXft, 12 libXmu, 13 pkg-config, ··· 24 }; 25 26 nativeBuildInputs = [ 27 - gnustep-make 28 pkg-config 29 wrapGNUstepAppsHook 30 ]; ··· 33 cairo 34 fontconfig 35 freetype 36 - gnustep-base 37 - gnustep-gui 38 libXft 39 libXmu 40 ]; 41 42 meta = { 43 description = "Generic backend for GNUstep";

··· 5 cairo, 6 fontconfig, 7 freetype, 8 gnustep-gui, 9 libXft, 10 libXmu, 11 pkg-config, ··· 22 }; 23 24 nativeBuildInputs = [ 25 pkg-config 26 wrapGNUstepAppsHook 27 ]; ··· 30 cairo 31 fontconfig 32 freetype 33 libXft 34 libXmu 35 ]; 36 + 37 + propagatedBuildInputs = [ gnustep-gui ]; 38 39 meta = { 40 description = "Generic backend for GNUstep";

+4 -1

pkgs/by-name/gn/gnustep-base/package.nix

··· 43 ]; 44 45 nativeBuildInputs = [ 46 - gnustep-make 47 pkg-config 48 wrapGNUstepAppsHook 49 ]; 50 51 propagatedBuildInputs = [

··· 43 ]; 44 45 nativeBuildInputs = [ 46 pkg-config 47 wrapGNUstepAppsHook 48 + ]; 49 + 50 + propagatedNativeBuildInputs = [ 51 + gnustep-make 52 ]; 53 54 propagatedBuildInputs = [

+2 -6

pkgs/by-name/gn/gnustep-gui/package.nix

··· 3 clangStdenv, 4 fetchzip, 5 gnustep-base, 6 - gnustep-make, 7 wrapGNUstepAppsHook, 8 }: 9 ··· 16 sha256 = "sha256-+4XEJ6PKpantbIbyNroFMaNBTFffkuW/ajSocGQO9Mo="; 17 }; 18 19 - nativeBuildInputs = [ 20 - gnustep-make 21 - wrapGNUstepAppsHook 22 - ]; 23 24 - buildInputs = [ gnustep-base ]; 25 26 patches = [ 27 ./fixup-all.patch

··· 3 clangStdenv, 4 fetchzip, 5 gnustep-base, 6 wrapGNUstepAppsHook, 7 }: 8 ··· 15 sha256 = "sha256-+4XEJ6PKpantbIbyNroFMaNBTFffkuW/ajSocGQO9Mo="; 16 }; 17 18 + nativeBuildInputs = [ wrapGNUstepAppsHook ]; 19 20 + propagatedBuildInputs = [ gnustep-base ]; 21 22 patches = [ 23 ./fixup-all.patch

+1

pkgs/by-name/gn/gnustep-libobjc/package.nix

··· 19 }; 20 21 nativeBuildInputs = [ cmake ]; 22 buildInputs = [ robin-map ]; 23 24 cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ];

··· 19 }; 20 21 nativeBuildInputs = [ cmake ]; 22 + 23 buildInputs = [ robin-map ]; 24 25 cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ];

+2 -12

pkgs/by-name/gn/gnustep-systempreferences/package.nix

··· 3 clangStdenv, 4 fetchurl, 5 gnustep-back, 6 - gnustep-base, 7 - gnustep-gui, 8 - gnustep-make, 9 wrapGNUstepAppsHook, 10 }: 11 ··· 18 sha256 = "1fg7c3ihfgvl6n21rd17fs9ivx3l8ps874m80vz86n1callgs339"; 19 }; 20 21 - nativeBuildInputs = [ 22 - gnustep-make 23 - wrapGNUstepAppsHook 24 - ]; 25 26 - buildInputs = [ 27 - gnustep-back 28 - gnustep-base 29 - gnustep-gui 30 - ]; 31 32 meta = { 33 description = "Settings manager for the GNUstep environment and its applications";

··· 3 clangStdenv, 4 fetchurl, 5 gnustep-back, 6 wrapGNUstepAppsHook, 7 }: 8 ··· 15 sha256 = "1fg7c3ihfgvl6n21rd17fs9ivx3l8ps874m80vz86n1callgs339"; 16 }; 17 18 + nativeBuildInputs = [ wrapGNUstepAppsHook ]; 19 20 + buildInputs = [ gnustep-back ]; 21 22 meta = { 23 description = "Settings manager for the GNUstep environment and its applications";

+2 -12

pkgs/by-name/go/gorm/package.nix

··· 3 clangStdenv, 4 fetchzip, 5 gnustep-back, 6 - gnustep-base, 7 - gnustep-gui, 8 - gnustep-make, 9 wrapGNUstepAppsHook, 10 }: 11 ··· 18 sha256 = "sha256-B7NNRA3qA2PFbb03m58EBBONuIciLf6eU+YSR0qvaCo="; 19 }; 20 21 - nativeBuildInputs = [ 22 - gnustep-make 23 - wrapGNUstepAppsHook 24 - ]; 25 26 - buildInputs = [ 27 - gnustep-back 28 - gnustep-base 29 - gnustep-gui 30 - ]; 31 32 meta = { 33 description = "Graphical Object Relationship Modeller is an easy-to-use interface designer for GNUstep";

··· 3 clangStdenv, 4 fetchzip, 5 gnustep-back, 6 wrapGNUstepAppsHook, 7 }: 8 ··· 15 sha256 = "sha256-B7NNRA3qA2PFbb03m58EBBONuIciLf6eU+YSR0qvaCo="; 16 }; 17 18 + nativeBuildInputs = [ wrapGNUstepAppsHook ]; 19 20 + buildInputs = [ gnustep-back ]; 21 22 meta = { 23 description = "Graphical Object Relationship Modeller is an easy-to-use interface designer for GNUstep";

+1 -9

pkgs/by-name/gw/gworkspace/package.nix

··· 3 clangStdenv, 4 fetchurl, 5 gnustep-back, 6 - gnustep-base, 7 - gnustep-gui, 8 - gnustep-make, 9 gnustep-systempreferences, 10 wrapGNUstepAppsHook, 11 }: ··· 22 # additional dependencies: 23 # - PDFKit framework from http://gap.nongnu.org/ 24 # - TODO: to --enable-gwmetadata, need libDBKit as well as sqlite! 25 - nativeBuildInputs = [ 26 - gnustep-make 27 - wrapGNUstepAppsHook 28 - ]; 29 30 buildInputs = [ 31 gnustep-back 32 - gnustep-base 33 - gnustep-gui 34 gnustep-systempreferences 35 ]; 36

··· 3 clangStdenv, 4 fetchurl, 5 gnustep-back, 6 gnustep-systempreferences, 7 wrapGNUstepAppsHook, 8 }: ··· 19 # additional dependencies: 20 # - PDFKit framework from http://gap.nongnu.org/ 21 # - TODO: to --enable-gwmetadata, need libDBKit as well as sqlite! 22 + nativeBuildInputs = [ wrapGNUstepAppsHook ]; 23 24 buildInputs = [ 25 gnustep-back 26 gnustep-systempreferences 27 ]; 28

+2 -6

pkgs/by-name/ow/owl-compositor/package.nix

··· 1 { lib 2 , clangStdenv 3 , fetchFromGitHub 4 - , gnustep-make 5 - , gnustep-base 6 - , gnustep-gui 7 , wrapGNUstepAppsHook 8 , libxkbcommon 9 , makeWrapper ··· 44 darwin.DarwinTools 45 darwin.bootstrap_cmds 46 ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ 47 - gnustep-make 48 wrapGNUstepAppsHook 49 ]; 50 ··· 54 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ 55 darwin.apple_sdk.frameworks.Cocoa 56 ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ 57 - gnustep-base 58 - gnustep-gui 59 ]; 60 61 preConfigure = ''

··· 1 { lib 2 , clangStdenv 3 , fetchFromGitHub 4 + , gnustep-back 5 , wrapGNUstepAppsHook 6 , libxkbcommon 7 , makeWrapper ··· 42 darwin.DarwinTools 43 darwin.bootstrap_cmds 44 ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ 45 wrapGNUstepAppsHook 46 ]; 47 ··· 51 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ 52 darwin.apple_sdk.frameworks.Cocoa 53 ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ 54 + gnustep-back 55 ]; 56 57 preConfigure = ''

+2 -6

pkgs/by-name/pi/pikopixel/package.nix

··· 1 { lib 2 , clangStdenv 3 , fetchurl 4 - , gnustep-make 5 - , gnustep-base 6 - , gnustep-gui 7 , wrapGNUstepAppsHook 8 }: 9 ··· 19 sourceRoot = "PikoPixel.Sources.${version}/PikoPixel"; 20 21 nativeBuildInputs = [ 22 - gnustep-make 23 wrapGNUstepAppsHook 24 ]; 25 26 buildInputs = [ 27 - gnustep-base 28 - gnustep-gui 29 ]; 30 31 # Fix the Exec and Icon paths in the .desktop file, and save the file in the

··· 1 { lib 2 , clangStdenv 3 , fetchurl 4 + , gnustep-back 5 , wrapGNUstepAppsHook 6 }: 7 ··· 17 sourceRoot = "PikoPixel.Sources.${version}/PikoPixel"; 18 19 nativeBuildInputs = [ 20 wrapGNUstepAppsHook 21 ]; 22 23 buildInputs = [ 24 + gnustep-back 25 ]; 26 27 # Fix the Exec and Icon paths in the .desktop file, and save the file in the

+1 -9

pkgs/by-name/pr/projectcenter/package.nix

··· 5 gdb, 6 gnumake, 7 gnustep-back, 8 - gnustep-base, 9 - gnustep-gui, 10 - gnustep-make, 11 gorm, 12 wrapGNUstepAppsHook, 13 }: ··· 23 hash = "sha256-uXT2UUvMZNc6Fqi2BUXQimbZk8b3IqXzB+A2btBOmms="; 24 }; 25 26 - nativeBuildInputs = [ 27 - gnustep-make 28 - wrapGNUstepAppsHook 29 - ]; 30 31 # NOTE: need a patch for ProjectCenter to help it locate some necessary tools: 32 # 1. Framework/PCProjectLauncher.m, locate gdb (say among NIX_GNUSTEP_SYSTEM_TOOLS) ··· 35 gdb 36 gnumake 37 gnustep-back 38 - gnustep-base 39 - gnustep-gui 40 gorm 41 ]; 42

··· 5 gdb, 6 gnumake, 7 gnustep-back, 8 gorm, 9 wrapGNUstepAppsHook, 10 }: ··· 20 hash = "sha256-uXT2UUvMZNc6Fqi2BUXQimbZk8b3IqXzB+A2btBOmms="; 21 }; 22 23 + nativeBuildInputs = [ wrapGNUstepAppsHook ]; 24 25 # NOTE: need a patch for ProjectCenter to help it locate some necessary tools: 26 # 1. Framework/PCProjectLauncher.m, locate gdb (say among NIX_GNUSTEP_SYSTEM_TOOLS) ··· 29 gdb 30 gnumake 31 gnustep-back 32 gorm 33 ]; 34

+2 -2

pkgs/by-name/so/sogo/package.nix

··· 1 - { lib, clangStdenv, fetchFromGitHub, fetchpatch, makeWrapper, python3, lndir, libxcrypt 2 , openssl, openldap, sope, libmemcached, curl, libsodium, libytnef, libzip, pkg-config, nixosTests 3 , oath-toolkit 4 , gnustep-make ··· 18 hash = "sha256-c+547x7ugYoLMgGVLcMmmb9rzquRJOv8n+Js2CuE7I0="; 19 }; 20 21 - nativeBuildInputs = [ gnustep-make makeWrapper python3 pkg-config ]; 22 buildInputs = [ gnustep-base sope openssl libmemcached curl libsodium libytnef libzip openldap oath-toolkit libxcrypt ] 23 ++ lib.optional enableActiveSync libwbxml; 24

··· 1 + { lib, clangStdenv, fetchFromGitHub, makeWrapper, python3, lndir, libxcrypt 2 , openssl, openldap, sope, libmemcached, curl, libsodium, libytnef, libzip, pkg-config, nixosTests 3 , oath-toolkit 4 , gnustep-make ··· 18 hash = "sha256-c+547x7ugYoLMgGVLcMmmb9rzquRJOv8n+Js2CuE7I0="; 19 }; 20 21 + nativeBuildInputs = [ makeWrapper python3 pkg-config ]; 22 buildInputs = [ gnustep-base sope openssl libmemcached curl libsodium libytnef libzip openldap oath-toolkit libxcrypt ] 23 ++ lib.optional enableActiveSync libwbxml; 24

-1

pkgs/by-name/so/sope/package.nix

··· 15 hash = "sha256-6vec2ZgpK5jcKr3c2SLn6fLAun56MDjupWtR6dMdjag="; 16 }; 17 18 - nativeBuildInputs = [ gnustep-make ]; 19 buildInputs = [ gnustep-base libxml2 openssl ] 20 ++ lib.optional (openldap != null) openldap 21 ++ lib.optionals (mariadb != null) [ libmysqlclient mariadb ]

··· 15 hash = "sha256-6vec2ZgpK5jcKr3c2SLn6fLAun56MDjupWtR6dMdjag="; 16 }; 17 18 buildInputs = [ gnustep-base libxml2 openssl ] 19 ++ lib.optional (openldap != null) openldap 20 ++ lib.optionals (mariadb != null) [ libmysqlclient mariadb ]

-2

pkgs/tools/archivers/unar/default.nix

··· 3 , fetchFromGitHub 4 , installShellFiles 5 , gnustep-base 6 - , gnustep-make 7 , bzip2 8 , zlib 9 , icu ··· 59 lib.optionals stdenv.hostPlatform.isDarwin [ Foundation AppKit ]; 60 61 nativeBuildInputs = [ installShellFiles ] ++ 62 - lib.optionals stdenv.hostPlatform.isLinux [ gnustep-make ] ++ 63 lib.optionals stdenv.hostPlatform.isDarwin [ xcbuildHook ]; 64 65 xcbuildFlags = lib.optionals stdenv.hostPlatform.isDarwin [

··· 3 , fetchFromGitHub 4 , installShellFiles 5 , gnustep-base 6 , bzip2 7 , zlib 8 , icu ··· 58 lib.optionals stdenv.hostPlatform.isDarwin [ Foundation AppKit ]; 59 60 nativeBuildInputs = [ installShellFiles ] ++ 61 lib.optionals stdenv.hostPlatform.isDarwin [ xcbuildHook ]; 62 63 xcbuildFlags = lib.optionals stdenv.hostPlatform.isDarwin [

+1 -5

pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix

··· 4 fetchFromGitHub, 5 fetchpatch2, 6 autoreconfHook, 7 - gnustep-make, 8 gnustep-base, 9 - gnustep-libobjc, 10 re2c, 11 openldap, 12 openssl, ··· 42 43 nativeBuildInputs = [ 44 autoreconfHook 45 - gnustep-libobjc 46 - gnustep-make 47 - gnustep-base 48 re2c 49 ]; 50 ··· 52 openldap 53 openssl 54 openvpn 55 ]; 56 57 configureFlags = [

··· 4 fetchFromGitHub, 5 fetchpatch2, 6 autoreconfHook, 7 gnustep-base, 8 re2c, 9 openldap, 10 openssl, ··· 40 41 nativeBuildInputs = [ 42 autoreconfHook 43 re2c 44 ]; 45 ··· 47 openldap 48 openssl 49 openvpn 50 + gnustep-base 51 ]; 52 53 configureFlags = [